netstar pushed a commit to branch master. http://git.enlightenment.org/apps/evisum.git/commit/?id=568045625ed6b80adbabe3a70628aa61410fa714
commit 568045625ed6b80adbabe3a70628aa61410fa714 Author: Alastair Poole <[email protected]> Date: Mon May 11 16:29:49 2020 +0100 proc: FreeBSD changes. --- src/bin/process.c | 12 ++++++------ src/bin/ui.c | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/bin/process.c b/src/bin/process.c index 900149c..1e373fa 100644 --- a/src/bin/process.c +++ b/src/bin/process.c @@ -771,9 +771,9 @@ _process_list_freebsd_fallback_get(void) usage->ru_stime.tv_usec; p->cpu_time /= 10000; p->state = _process_state_name(kp.ki_stat); - p->mem_size = p->mem_virt = kp.ki_size; + p->mem_virt = kp.ki_size; p->mem_rss = kp.ki_rssize * pagesize; - p->mem_shared = kp.ki_rusage.ru_ixrss; + p->mem_size = p->mem_virt; p->nice = kp.ki_nice - NZERO; p->priority = kp.ki_pri.pri_level - PZERO; p->numthreads = kp.ki_numthreads; @@ -867,9 +867,9 @@ _process_list_freebsd_get(void) usage->ru_stime.tv_usec; p->cpu_time /= 10000; p->state = _process_state_name(kp->ki_stat); - p->mem_size = p->mem_virt = kp->ki_size; + p->mem_virt = kp->ki_size; p->mem_rss = kp->ki_rssize * pagesize; - p->mem_shared = kp->ki_rusage.ru_ixrss; + p->mem_size = p->mem_virt; p->nice = kp->ki_nice - NZERO; p->priority = kp->ki_pri.pri_level - PZERO; p->numthreads = kp->ki_numthreads; @@ -966,9 +966,9 @@ proc_info_by_pid(int pid) (usage->ru_stime.tv_sec * 1000000) + usage->ru_stime.tv_usec; p->cpu_time /= 10000; p->state = _process_state_name(kp.ki_stat); - p->mem_size = p->mem_virt = kp.ki_size; + p->mem_virt = kp.ki_size; p->mem_rss = kp.ki_rssize * pagesize; - p->mem_shared = kp.ki_rusage.ru_ixrss; + p->mem_size = p->mem_virt; p->nice = kp.ki_nice - NZERO; p->priority = kp.ki_pri.pri_level - PZERO; p->numthreads = kp.ki_numthreads; diff --git a/src/bin/ui.c b/src/bin/ui.c index ece74dd..9914374 100644 --- a/src/bin/ui.c +++ b/src/bin/ui.c @@ -1410,7 +1410,11 @@ _process_panel_update(void *data) elm_object_text_set(ui->entry_pid_threads, eina_slstr_printf("%d", proc->numthreads)); elm_object_text_set(ui->entry_pid_virt, _size_format(proc->mem_virt)); elm_object_text_set(ui->entry_pid_rss, _size_format(proc->mem_rss)); +#if defined(__FreeBSD__) || defined(__DragonFly__) + elm_object_text_set(ui->entry_pid_shared, "N/A"); +#else elm_object_text_set(ui->entry_pid_shared, _size_format(proc->mem_shared)); +#endif elm_object_text_set(ui->entry_pid_size, _size_format(proc->mem_size)); elm_object_text_set(ui->entry_pid_nice, eina_slstr_printf("%d", proc->nice)); elm_object_text_set(ui->entry_pid_pri, eina_slstr_printf("%d", proc->priority)); --
