diff options
author | Tim Murray <timmurray@google.com> | 2016-10-18 18:52:09 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-10-18 18:52:09 +0000 |
commit | 274359228caf8ed7b7bd5b71a0faf2bccb9d8ba5 (patch) | |
tree | 89764b7f3b699930c187b38c4d48654ae736060e /libsuspend | |
parent | 61d28ddedff2e8d2ebd0d73a9298a85e425346e4 (diff) | |
parent | 4dcd461945cf640da38df41bdc85dac79500bbff (diff) | |
download | system_core-274359228caf8ed7b7bd5b71a0faf2bccb9d8ba5.tar.gz system_core-274359228caf8ed7b7bd5b71a0faf2bccb9d8ba5.tar.bz2 system_core-274359228caf8ed7b7bd5b71a0faf2bccb9d8ba5.zip |
Revert "libsuspend: move to exponential backoff" am: 23c8bab024
am: 4dcd461945
Change-Id: Ie1087acf944c43ab2c4f02a63817563d6125393f
Diffstat (limited to 'libsuspend')
-rw-r--r-- | libsuspend/autosuspend_wakeup_count.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/libsuspend/autosuspend_wakeup_count.c b/libsuspend/autosuspend_wakeup_count.c index 3457d5baf..d3fb45fcf 100644 --- a/libsuspend/autosuspend_wakeup_count.c +++ b/libsuspend/autosuspend_wakeup_count.c @@ -24,7 +24,6 @@ #include <stddef.h> #include <stdbool.h> #include <string.h> -#include <sys/param.h> #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> @@ -36,24 +35,12 @@ #define SYS_POWER_STATE "/sys/power/state" #define SYS_POWER_WAKEUP_COUNT "/sys/power/wakeup_count" -#define BASE_SLEEP_TIME 100000 - static int state_fd; static int wakeup_count_fd; static pthread_t suspend_thread; static sem_t suspend_lockout; static const char *sleep_state = "mem"; static void (*wakeup_func)(bool success) = NULL; -static int sleep_time = BASE_SLEEP_TIME; - -static void update_sleep_time(bool success) { - if (success) { - sleep_time = BASE_SLEEP_TIME; - return; - } - // double sleep time after each failure up to one minute - sleep_time = MIN(sleep_time * 2, 60000000); -} static void *suspend_thread_func(void *arg __attribute__((unused))) { @@ -61,12 +48,10 @@ static void *suspend_thread_func(void *arg __attribute__((unused))) char wakeup_count[20]; int wakeup_count_len; int ret; - bool success = true; + bool success; while (1) { - update_sleep_time(success); - usleep(sleep_time); - success = false; + usleep(100000); ALOGV("%s: read wakeup_count\n", __func__); lseek(wakeup_count_fd, 0, SEEK_SET); wakeup_count_len = TEMP_FAILURE_RETRY(read(wakeup_count_fd, wakeup_count, @@ -90,6 +75,7 @@ static void *suspend_thread_func(void *arg __attribute__((unused))) continue; } + success = true; ALOGV("%s: write %*s to wakeup_count\n", __func__, wakeup_count_len, wakeup_count); ret = TEMP_FAILURE_RETRY(write(wakeup_count_fd, wakeup_count, wakeup_count_len)); if (ret < 0) { @@ -98,8 +84,8 @@ static void *suspend_thread_func(void *arg __attribute__((unused))) } else { ALOGV("%s: write %s to %s\n", __func__, sleep_state, SYS_POWER_STATE); ret = TEMP_FAILURE_RETRY(write(state_fd, sleep_state, strlen(sleep_state))); - if (ret >= 0) { - success = true; + if (ret < 0) { + success = false; } void (*func)(bool success) = wakeup_func; if (func != NULL) { |