enlightenment/evisum
enlightenment
/
evisum
7
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

evisum: Use (SZ - RSS), VSZ and RSS.

This commit is contained in:
Alastair Poole 2020-04-22 18:28:20 +01:00
parent 8499ecc8f4
commit d844d0084d
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/process.c
View File

@ -147,17 +147,18 @@ _mem_size(Proc_Info *proc, int pid)
{
FILE *f;
char buf[1024];
unsigned int dummy, shared, resident, data;
unsigned int dummy, size, shared, resident, data, text;
f = fopen(eina_slstr_printf("/proc/%d/statm", pid), "r");
if (!f) return;
if (fgets(buf, sizeof(buf), f))
{
if (sscanf(buf, "%u %u %u %u %u %u %u", &dummy, &resident, &shared, &dummy,
if (sscanf(buf, "%u %u %u %u %u %u %u", &size, &resident, &shared, &text,
&dummy, &data, &dummy) == 7)
{
proc->mem_size = (resident + shared + data) * getpagesize();
proc->mem_size = (size * getpagesize()) - proc->mem_rss;
proc->mem_shared = shared * getpagesize();
}
}
@ -278,7 +279,6 @@ _process_list_linux_get(void)
p->mem_virt = mem_virt;
p->mem_rss = mem_rss * pagesize;
_mem_size(p, pid);
p->mem_size -= p->mem_rss;
_cmd_args(p, pid, name, sizeof(name));
@ -330,7 +330,6 @@ proc_info_by_pid(int pid)
p->mem_virt = mem_virt;
p->mem_rss = mem_rss * getpagesize();
_mem_size(p, pid);
p->mem_size -= p->mem_rss;
p->priority = pri;
p->nice = nice;

17
src/bin/ui.c
View File

@ -40,14 +40,13 @@ static void
_config_load(Ui *ui)
{
_evisum_config = config_load();
ui->sort_type = _evisum_config->sort_type;
ui->sort_reverse = _evisum_config->sort_reverse;
ui->data_unit = _evisum_config->data_unit == 0 ? DATA_UNIT_MB : _evisum_config->data_unit;
if (_evisum_config->width > 0 && _evisum_config->height > 0)
{
evas_object_resize(ui->win, _evisum_config->width, _evisum_config->height);
}
if ((_evisum_config->width > 0) && (_evisum_config->height > 0))
evas_object_resize(ui->win, _evisum_config->width, _evisum_config->height);
}
static void
@ -1922,7 +1921,6 @@ _ui_process_panel_add(Ui *ui)
elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
elm_table_pack(table, entry, 1, i++, 1, 1);
label = elm_label_add(parent);
elm_object_text_set(label, "Command line:");
evas_object_show(label);
@ -1938,7 +1936,6 @@ _ui_process_panel_add(Ui *ui)
elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
elm_table_pack(table, entry, 1, i++, 1, 1);
label = elm_label_add(parent);
elm_object_text_set(label, "PID:");
evas_object_show(label);
@ -2019,7 +2016,7 @@ _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, " Total memory:");
elm_object_text_set(label, " Total memory :");
evas_object_show(label);
elm_table_pack(table, label, 0, i, 1, 1);
@ -2034,7 +2031,7 @@ _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, " Reserved memory:");
elm_object_text_set(label, " Shared memory:");
evas_object_show(label);
elm_table_pack(table, label, 0, i, 1, 1);
@ -2049,7 +2046,7 @@ _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, "Virtual memory:");
elm_object_text_set(label, " Virtual memory:");
evas_object_show(label);
elm_table_pack(table, label, 0, i, 1, 1);
@ -2448,7 +2445,7 @@ _ui_tab_memory_add(Ui *ui)
elm_table_pack(table, label, 0, 2, 1, 1);
elm_table_pack(table, progress, 1, 2, 1, 1);
label = _label_mem(box, "Shared");
label = _label_mem(box, "Res");
ui->progress_mem_shared = progress = elm_progressbar_add(frame);
evas_object_size_hint_align_set(progress, EVAS_HINT_FILL, EVAS_HINT_FILL);