macros: MEMSZ macro.
This commit is contained in:
parent
9ed9bd3bb5
commit
9e62816cdc
|
@ -573,10 +573,10 @@ system_memory_usage_get(meminfo_t *memory)
|
||||||
swap_out:
|
swap_out:
|
||||||
if (swdev)
|
if (swdev)
|
||||||
free(swdev);
|
free(swdev);
|
||||||
memory->cached = U64(uvmexp.pagesize) * U64(bcstats.numbufpages);
|
memory->cached = MEMSZ(uvmexp.pagesize) * MEMSZ(bcstats.numbufpages);
|
||||||
memory->used = U64(uvmexp.pagesize) * U64(uvmexp.active);
|
memory->used = MEMSZ(uvmexp.pagesize) * MEMSZ(uvmexp.active);
|
||||||
memory->buffered = U64(uvmexp.pagesize) * (U64(uvmexp.npages) - U64(uvmexp.free));
|
memory->buffered = MEMSZ(uvmexp.pagesize) * (MEMSZ(uvmexp.npages) - MEMSZ(uvmexp.free));
|
||||||
memory->shared = U64(uvmexp.pagesize) * U64(uvmexp.wired);
|
memory->shared = MEMSZ(uvmexp.pagesize) * MEMSZ(uvmexp.wired);
|
||||||
#elif defined(__MacOS__)
|
#elif defined(__MacOS__)
|
||||||
int mib[2] = { CTL_HW, HW_MEMSIZE };
|
int mib[2] = { CTL_HW, HW_MEMSIZE };
|
||||||
size_t total;
|
size_t total;
|
||||||
|
|
|
@ -10,4 +10,6 @@
|
||||||
#define U8(n) (uint8_t) n
|
#define U8(n) (uint8_t) n
|
||||||
#define I8(n) (int8_t) n
|
#define I8(n) (int8_t) n
|
||||||
|
|
||||||
|
#define MEMSZ U64
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -164,10 +164,10 @@ _mem_size(Proc_Info *proc)
|
||||||
&size, &resident, &shared, &text,
|
&size, &resident, &shared, &text,
|
||||||
&dummy, &data, &dummy) == 7)
|
&dummy, &data, &dummy) == 7)
|
||||||
{
|
{
|
||||||
proc->mem_rss = U64(resident) * U64(pagesize);
|
proc->mem_rss = MEMSZ(resident) * MEMSZ(pagesize);
|
||||||
proc->mem_shared = U64(shared) * U64(pagesize);
|
proc->mem_shared = MEMSZ(shared) * MEMSZ(pagesize);
|
||||||
proc->mem_size = proc->mem_rss - proc->mem_shared;
|
proc->mem_size = proc->mem_rss - proc->mem_shared;
|
||||||
proc->mem_virt = U64(size) * U64(pagesize);
|
proc->mem_virt = MEMSZ(size) * MEMSZ(pagesize);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -403,10 +403,9 @@ _proc_get(Proc_Info *p, struct kinfo_proc *kp)
|
||||||
p->cpu_id = kp->p_cpuid;
|
p->cpu_id = kp->p_cpuid;
|
||||||
p->state = _process_state_name(kp->p_stat);
|
p->state = _process_state_name(kp->p_stat);
|
||||||
p->cpu_time = kp->p_uticks + kp->p_sticks + kp->p_iticks;
|
p->cpu_time = kp->p_uticks + kp->p_sticks + kp->p_iticks;
|
||||||
p->mem_virt = p->mem_size = (kp->p_vm_tsize * pagesize) +
|
p->mem_virt = p->mem_size = (MEMSZ(kp->p_vm_tsize) * MEMSZ(pagesize)) +
|
||||||
(kp->p_vm_dsize * pagesize) + (kp->p_vm_ssize * pagesize);
|
(MEMSZ(kp->p_vm_dsize) * MEMSZ(pagesize)) + (MEMSZ(kp->p_vm_ssize) * MEMSZ(pagesize));
|
||||||
p->mem_rss = kp->p_vm_rssize * pagesize;
|
p->mem_rss = MEMSZ(kp->p_vm_rssize) * MEMSZ(pagesize);
|
||||||
p->mem_shared = kp->p_uru_ixrss;
|
|
||||||
p->priority = kp->p_priority - PZERO;
|
p->priority = kp->p_priority - PZERO;
|
||||||
p->nice = kp->p_nice - NZERO;
|
p->nice = kp->p_nice - NZERO;
|
||||||
p->tid = kp->p_tid;
|
p->tid = kp->p_tid;
|
||||||
|
@ -664,7 +663,6 @@ _proc_pidinfo(size_t pid)
|
||||||
p->state = _process_state_name(taskinfo.pbsd.pbi_status);
|
p->state = _process_state_name(taskinfo.pbsd.pbi_status);
|
||||||
p->mem_size = p->mem_virt = taskinfo.ptinfo.pti_virtual_size;
|
p->mem_size = p->mem_virt = taskinfo.ptinfo.pti_virtual_size;
|
||||||
p->mem_rss = taskinfo.ptinfo.pti_resident_size;
|
p->mem_rss = taskinfo.ptinfo.pti_resident_size;
|
||||||
p->mem_shared = 0;
|
|
||||||
p->priority = taskinfo.ptinfo.pti_priority;
|
p->priority = taskinfo.ptinfo.pti_priority;
|
||||||
p->nice = taskinfo.pbsd.pbi_nice;
|
p->nice = taskinfo.pbsd.pbi_nice;
|
||||||
p->numthreads = taskinfo.ptinfo.pti_threadnum;
|
p->numthreads = taskinfo.ptinfo.pti_threadnum;
|
||||||
|
@ -750,7 +748,6 @@ proc_info_by_pid(int pid)
|
||||||
p->state = _process_state_name(taskinfo.pbsd.pbi_status);
|
p->state = _process_state_name(taskinfo.pbsd.pbi_status);
|
||||||
p->mem_size = p->mem_virt = taskinfo.ptinfo.pti_virtual_size;
|
p->mem_size = p->mem_virt = taskinfo.ptinfo.pti_virtual_size;
|
||||||
p->mem_rss = taskinfo.ptinfo.pti_resident_size;
|
p->mem_rss = taskinfo.ptinfo.pti_resident_size;
|
||||||
p->mem_shared = 0;
|
|
||||||
p->priority = taskinfo.ptinfo.pti_priority;
|
p->priority = taskinfo.ptinfo.pti_priority;
|
||||||
p->nice = taskinfo.pbsd.pbi_nice;
|
p->nice = taskinfo.pbsd.pbi_nice;
|
||||||
p->numthreads = taskinfo.ptinfo.pti_threadnum;
|
p->numthreads = taskinfo.ptinfo.pti_threadnum;
|
||||||
|
@ -860,7 +857,7 @@ _proc_thread_info(struct kinfo_proc *kp, Eina_Bool is_thread)
|
||||||
p->cpu_time /= 10000;
|
p->cpu_time /= 10000;
|
||||||
p->state = _process_state_name(kp->ki_stat);
|
p->state = _process_state_name(kp->ki_stat);
|
||||||
p->mem_virt = kp->ki_size;
|
p->mem_virt = kp->ki_size;
|
||||||
p->mem_rss = kp->ki_rssize * pagesize;
|
p->mem_rss = MEMSZ(kp->ki_rssize) * MEMSZ(pagesize);
|
||||||
p->mem_size = p->mem_virt;
|
p->mem_size = p->mem_virt;
|
||||||
p->nice = kp->ki_nice - NZERO;
|
p->nice = kp->ki_nice - NZERO;
|
||||||
p->priority = kp->ki_pri.pri_level - PZERO;
|
p->priority = kp->ki_pri.pri_level - PZERO;
|
||||||
|
|
|
@ -35,10 +35,10 @@ typedef struct _Proc_Info
|
||||||
long cpu_time;
|
long cpu_time;
|
||||||
double cpu_usage;
|
double cpu_usage;
|
||||||
|
|
||||||
int64_t mem_size;
|
uint64_t mem_size;
|
||||||
int64_t mem_virt;
|
uint64_t mem_virt;
|
||||||
int64_t mem_rss;
|
uint64_t mem_rss;
|
||||||
int64_t mem_shared;
|
uint64_t mem_shared;
|
||||||
|
|
||||||
char *command;
|
char *command;
|
||||||
char *arguments;
|
char *arguments;
|
||||||
|
|
Loading…
Reference in New Issue