parent
1e2c64da2a
commit
1de886e55f
|
@ -911,7 +911,6 @@ _kvm_get(Proc_Info *p, struct kinfo_proc *kp)
|
||||||
struct filedesc filed;
|
struct filedesc filed;
|
||||||
struct fdescenttbl *fdt;
|
struct fdescenttbl *fdt;
|
||||||
unsigned int n;
|
unsigned int n;
|
||||||
char buf[64];
|
|
||||||
|
|
||||||
if (!kvm_read(kern, (unsigned long)kp->ki_fd, &filed, sizeof(filed)))
|
if (!kvm_read(kern, (unsigned long)kp->ki_fd, &filed, sizeof(filed)))
|
||||||
goto kvmerror;
|
goto kvmerror;
|
||||||
|
@ -928,8 +927,12 @@ _kvm_get(Proc_Info *p, struct kinfo_proc *kp)
|
||||||
for (int i = 0; i < n; i++)
|
for (int i = 0; i < n; i++)
|
||||||
{
|
{
|
||||||
if (!fdt->fdt_ofiles[i].fde_file) continue;
|
if (!fdt->fdt_ofiles[i].fde_file) continue;
|
||||||
snprintf(buf, sizeof(buf), "%i", i);
|
int *fd = malloc(sizeof(int));
|
||||||
p->fds = eina_list_append(p->fds, strdup(buf));
|
if (fd)
|
||||||
|
{
|
||||||
|
*fd = i;
|
||||||
|
p->fds = eina_list_append(p->fds, fd);
|
||||||
|
}
|
||||||
p->numfiles++;
|
p->numfiles++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -839,8 +839,6 @@ static void
|
||||||
_general_view_update(Ui_Data *pd, Proc_Info *proc)
|
_general_view_update(Ui_Data *pd, Proc_Info *proc)
|
||||||
{
|
{
|
||||||
struct passwd *pwd_entry;
|
struct passwd *pwd_entry;
|
||||||
Eina_List *l;
|
|
||||||
int *num;
|
|
||||||
|
|
||||||
if (!strcmp(proc->state, "stop"))
|
if (!strcmp(proc->state, "stop"))
|
||||||
{
|
{
|
||||||
|
@ -865,29 +863,31 @@ _general_view_update(Ui_Data *pd, Proc_Info *proc)
|
||||||
else
|
else
|
||||||
elm_object_text_set(pd->general.entry_cmd_args, "");
|
elm_object_text_set(pd->general.entry_cmd_args, "");
|
||||||
|
|
||||||
elm_object_text_set(pd->general.entry_pid, eina_slstr_printf("%d", proc->pid));
|
elm_object_text_set(pd->general.entry_pid,
|
||||||
elm_object_text_set(pd->general.entry_uid, eina_slstr_printf("%d", proc->uid));
|
eina_slstr_printf("%d", proc->pid));
|
||||||
|
elm_object_text_set(pd->general.entry_uid,
|
||||||
|
eina_slstr_printf("%d", proc->uid));
|
||||||
elm_object_text_set(pd->general.entry_cpu,
|
elm_object_text_set(pd->general.entry_cpu,
|
||||||
eina_slstr_printf("%d", proc->cpu_id));
|
eina_slstr_printf("%d", proc->cpu_id));
|
||||||
elm_object_text_set(pd->general.entry_ppid, eina_slstr_printf("%d", proc->ppid));
|
elm_object_text_set(pd->general.entry_ppid,
|
||||||
|
eina_slstr_printf("%d", proc->ppid));
|
||||||
elm_object_text_set(pd->general.entry_threads,
|
elm_object_text_set(pd->general.entry_threads,
|
||||||
eina_slstr_printf("%d", proc->numthreads));
|
eina_slstr_printf("%d", proc->numthreads));
|
||||||
Eina_Strbuf *b = eina_strbuf_new();
|
elm_object_text_set(pd->general.entry_files,
|
||||||
EINA_LIST_FOREACH(proc->fds, l, num)
|
eina_slstr_printf("%d", proc->numfiles));
|
||||||
eina_strbuf_append_printf(b, "%i ", *num);
|
elm_object_text_set(pd->general.entry_virt,
|
||||||
if (eina_strbuf_length_get(b))
|
evisum_size_format(proc->mem_virt));
|
||||||
elm_object_text_set(pd->general.entry_files, eina_strbuf_string_get(b));
|
elm_object_text_set(pd->general.entry_rss,
|
||||||
eina_strbuf_free(b);
|
evisum_size_format(proc->mem_rss));
|
||||||
|
|
||||||
elm_object_text_set(pd->general.entry_virt, evisum_size_format(proc->mem_virt));
|
|
||||||
elm_object_text_set(pd->general.entry_rss, evisum_size_format(proc->mem_rss));
|
|
||||||
#if !defined(__linux__)
|
#if !defined(__linux__)
|
||||||
elm_object_text_set(pd->general.entry_shared, "N/A");
|
elm_object_text_set(pd->general.entry_shared,
|
||||||
|
"N/A");
|
||||||
#else
|
#else
|
||||||
elm_object_text_set(pd->general.entry_shared,
|
elm_object_text_set(pd->general.entry_shared,
|
||||||
evisum_size_format(proc->mem_shared));
|
evisum_size_format(proc->mem_shared));
|
||||||
#endif
|
#endif
|
||||||
elm_object_text_set(pd->general.entry_size, evisum_size_format(proc->mem_size));
|
elm_object_text_set(pd->general.entry_size,
|
||||||
|
evisum_size_format(proc->mem_size));
|
||||||
char *t = _run_time_string(proc->run_time);
|
char *t = _run_time_string(proc->run_time);
|
||||||
if (t)
|
if (t)
|
||||||
{
|
{
|
||||||
|
@ -900,11 +900,12 @@ _general_view_update(Ui_Data *pd, Proc_Info *proc)
|
||||||
elm_object_text_set(pd->general.entry_started, t);
|
elm_object_text_set(pd->general.entry_started, t);
|
||||||
free(t);
|
free(t);
|
||||||
}
|
}
|
||||||
elm_object_text_set(pd->general.entry_nice, eina_slstr_printf("%d", proc->nice));
|
elm_object_text_set(pd->general.entry_nice,
|
||||||
|
eina_slstr_printf("%d", proc->nice));
|
||||||
elm_object_text_set(pd->general.entry_pri,
|
elm_object_text_set(pd->general.entry_pri,
|
||||||
eina_slstr_printf("%d", proc->priority));
|
eina_slstr_printf("%d", proc->priority));
|
||||||
elm_object_text_set(pd->general.entry_state, proc->state);
|
elm_object_text_set(pd->general.entry_state,
|
||||||
|
proc->state);
|
||||||
elm_object_text_set(pd->general.entry_cpu_usage,
|
elm_object_text_set(pd->general.entry_cpu_usage,
|
||||||
eina_slstr_printf("%.0f%%", proc->cpu_usage));
|
eina_slstr_printf("%.0f%%", proc->cpu_usage));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue