diff --git a/src/bin/process.c b/src/bin/process.c index 32765f7..a7226e0 100644 --- a/src/bin/process.c +++ b/src/bin/process.c @@ -143,7 +143,7 @@ _parse_line(const char *line) } static void -_mem_shared(Proc_Info *proc, int pid) +_mem_size(Proc_Info *proc, int pid) { FILE *f; char buf[1024]; @@ -157,7 +157,7 @@ _mem_shared(Proc_Info *proc, int pid) if (sscanf(buf, "%u %u %u %u %u %u %u", &dummy, &resident, &shared, &dummy, &dummy, &data, &dummy) == 7) { - proc->mem_shared = (resident + shared + data) * getpagesize(); + proc->mem_size = (resident + shared + data) * getpagesize(); } } @@ -223,7 +223,7 @@ _process_list_linux_get(void) Proc_Info *p = calloc(1, sizeof(Proc_Info)); if (!p) return NULL; - _mem_shared(p, pid); + _mem_size(p, pid); link = ecore_file_readlink(eina_slstr_printf("/proc/%d/exe", pid)); if (link) @@ -313,7 +313,7 @@ proc_info_by_pid(int pid) Proc_Info *p = calloc(1, sizeof(Proc_Info)); if (!p) return NULL; - _mem_shared(p, pid); + _mem_size(p, pid); link = ecore_file_readlink(eina_slstr_printf("/proc/%d/exe", pid)); if (link) @@ -382,7 +382,7 @@ proc_info_by_pid(int pid) p->cpu_id = kp->p_cpuid; p->state = _process_state_name(kp->p_stat); p->cpu_time = kp->p_uticks + kp->p_sticks + kp->p_iticks; - p->mem_virt = p->mem_cached = (kp->p_vm_tsize * pagesize) + (kp->p_vm_dsize * pagesize) + (kp->p_vm_ssize * pagesize); + p->mem_virt = p->mem_size = (kp->p_vm_tsize * pagesize) + (kp->p_vm_dsize * pagesize) + (kp->p_vm_ssize * pagesize); p->mem_rss = kp->p_vm_rssize * pagesize; p->priority = kp->p_priority - PZERO; p->nice = kp->p_nice - NZERO; @@ -445,7 +445,7 @@ _process_list_openbsd_get(void) p->cpu_id = kp->p_cpuid; p->state = _process_state_name(kp->p_stat); p->cpu_time = kp->p_uticks + kp->p_sticks + kp->p_iticks; - p->mem_cached = p->mem_virt = (kp->p_vm_tsize * pagesize) + (kp->p_vm_dsize * pagesize) + (kp->p_vm_ssize * pagesize); + p->mem_size = p->mem_virt = (kp->p_vm_tsize * pagesize) + (kp->p_vm_dsize * pagesize) + (kp->p_vm_ssize * pagesize); p->mem_rss = kp->p_vm_rssize * pagesize; p->priority = kp->p_priority - PZERO; p->nice = kp->p_nice - NZERO; @@ -607,9 +607,8 @@ _process_list_freebsd_fallback_get(void) p->cpu_time = (usage->ru_utime.tv_sec * 1000000) + usage->ru_utime.tv_usec + (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_virt = kp.ki_size; + p->mem_virt = 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; @@ -696,9 +695,8 @@ _process_list_freebsd_get(void) p->cpu_time = (usage->ru_utime.tv_sec * 1000000) + usage->ru_utime.tv_usec + (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_virt = kp->ki_size; + p->mem_size = p->mem_virt = 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; @@ -789,9 +787,8 @@ proc_info_by_pid(int pid) p->cpu_time = (usage->ru_utime.tv_sec * 1000000) + usage->ru_utime.tv_usec + (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_virt = kp.ki_size; + p->mem_size = p->mem_virt = 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 7965c7e..7a3c175 100644 --- a/src/bin/process.h +++ b/src/bin/process.h @@ -36,7 +36,7 @@ typedef struct _Proc_Info int32_t numthreads; int64_t mem_virt; int64_t mem_rss; - int64_t mem_shared; + int64_t mem_size; double cpu_usage; char *command; char *arguments; diff --git a/src/bin/ui.c b/src/bin/ui.c index fa5c5ba..2b9953a 100644 --- a/src/bin/ui.c +++ b/src/bin/ui.c @@ -982,7 +982,7 @@ _content_get(void *data, Evas_Object *obj, const char *source) 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_shared >> 10), ui->data_unit)); + elm_object_text_set(l, eina_slstr_printf("%lu %c ", _mem_adjust(ui->data_unit, proc->mem_size >> 10), ui->data_unit)); evas_object_geometry_get(l, NULL, NULL, &ow, NULL); if (ow > w) evas_object_size_hint_min_set(ui->btn_size, w, 1); r = evas_object_data_get(l, "rect"); @@ -1408,7 +1408,7 @@ _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, eina_slstr_printf("%lld bytes", proc->mem_virt)); elm_object_text_set(ui->entry_pid_rss, eina_slstr_printf("%lld bytes", proc->mem_rss)); - elm_object_text_set(ui->entry_pid_shared, eina_slstr_printf("%lld bytes", proc->mem_shared)); + elm_object_text_set(ui->entry_pid_size, eina_slstr_printf("%lld bytes", 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)); elm_object_text_set(ui->entry_pid_state, proc->state); @@ -2030,11 +2030,11 @@ _ui_process_panel_add(Ui *ui) elm_table_pack(table, entry, 1, i++, 1, 1); label = elm_label_add(parent); - elm_object_text_set(label, " Shared memory:"); + elm_object_text_set(label, " Total memory:"); evas_object_show(label); elm_table_pack(table, label, 0, i, 1, 1); - ui->entry_pid_shared = entry = elm_entry_add(parent); + ui->entry_pid_size = entry = elm_entry_add(parent); evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_entry_single_line_set(entry, EINA_TRUE); diff --git a/src/bin/ui.h b/src/bin/ui.h index fdf974b..9aa8014 100644 --- a/src/bin/ui.h +++ b/src/bin/ui.h @@ -112,7 +112,7 @@ typedef struct Ui Evas_Object *entry_pid_threads; Evas_Object *entry_pid_virt; Evas_Object *entry_pid_rss; - Evas_Object *entry_pid_shared; + Evas_Object *entry_pid_size; Evas_Object *entry_pid_nice; Evas_Object *entry_pid_pri; Evas_Object *entry_pid_state;