[EGIT] [apps/evisum] master 01/01: macro: Name.

[Alastair Poole]

netstar pushed a commit to branch master.

http://git.enlightenment.org/apps/evisum.git/commit/?id=59c7f1a702405044d38de61e67b2bdb0f9609c2e

commit 59c7f1a702405044d38de61e67b2bdb0f9609c2e
Author: Alastair Poole <nets...@gmail.com>
Date:   Tue May 11 09:45:39 2021 +0100

    macro: Name.
---
 src/bin/system/machine/memory.bogox |  8 ++++----
 src/bin/system/macros.h             |  2 +-
 src/bin/system/process.c            | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/bin/system/machine/memory.bogox 
b/src/bin/system/machine/memory.bogox
index d9983c9..90fa1e2 100644
--- a/src/bin/system/machine/memory.bogox
+++ b/src/bin/system/machine/memory.bogox
@@ -238,10 +238,10 @@ system_memory_usage_get(meminfo_t *memory)
 swap_out:
    if (swdev)
      free(swdev);
-   memory->cached = MEMSZ(uvmexp.pagesize) * MEMSZ(bcstats.numbufpages);
-   memory->used = MEMSZ(uvmexp.pagesize) * MEMSZ(uvmexp.active);
-   memory->buffered = MEMSZ(uvmexp.pagesize) * (MEMSZ(uvmexp.npages) - 
MEMSZ(uvmexp.free));
-   memory->shared = MEMSZ(uvmexp.pagesize) * MEMSZ(uvmexp.wired);
+   memory->cached = MEMSIZE(uvmexp.pagesize) * MEMSIZE(bcstats.numbufpages);
+   memory->used = MEMSIZE(uvmexp.pagesize) * MEMSIZE(uvmexp.active);
+   memory->buffered = MEMSIZE(uvmexp.pagesize) * (MEMSIZE(uvmexp.npages) - 
MEMSIZE(uvmexp.free));
+   memory->shared = MEMSIZE(uvmexp.pagesize) * MEMSIZE(uvmexp.wired);
 #elif defined(__MacOS__)
    int mib[2] = { CTL_HW, HW_MEMSIZE };
    size_t total;
diff --git a/src/bin/system/macros.h b/src/bin/system/macros.h
index 08aa15d..5e35042 100644
--- a/src/bin/system/macros.h
+++ b/src/bin/system/macros.h
@@ -10,6 +10,6 @@
 #define U8(n)  (uint8_t)  n
 #define I8(n)  (int8_t)   n
 
-#define MEMSZ U64
+#define MEMSIZE U64
 
 #endif
diff --git a/src/bin/system/process.c b/src/bin/system/process.c
index 12693fc..cbd0ee2 100644
--- a/src/bin/system/process.c
+++ b/src/bin/system/process.c
@@ -146,10 +146,10 @@ _mem_size(Proc_Info *proc)
                    &size, &resident, &shared, &text,
                    &dummy, &data, &dummy) == 7)
           {
-             proc->mem_rss = MEMSZ(resident) * MEMSZ(pagesize);
-             proc->mem_shared = MEMSZ(shared) * MEMSZ(pagesize);
+             proc->mem_rss = MEMSIZE(resident) * MEMSIZE(pagesize);
+             proc->mem_shared = MEMSIZE(shared) * MEMSIZE(pagesize);
              proc->mem_size = proc->mem_rss - proc->mem_shared;
-             proc->mem_virt = MEMSZ(size) * MEMSZ(pagesize);
+             proc->mem_virt = MEMSIZE(size) * MEMSIZE(pagesize);
           }
      }
 
@@ -477,9 +477,9 @@ _proc_get(Proc_Info *p, struct kinfo_proc *kp)
    snprintf(p->state, sizeof(p->state), "%s", state);
    snprintf(p->wchan, sizeof(p->wchan), "%s", kp->p_wmesg);
    p->cpu_time = kp->p_uticks + kp->p_sticks + kp->p_iticks;
-   p->mem_virt = p->mem_size = (MEMSZ(kp->p_vm_tsize) * MEMSZ(pagesize)) +
-      (MEMSZ(kp->p_vm_dsize) * MEMSZ(pagesize)) + (MEMSZ(kp->p_vm_ssize) * 
MEMSZ(pagesize));
-   p->mem_rss = MEMSZ(kp->p_vm_rssize) * MEMSZ(pagesize);
+   p->mem_virt = p->mem_size = (MEMSIZE(kp->p_vm_tsize) * MEMSIZE(pagesize)) +
+      (MEMSIZE(kp->p_vm_dsize) * MEMSIZE(pagesize)) + (MEMSIZE(kp->p_vm_ssize) 
* MEMSIZE(pagesize));
+   p->mem_rss = MEMSIZE(kp->p_vm_rssize) * MEMSIZE(pagesize);
    p->priority = kp->p_priority - PZERO;
    p->nice = kp->p_nice - NZERO;
    p->tid = kp->p_tid;
@@ -983,7 +983,7 @@ _proc_thread_info(struct kinfo_proc *kp, Eina_Bool 
is_thread)
    snprintf(p->state, sizeof(p->state), "%s", state);
    snprintf(p->wchan, sizeof(p->wchan), "%s", kp->ki_wmesg);
    p->mem_virt = kp->ki_size;
-   p->mem_rss = MEMSZ(kp->ki_rssize) * MEMSZ(pagesize);
+   p->mem_rss = MEMSIZE(kp->ki_rssize) * MEMSIZE(pagesize);
    p->start = kp->ki_start.tv_sec;
    p->mem_size = p->mem_virt;
    p->nice = kp->ki_nice - NZERO;

--