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

summary:

This commit is contained in:
Alastair Poole 2021-02-07 12:58:54 +00:00
parent e4f81ae9f3
commit c5b32b9475
3 changed files with 74 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/system/process.c
View File

@ -330,6 +330,7 @@ _process_list_linux_get(void)
p->cpu_id = st.psr; p->cpu_id = st.psr;
p->start = st.start_time; p->start = st.start_time;
p->run_time = st.run_time; p->run_time = st.run_time;
if (toupper(st.state) == 'S') p->ssleep = 1;
state = _process_state_name(st.state); state = _process_state_name(st.state);
snprintf(p->state, sizeof(p->state), "%s", state); snprintf(p->state, sizeof(p->state), "%s", state);
p->cpu_time = st.utime + st.stime; p->cpu_time = st.utime + st.stime;
@ -369,6 +370,7 @@ _proc_thread_info(Proc_Info *p)
Proc_Info *t = calloc(1, sizeof(Proc_Info)); Proc_Info *t = calloc(1, sizeof(Proc_Info));
if (!t) continue; if (!t) continue;
t->cpu_id = st.psr; t->cpu_id = st.psr;
if (toupper(st.state) == 'S') p->ssleep = 1;
state = _process_state_name(st.state); state = _process_state_name(st.state);
snprintf(t->state, sizeof(t->state), "%s", state); snprintf(t->state, sizeof(t->state), "%s", state);
t->cpu_time = st.utime + st.stime; t->cpu_time = st.utime + st.stime;
@ -405,6 +407,7 @@ proc_info_by_pid(int pid)
p->cpu_id = st.psr; p->cpu_id = st.psr;
p->start = st.start_time; p->start = st.start_time;
p->run_time = st.run_time; p->run_time = st.run_time;
if (toupper(st.state) == 'S') p->ssleep = 1;
state = _process_state_name(st.state); state = _process_state_name(st.state);
snprintf(p->state, sizeof(p->state), "%s", state); snprintf(p->state, sizeof(p->state), "%s", state);
p->cpu_time = st.utime + st.stime; p->cpu_time = st.utime + st.stime;
@ -440,7 +443,10 @@ _proc_get(Proc_Info *p, struct kinfo_proc *kp)
p->run_time = kp->p_uutime_sec + kp->p_ustime_sec + p->run_time = kp->p_uutime_sec + kp->p_ustime_sec +
(kp->p_uutime_usec / 1000000) + (kp->p_ustime_usec / 1000000); (kp->p_uutime_usec / 1000000) + (kp->p_ustime_usec / 1000000);
if (kp->p_stat == SSLEEP) if (kp->p_stat == SSLEEP)
state = kp->p_wmesg; {
state = kp->p_wmesg;
p->ssleep = 1;
}
else else
state = _process_state_name(kp->p_stat); state = _process_state_name(kp->p_stat);
snprintf(p->state, sizeof(p->state), "%s", state); snprintf(p->state, sizeof(p->state), "%s", state);
@ -909,7 +915,10 @@ _proc_thread_info(struct kinfo_proc *kp, Eina_Bool is_thread)
(usage->ru_stime.tv_sec * 1000000) + usage->ru_stime.tv_usec) / 10000; (usage->ru_stime.tv_sec * 1000000) + usage->ru_stime.tv_usec) / 10000;
p->run_time = (kp->ki_runtime + 500000) / 1000000; p->run_time = (kp->ki_runtime + 500000) / 1000000;
if (kp->ki_stat == SSLEEP) if (kp->ki_stat == SSLEEP)
state = kp->ki_wmesg; {
state = kp->ki_wmesg;
p->ssleep = 1;
}
else else
state = _process_state_name(kp->ki_stat); state = _process_state_name(kp->ki_stat);
snprintf(p->state, sizeof(p->state), "%s", state); snprintf(p->state, sizeof(p->state), "%s", state);

1
src/bin/system/process.h
View File

@ -30,6 +30,7 @@ typedef struct _Proc_Info
char *command; char *command;
char *arguments; char *arguments;
int ssleep;
char state[32]; char state[32];
short is_kernel; short is_kernel;

75
src/bin/ui/ui_process_list.c
View File

