diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2016-03-07 16:57:56 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2016-03-07 16:58:02 -0300 |
| commit | db80f202f2b264ecbc979661c48204ec97a849af (patch) | |
| tree | e50f557bbf86a25fe49bd1d79c9f1d48b4242ab1 | |
| parent | 98e43816a5875c5d5772de044aed6aa51b9d4bc3 (diff) | |
Avoid global, as done by @gaod in #387.
| -rw-r--r-- | freebsd/FreeBSDProcessList.c | 7 | ||||
| -rw-r--r-- | freebsd/FreeBSDProcessList.h | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/freebsd/FreeBSDProcessList.c b/freebsd/FreeBSDProcessList.c index 9d921d9e..241bee23 100644 --- a/freebsd/FreeBSDProcessList.c +++ b/freebsd/FreeBSDProcessList.c @@ -86,9 +86,6 @@ static int MIB_kern_cp_time[2]; static int MIB_kern_cp_times[2]; static int kernelFScale; -// XXX hack -static unsigned long long int Global_totalMem; - ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId) { size_t len; char errbuf[_POSIX2_LINE_MAX]; @@ -307,8 +304,6 @@ static inline void FreeBSDProcessList_scanMemoryInfo(ProcessList* pl) { //pl->totalMem *= pageSizeKb; sysctl(MIB_hw_physmem, 2, &(pl->totalMem), &len, NULL, 0); pl->totalMem /= 1024; - // XXX hack - Global_totalMem = pl->totalMem; sysctl(MIB_vm_stats_vm_v_active_count, 4, &(fpl->memActive), &len, NULL, 0); fpl->memActive *= pageSizeKb; @@ -487,7 +482,7 @@ void ProcessList_goThroughEntries(ProcessList* this) { // from FreeBSD source /src/usr.bin/top/machine.c proc->m_size = kproc->ki_size / 1024 / pageSizeKb; proc->m_resident = kproc->ki_rssize; - proc->percent_mem = (proc->m_resident * PAGE_SIZE_KB) / (double)(Global_totalMem) * 100.0; + proc->percent_mem = (proc->m_resident * PAGE_SIZE_KB) / (double)(this->totalMem) * 100.0; proc->nlwp = kproc->ki_numthreads; proc->time = (kproc->ki_runtime + 5000) / 10000; diff --git a/freebsd/FreeBSDProcessList.h b/freebsd/FreeBSDProcessList.h index 2267379e..af343fb0 100644 --- a/freebsd/FreeBSDProcessList.h +++ b/freebsd/FreeBSDProcessList.h @@ -55,7 +55,6 @@ typedef struct FreeBSDProcessList_ { - ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId); void ProcessList_delete(ProcessList* this); |