netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=c7c17e0c9c8803883d52bb5f9bdf8512f2f40e43
commit c7c17e0c9c8803883d52bb5f9bdf8512f2f40e43
Author: Alastair Poole <nets...@gmail.com>
Date: Wed Apr 22 11:23:00 2020 +0100
proc: mem_shared freebsd...
---
src/bin/process.c | 3 +++
src/bin/process.h | 1 +
src/bin/ui.c | 7 ++++---
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/bin/process.c b/src/bin/process.c
index a307408..651f45b 100644
--- a/src/bin/process.c
+++ b/src/bin/process.c
@@ -583,6 +583,7 @@ _process_list_freebsd_fallback_get(void)
p->state = _process_state_name(kp.ki_stat);
p->mem_size = kp.ki_size;
p->mem_rss = kp.ki_rssize * pagesize;
+ p->mem_cached = (kp.ki_tsize + kp.ki_dsize + kp.ki_ssize) * pagesize;
p->nice = kp.ki_nice - NZERO;
p->priority = kp.ki_pri.pri_level - PZERO;
p->numthreads = kp.ki_numthreads;
@@ -671,6 +672,7 @@ _process_list_freebsd_get(void)
p->state = _process_state_name(kp->ki_stat);
p->mem_size = kp->ki_size;
p->mem_rss = kp->ki_rssize * pagesize;
+ p->mem_cached = (kp->ki_tsize + kp->ki_dsize + kp->ki_ssize) *
pagesize;
p->nice = kp->ki_nice - NZERO;
p->priority = kp->ki_pri.pri_level - PZERO;
p->numthreads = kp->ki_numthreads;
@@ -763,6 +765,7 @@ proc_info_by_pid(int pid)
p->state = _process_state_name(kp.ki_stat);
p->mem_size = kp.ki_size;
p->mem_rss = kp.ki_rssize * pagesize;
+ p->mem_cached = (kp.ki_tsize + kp.ki_dsize + kp.ki_ssize) * pagesize;
p->nice = kp.ki_nice - NZERO;
p->priority = kp.ki_pri.pri_level - PZERO;
p->numthreads = kp.ki_numthreads;
diff --git a/src/bin/process.h b/src/bin/process.h
index 67c1787..87bfac6 100644
--- a/src/bin/process.h
+++ b/src/bin/process.h
@@ -36,6 +36,7 @@ typedef struct _Proc_Info
int32_t numthreads;
int64_t mem_size;
int64_t mem_rss;
+ int64_t mem_cached;
double cpu_usage;
char *command;
char *arguments;
diff --git a/src/bin/ui.c b/src/bin/ui.c
index a777930..35ff993 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -263,13 +263,13 @@ _network_usage_add(Ui *ui, Evas_Object *box, uint64_t
bytes, Eina_Bool incoming)
if (bytes)
{
- if (incoming)
+ if (incoming)
{
if (ui->incoming_max < bytes)
ui->incoming_max = bytes;
elm_progressbar_value_set(progress, (double) bytes /
ui->incoming_max);
- }
- else
+ }
+ else
{
if (ui->outgoing_max < bytes)
ui->outgoing_max = bytes;
@@ -980,6 +980,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
r = evas_object_data_get(l, "rect");
evas_object_size_hint_min_set(r, w, 1);
+// printf("size %lu and %lu \n", _mem_adjust(ui->data_unit, proc->mem_size
>> 10), _mem_adjust(ui->data_unit, proc->mem_cached >> 10));
evas_object_geometry_get(ui->btn_size, NULL, NULL, &w, NULL);
l = evas_object_data_get(it->obj, "proc_size");
elm_object_text_set(l, eina_slstr_printf("%lu %c ",
_mem_adjust(ui->data_unit, proc->mem_size >> 10), ui->data_unit));
--
