From e7eaef62f347aea58714b677bb41f0a9468e7819 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Wed, 19 Jul 2017 10:21:56 +0900 Subject: [PATCH] powersave usage - dont use usleep at all. pwoersave sleep replaces it also... there isn't realy a need to track the screensaver state... powersave sleep will drop back to an hour between sleeps if we're in freeze mode (it could be longer or even be indefinite). it will be woken up if powersave state changes... --- src/modules/sysinfo/cpuclock/cpuclock.c | 4 ---- src/modules/sysinfo/cpumonitor/cpumonitor.c | 4 ---- src/modules/sysinfo/memusage/memusage.c | 4 ---- src/modules/sysinfo/netstatus/netstatus.c | 4 ---- src/modules/sysinfo/thermal/thermal.c | 8 -------- src/modules/temperature/e_mod_main.c | 4 ---- 6 files changed, 28 deletions(-) diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c b/src/modules/sysinfo/cpuclock/cpuclock.c index 013712ec2..159cbcd7c 100644 --- a/src/modules/sysinfo/cpuclock/cpuclock.c +++ b/src/modules/sysinfo/cpuclock/cpuclock.c @@ -828,10 +828,6 @@ _cpuclock_cb_frequency_check_main(void *data, Ecore_Thread *th) _cpuclock_status_free(status); if (ecore_thread_check(th)) break; e_powersave_sleeper_sleep(thc->sleeper, thc->interval); - if (e_powersave_mode_get() == E_POWERSAVE_MODE_FREEZE) - usleep((1000000.0 / 800.0) * (double)thc->interval); - else - usleep((1000000.0 / 8.0) * (double)thc->interval); if (ecore_thread_check(th)) break; } } diff --git a/src/modules/sysinfo/cpumonitor/cpumonitor.c b/src/modules/sysinfo/cpumonitor/cpumonitor.c index 84488033b..f10aae031 100644 --- a/src/modules/sysinfo/cpumonitor/cpumonitor.c +++ b/src/modules/sysinfo/cpumonitor/cpumonitor.c @@ -175,10 +175,6 @@ _cpumonitor_cb_usage_check_main(void *data, Ecore_Thread *th) ecore_thread_feedback(th, NULL); if (ecore_thread_check(th)) break; e_powersave_sleeper_sleep(thc->sleeper, thc->interval); - if (e_powersave_mode_get() == E_POWERSAVE_MODE_FREEZE) - usleep((1000000.0 / 800.0) * (double)thc->interval); - else - usleep((1000000.0 / 8.0) * (double)thc->interval); if (ecore_thread_check(th)) break; } } diff --git a/src/modules/sysinfo/memusage/memusage.c b/src/modules/sysinfo/memusage/memusage.c index 3cb81451c..9b1478172 100644 --- a/src/modules/sysinfo/memusage/memusage.c +++ b/src/modules/sysinfo/memusage/memusage.c @@ -295,10 +295,6 @@ _memusage_cb_usage_check_main(void *data, Ecore_Thread *th) ecore_thread_feedback(th, NULL); if (ecore_thread_check(th)) break; e_powersave_sleeper_sleep(thc->sleeper, thc->interval); - if (e_powersave_mode_get() == E_POWERSAVE_MODE_FREEZE) - usleep((1000000.0 / 800.0) * (double)thc->interval); - else - usleep((1000000.0 / 8.0) * (double)thc->interval); if (ecore_thread_check(th)) break; } } diff --git a/src/modules/sysinfo/netstatus/netstatus.c b/src/modules/sysinfo/netstatus/netstatus.c index e8e9ad3c7..14ee3a918 100644 --- a/src/modules/sysinfo/netstatus/netstatus.c +++ b/src/modules/sysinfo/netstatus/netstatus.c @@ -180,10 +180,6 @@ _netstatus_cb_usage_check_main(void *data, Ecore_Thread *th) ecore_thread_feedback(th, NULL); if (ecore_thread_check(th)) break; e_powersave_sleeper_sleep(thc->sleeper, thc->interval); - if (e_powersave_mode_get() == E_POWERSAVE_MODE_FREEZE) - usleep((1000000.0 / 800.0) * (double)thc->interval); - else - usleep((1000000.0 / 8.0) * (double)thc->interval); if (ecore_thread_check(th)) break; } } diff --git a/src/modules/sysinfo/thermal/thermal.c b/src/modules/sysinfo/thermal/thermal.c index d0744754f..e30c047a0 100644 --- a/src/modules/sysinfo/thermal/thermal.c +++ b/src/modules/sysinfo/thermal/thermal.c @@ -98,10 +98,6 @@ _thermal_check_sysctl(void *data, Ecore_Thread *th) if (ptemp != temp) ecore_thread_feedback(th, (void *)((long)temp)); ptemp = temp; e_powersave_sleeper_sleep(tth->sleeper, tth->poll_interval); - if (e_powersave_mode_get() == E_POWERSAVE_MODE_FREEZE) - usleep((1000000.0 / 800.0) * (double)tth->poll_interval); - else - usleep((1000000.0 / 8.0) * (double)tth->poll_interval); if (ecore_thread_check(th)) break; } } @@ -120,10 +116,6 @@ _thermal_check_fallback(void *data, Ecore_Thread *th) if (ptemp != temp) ecore_thread_feedback(th, (void *)((long)temp)); ptemp = temp; e_powersave_sleeper_sleep(tth->sleeper, tth->poll_interval); - if (e_powersave_mode_get() == E_POWERSAVE_MODE_FREEZE) - usleep((1000000.0 / 800.0) * (double)tth->poll_interval); - else - usleep((1000000.0 / 8.0) * (double)tth->poll_interval); if (ecore_thread_check(th)) break; } } diff --git a/src/modules/temperature/e_mod_main.c b/src/modules/temperature/e_mod_main.c index 8d7d0ad34..a4e99a5c9 100644 --- a/src/modules/temperature/e_mod_main.c +++ b/src/modules/temperature/e_mod_main.c @@ -331,10 +331,6 @@ _temperature_check_main(void *data, Ecore_Thread *th) if (ptemp != temp) ecore_thread_feedback(th, (void *)((long)temp)); ptemp = temp; e_powersave_sleeper_sleep(tth->sleeper, tth->poll_interval); - if (e_powersave_mode_get() == E_POWERSAVE_MODE_FREEZE) - usleep((1000000.0 / 800.0) * (double)tth->poll_interval); - else - usleep((1000000.0 / 8.0) * (double)tth->poll_interval); if (ecore_thread_check(th)) break; } }