diff options
author | Stephen 'Okra' Houston <smhouston88@gmail.com> | 2017-09-12 12:10:38 -0500 |
---|---|---|
committer | Stephen 'Okra' Houston <smhouston88@gmail.com> | 2017-09-12 12:10:38 -0500 |
commit | 20a96271ca5ce95e983b466b5a2efc4b35f60fc3 (patch) | |
tree | bad42e62b7b94110eb4145847f4bb19ab6086e5e /src/modules/sysinfo/netstatus/netstatus.c | |
parent | 9eebe065c262e0763649bb9f2dc1b0b9e2d434fe (diff) | |
download | enlightenment-20a96271ca5ce95e983b466b5a2efc4b35f60fc3.tar.gz |
Update netstatus in/out in the same file read. Fix cpufreq to use powersave again.
Diffstat (limited to 'src/modules/sysinfo/netstatus/netstatus.c')
-rw-r--r-- | src/modules/sysinfo/netstatus/netstatus.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/modules/sysinfo/netstatus/netstatus.c b/src/modules/sysinfo/netstatus/netstatus.c index 0e87854a72..87ea74c180 100644 --- a/src/modules/sysinfo/netstatus/netstatus.c +++ b/src/modules/sysinfo/netstatus/netstatus.c @@ -7,14 +7,13 @@ struct _Thread_Config int interval; Instance *inst; Eina_Bool automax; + time_t checktime; int inpercent; - time_t intime; unsigned long in; unsigned long incurrent; unsigned long inmax; Eina_Stringshare *instring; int outpercent; - time_t outtime; unsigned long out; unsigned long outcurrent; unsigned long outmax; @@ -145,11 +144,13 @@ _netstatus_cb_usage_check_main(void *data, Ecore_Thread *th) if (ecore_thread_check(th)) break; #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) - _netstatus_sysctl_getrstatus(thc->automax, &thc->in, &thc->incurrent, &thc->inmax, &thc->intime, &thc->inpercent); - _netstatus_sysctl_gettstatus(thc->automax, &thc->out, &thc->outcurrent, &thc->outmax, &thc->outtime, &thc->outpercent); + _netstatus_sysctl_getstatus(thc->automax, &thc->checktime, &thc->in, &thc->incurrent, + &thc->inmax, &thc->inpercent, &thc->out, &thc->outcurrent, &thc->outmax, + &thc->outpercent); #else - _netstatus_proc_getrstatus(thc->automax, &thc->in, &thc->incurrent, &thc->inmax, &thc->intime, &thc->inpercent); - _netstatus_proc_gettstatus(thc->automax, &thc->out, &thc->outcurrent, &thc->outmax, &thc->outtime, &thc->outpercent); + _netstatus_proc_getstatus(thc->automax, &thc->checktime, &thc->in, &thc->incurrent, + &thc->inmax, &thc->inpercent, &thc->out, &thc->outcurrent, &thc->outmax, + &thc->outpercent); #endif if (!thc->incurrent) { |