@ -68,6 +68,15 @@ typedef struct
Evas_Object *btn_state; Evas_Object *btn_state;
Evas_Object *btn_time; Evas_Object *btn_time;
Evas_Object *btn_cpu_usage; Evas_Object *btn_cpu_usage;
struct
{
Evas_Object *lb;
int total;
int running;
int sleeping;
int stopped;
} summary;
} Ui_Data; } Ui_Data;
static Ui_Data *_pd = NULL; static Ui_Data *_pd = NULL;
@ -436,6 +445,17 @@ _bring_in(void *data)
return 0; return 0;
} }
static void
_update_summary(Ui_Data *pd)
{
const char *txt =
eina_slstr_printf("%i processes: %i running, %i sleeping, %i stopped.",
pd->summary.total, pd->summary.running,
pd->summary.sleeping, pd->summary.stopped);
elm_object_text_set(pd->summary.lb, txt);
}
static Eina_List * static Eina_List *
_process_list_sort(Eina_List *list, Ui_Data *pd) _process_list_sort(Eina_List *list, Ui_Data *pd)
{ {
@ -485,6 +505,9 @@ _process_list_search_trim(Eina_List *list, Ui_Data *pd)
Proc_Info *proc; Proc_Info *proc;
Ui *ui = pd->ui; Ui *ui = pd->ui;
pd->summary.total = pd->summary.running = pd->summary.sleeping = 0;
pd->summary.stopped = 0;
EINA_LIST_FOREACH_SAFE(list, l, l_next, proc) EINA_LIST_FOREACH_SAFE(list, l, l_next, proc)
{ {
if ((proc->pid == ui->program_pid) || if ((proc->pid == ui->program_pid) ||
@ -516,6 +539,12 @@ _process_list_search_trim(Eina_List *list, Ui_Data *pd)
eina_hash_add(pd->cpu_times, &id, cpu_time); eina_hash_add(pd->cpu_times, &id, cpu_time);
} }
} }
pd->summary.total++;
if ((!strcmp(proc->state, "run")) || (!strcmp(proc->state, "onproc")))
pd->summary.running++;
pd->summary.sleeping += proc->ssleep;
if (!strcmp(proc->state, "stop"))
pd->summary.stopped++;
} }
} }
@ -586,11 +615,14 @@ _process_list_feedback_cb(void *data, Ecore_Thread *thread EINA_UNUSED,
Eina_List *list; Eina_List *list;
Proc_Info *proc; Proc_Info *proc;
Elm_Object_Item *it; Elm_Object_Item *it;
int n;
pd = data; pd = data;
list = msg; list = msg;
_genlist_ensure_n_items(pd->genlist, eina_list_count(list), &pd->itc); n = eina_list_count(list);
_genlist_ensure_n_items(pd->genlist, n, &pd->itc);
it = elm_genlist_first_item_get(pd->genlist); it = elm_genlist_first_item_get(pd->genlist);
EINA_LIST_FREE(list, proc) EINA_LIST_FREE(list, proc)
@ -611,9 +643,11 @@ _process_list_feedback_cb(void *data, Ecore_Thread *thread EINA_UNUSED,
elm_genlist_realized_items_update(pd->genlist); elm_genlist_realized_items_update(pd->genlist);
_update_summary(pd);
#if DIRTY_GENLIST_HACK #if DIRTY_GENLIST_HACK
Eina_List *real = elm_genlist_realized_items_get(pd->genlist); Eina_List *real = elm_genlist_realized_items_get(pd->genlist);
int n = eina_list_count(pd->cache->active); n = eina_list_count(pd->cache->active);
if (n > eina_list_count(real) * 2) if (n > eina_list_count(real) * 2)
{ {
evisum_ui_item_cache_steal(pd->cache, real); evisum_ui_item_cache_steal(pd->cache, real);
@ -1126,6 +1160,7 @@ static Evas_Object *
_ui_content_system_add(Ui_Data *pd, Evas_Object *parent) _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
{ {
Evas_Object *tb, *btn, *list, *rec; Evas_Object *tb, *btn, *list, *rec;
Evas_Object *fr, *lb;
Ui *ui = pd->ui; Ui *ui = pd->ui;
int i = 0; int i = 0;
@ -1148,7 +1183,7 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
(ui->proc.sort_type == SORT_BY_CMD ? (ui->proc.sort_type == SORT_BY_CMD ?
ui->proc.sort_reverse : 0), ui->proc.sort_reverse : 0),
ui->proc.sort_type == SORT_BY_CMD); ui->proc.sort_type == SORT_BY_CMD);
evas_object_size_hint_weight_set(btn, 1.0, 0); evas_object_size_hint_weight_set(btn, 1.0, 1.0);
evas_object_size_hint_align_set(btn, FILL, FILL); evas_object_size_hint_align_set(btn, FILL, FILL);
elm_object_text_set(btn, _("command")); elm_object_text_set(btn, _("command"));
evas_object_show(btn); evas_object_show(btn);
@ -1161,7 +1196,7 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
(ui->proc.sort_type == SORT_BY_UID ? (ui->proc.sort_type == SORT_BY_UID ?
ui->proc.sort_reverse : 0), ui->proc.sort_reverse : 0),
ui->proc.sort_type == SORT_BY_UID); ui->proc.sort_type == SORT_BY_UID);
evas_object_size_hint_weight_set(btn, 1.0, 0); evas_object_size_hint_weight_set(btn, 1.0, 1.0);
evas_object_size_hint_align_set(btn, FILL, FILL); evas_object_size_hint_align_set(btn, FILL, FILL);
elm_object_text_set(btn, _("user")); elm_object_text_set(btn, _("user"));
evas_object_show(btn); evas_object_show(btn);
@ -1177,7 +1212,7 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
(ui->proc.sort_type == SORT_BY_PID ? (ui->proc.sort_type == SORT_BY_PID ?
ui->proc.sort_reverse : 0), ui->proc.sort_reverse : 0),
ui->proc.sort_type == SORT_BY_PID); ui->proc.sort_type == SORT_BY_PID);
evas_object_size_hint_weight_set(btn, 1.0, 0); evas_object_size_hint_weight_set(btn, 1.0, 1.0);
evas_object_size_hint_align_set(btn, FILL, FILL); evas_object_size_hint_align_set(btn, FILL, FILL);
elm_object_text_set(btn, _("pid")); elm_object_text_set(btn, _("pid"));
evas_object_show(btn); evas_object_show(btn);
@ -1192,7 +1227,7 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
(ui->proc.sort_type == SORT_BY_THREADS ? (ui->proc.sort_type == SORT_BY_THREADS ?
ui->proc.sort_reverse : 0), ui->proc.sort_reverse : 0),
ui->proc.sort_type == SORT_BY_THREADS); ui->proc.sort_type == SORT_BY_THREADS);
evas_object_size_hint_weight_set(btn, 1.0, 0); evas_object_size_hint_weight_set(btn, 1.0, 1.0);
evas_object_size_hint_align_set(btn, FILL, FILL); evas_object_size_hint_align_set(btn, FILL, FILL);
elm_object_text_set(btn, _("thr")); elm_object_text_set(btn, _("thr"));
evas_object_show(btn); evas_object_show(btn);
@ -1207,7 +1242,7 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
(ui->proc.sort_type == SORT_BY_PRI ? (ui->proc.sort_type == SORT_BY_PRI ?
ui->proc.sort_reverse : 0), ui->proc.sort_reverse : 0),
ui->proc.sort_type == SORT_BY_PRI); ui->proc.sort_type == SORT_BY_PRI);
evas_object_size_hint_weight_set(btn, 1.0, 0); evas_object_size_hint_weight_set(btn, 1.0, 1.0);
evas_object_size_hint_align_set(btn, FILL, FILL); evas_object_size_hint_align_set(btn, FILL, FILL);
elm_object_text_set(btn, _("prio")); elm_object_text_set(btn, _("prio"));
evas_object_show(btn); evas_object_show(btn);
@ -1222,7 +1257,7 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
(ui->proc.sort_type == SORT_BY_NICE ? (ui->proc.sort_type == SORT_BY_NICE ?
ui->proc.sort_reverse : 0), ui->proc.sort_reverse : 0),
ui->proc.sort_type == SORT_BY_NICE); ui->proc.sort_type == SORT_BY_NICE);
evas_object_size_hint_weight_set(btn, 1.0, 0); evas_object_size_hint_weight_set(btn, 1.0, 1.0);
evas_object_size_hint_align_set(btn, FILL, FILL); evas_object_size_hint_align_set(btn, FILL, FILL);
elm_object_text_set(btn, _("nice")); elm_object_text_set(btn, _("nice"));
evas_object_show(btn); evas_object_show(btn);
@ -1237,7 +1272,7 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
(ui->proc.sort_type == SORT_BY_SIZE ? (ui->proc.sort_type == SORT_BY_SIZE ?
ui->proc.sort_reverse : 0), ui->proc.sort_reverse : 0),
ui->proc.sort_type == SORT_BY_SIZE); ui->proc.sort_type == SORT_BY_SIZE);
evas_object_size_hint_weight_set(btn, 1.0, 0); evas_object_size_hint_weight_set(btn, 1.0, 1.0);
evas_object_size_hint_align_set(btn, FILL, FILL); evas_object_size_hint_align_set(btn, FILL, FILL);
elm_object_text_set(btn, _("size")); elm_object_text_set(btn, _("size"));
evas_object_show(btn); evas_object_show(btn);
@ -1252,7 +1287,7 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
(ui->proc.sort_type == SORT_BY_RSS ? (ui->proc.sort_type == SORT_BY_RSS ?
ui->proc.sort_reverse : 0), ui->proc.sort_reverse : 0),
ui->proc.sort_type == SORT_BY_RSS); ui->proc.sort_type == SORT_BY_RSS);
evas_object_size_hint_weight_set(btn, 1.0, 0); evas_object_size_hint_weight_set(btn, 1.0, 1.0);
evas_object_size_hint_align_set(btn, FILL, FILL); evas_object_size_hint_align_set(btn, FILL, FILL);
elm_object_text_set(btn, _("res")); elm_object_text_set(btn, _("res"));
evas_object_show(btn); evas_object_show(btn);
@ -1267,7 +1302,7 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
(ui->proc.sort_type == SORT_BY_STATE ? (ui->proc.sort_type == SORT_BY_STATE ?
ui->proc.sort_reverse : 0), ui->proc.sort_reverse : 0),
ui->proc.sort_type == SORT_BY_STATE); ui->proc.sort_type == SORT_BY_STATE);
evas_object_size_hint_weight_set(btn, 1.0, 0); evas_object_size_hint_weight_set(btn, 1.0, 1.0);
evas_object_size_hint_align_set(btn, FILL, FILL); evas_object_size_hint_align_set(btn, FILL, FILL);
elm_object_text_set(btn, _("state")); elm_object_text_set(btn, _("state"));
evas_object_show(btn); evas_object_show(btn);
@ -1282,7 +1317,7 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
(ui->proc.sort_type == SORT_BY_TIME ? (ui->proc.sort_type == SORT_BY_TIME ?
ui->proc.sort_reverse : 0), ui->proc.sort_reverse : 0),
ui->proc.sort_type == SORT_BY_TIME); ui->proc.sort_type == SORT_BY_TIME);
evas_object_size_hint_weight_set(btn, 1.0, 0); evas_object_size_hint_weight_set(btn, 1.0, 1.0);
evas_object_size_hint_align_set(btn, FILL, FILL); evas_object_size_hint_align_set(btn, FILL, FILL);
elm_object_text_set(btn, _("time")); elm_object_text_set(btn, _("time"));
evas_object_show(btn); evas_object_show(btn);
@ -1297,7 +1332,7 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
(ui->proc.sort_type == SORT_BY_CPU_USAGE ? (ui->proc.sort_type == SORT_BY_CPU_USAGE ?
ui->proc.sort_reverse : 0), ui->proc.sort_reverse : 0),
ui->proc.sort_type == SORT_BY_CPU_USAGE); ui->proc.sort_type == SORT_BY_CPU_USAGE);
evas_object_size_hint_weight_set(btn, 1.0, 0); evas_object_size_hint_weight_set(btn, 1.0, 1.0);
evas_object_size_hint_align_set(btn, FILL, FILL); evas_object_size_hint_align_set(btn, FILL, FILL);
elm_object_text_set(btn, _("cpu %")); elm_object_text_set(btn, _("cpu %"));
evas_object_show(btn); evas_object_show(btn);
@ -1334,6 +1369,20 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
evas_object_smart_callback_add(pd->genlist, "unrealized", evas_object_smart_callback_add(pd->genlist, "unrealized",
_item_unrealized_cb, pd); _item_unrealized_cb, pd);
fr = elm_frame_add(parent);
elm_object_style_set(fr, "pad_small");
evas_object_size_hint_weight_set(fr, EXPAND, 0);
evas_object_size_hint_align_set(fr, 0, FILL);
evas_object_show(fr);
pd->summary.lb = lb = elm_label_add(fr);
evas_object_size_hint_weight_set(lb, EXPAND, 0);
evas_object_size_hint_align_set(lb, 0.0, FILL);
evas_object_show(lb);
elm_object_content_set(fr, lb);
elm_table_pack(tb, fr, 0, 3, i, 1);
return tb; return tb;
} }