Memory: refactor, don't cache results

CarterLi · CarterLi · commit 6ff67e87eb79 · 2022-12-28T17:20:20.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -240,10 +240,8 @@ set(LIBFASTFETCH_SRC
     src/detection/host/host.c
     src/detection/locale/locale.c
     src/detection/media/media.c
-    src/detection/memory/memory.c
     src/detection/os/os.c
     src/detection/packages/packages.c
-    src/detection/swap/swap.c
     src/detection/terminalfont/terminalfont.c
     src/detection/terminalshell/terminalshell.c
     src/detection/title.c
diff --git a/src/detection/memory/memory.c b/src/detection/memory/memory.c
diff --git a/src/detection/memory/memory.h b/src/detection/memory/memory.h
@@ -5,6 +5,6 @@
 
 #include "detection/storage.h"
 
-const FFMemoryStorage* ffDetectMemory();
+void ffDetectMemory(FFMemoryStorage* result);
 
 #endif
diff --git a/src/detection/memory/memory_apple.c b/src/detection/memory/memory_apple.c
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <mach/mach.h>
 
-void ffDetectMemoryImpl(FFMemoryStorage* ram)
+void ffDetectMemory(FFMemoryStorage* ram)
 {
     ram->bytesTotal = (uint64_t) ffSysctlGetInt64("hw.memsize", 0);
     if(ram->bytesTotal == 0)
diff --git a/src/detection/memory/memory_bsd.c b/src/detection/memory/memory_bsd.c
@@ -1,7 +1,7 @@
 #include "memory.h"
 #include "common/sysctl.h"
 
-void ffDetectMemoryImpl(FFMemoryStorage* ram)
+void ffDetectMemory(FFMemoryStorage* ram)
 {
     uint32_t pageSize = (uint32_t) ffSysctlGetInt("hw.pagesize", 0);
     if(pageSize == 0)
diff --git a/src/detection/memory/memory_linux.c b/src/detection/memory/memory_linux.c
@@ -3,12 +3,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-void ffDetectMemoryImpl(FFMemoryStorage* swap)
+void ffDetectMemory(FFMemoryStorage* ram)
 {
     FILE* meminfo = fopen("/proc/meminfo", "r");
     if(meminfo == NULL)
     {
-        ffStrbufAppendS(&swap->error, "Failed to open /proc/meminfo");
+        ffStrbufAppendS(&ram->error, "Failed to open /proc/meminfo");
         return;
     }
 
@@ -37,9 +37,9 @@ void ffDetectMemoryImpl(FFMemoryStorage* swap)
 
     fclose(meminfo);
 
-    swap->bytesTotal = memTotal * (uint64_t) 1024;
-    if(swap->bytesTotal == 0)
-        ffStrbufAppendS(&swap->error, "Failed to read MemTotal");
+    ram->bytesTotal = memTotal * (uint64_t) 1024;
+    if(ram->bytesTotal == 0)
+        ffStrbufAppendS(&ram->error, "Failed to read MemTotal");
     else
-        swap->bytesUsed = (memTotal + shmem - memFree - buffers - cached - sReclaimable) * (uint64_t) 1024;
+        ram->bytesUsed = (memTotal + shmem - memFree - buffers - cached - sReclaimable) * (uint64_t) 1024;
 }
diff --git a/src/detection/memory/memory_windows.c b/src/detection/memory/memory_windows.c
@@ -1,6 +1,6 @@
 #include "memory.h"
 
-void ffDetectMemoryImpl(FFMemoryStorage* ram)
+void ffDetectMemory(FFMemoryStorage* ram)
 {
     MEMORYSTATUSEX statex = {
         .dwLength = sizeof(statex),
diff --git a/src/detection/storage.h b/src/detection/storage.h
@@ -10,7 +10,6 @@ typedef struct FFMemoryStorage
     FFstrbuf error;
     uint64_t bytesUsed;
     uint64_t bytesTotal;
-    uint8_t percentage;
 } FFMemoryStorage;
 
 #endif
diff --git a/src/detection/swap/swap.c b/src/detection/swap/swap.c
diff --git a/src/detection/swap/swap.h b/src/detection/swap/swap.h
@@ -5,6 +5,6 @@
 
 #include "detection/storage.h"
 
-const FFMemoryStorage* ffDetectSwap();
+void ffDetectSwap(FFMemoryStorage* result);
 
 #endif
diff --git a/src/detection/swap/swap_apple.c b/src/detection/swap/swap_apple.c
@@ -3,7 +3,7 @@
 
 #include <mach/mach.h>
 
-void ffDetectSwapImpl(FFMemoryStorage* swap)
+void ffDetectSwap(FFMemoryStorage* swap)
 {
     struct xsw_usage xsw;
     size_t size = sizeof(xsw);
diff --git a/src/detection/swap/swap_bsd.c b/src/detection/swap/swap_bsd.c
@@ -1,7 +1,7 @@
 #include "swap.h"
 #include "common/sysctl.h"
 
-void ffDetectSwapImpl(FFMemoryStorage* swap)
+void ffDetectSwap(FFMemoryStorage* swap)
 {
     swap->bytesTotal = (uint64_t)ffSysctlGetInt64("vm.swap_total", 0);
     swap->bytesUsed = (uint64_t)ffSysctlGetInt64("vm.swap_reserved", 0);
diff --git a/src/detection/swap/swap_linux.c b/src/detection/swap/swap_linux.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-void ffDetectSwapImpl(FFMemoryStorage* swap)
+void ffDetectSwap(FFMemoryStorage* swap)
 {
     FILE* meminfo = fopen("/proc/meminfo", "r");
     if(meminfo == NULL)
diff --git a/src/detection/swap/swap_windows.cpp b/src/detection/swap/swap_windows.cpp
@@ -9,7 +9,7 @@ extern "C" {
 #include <ntstatus.h>
 
 extern "C"
-void ffDetectSwapImpl(FFMemoryStorage* swap)
+void ffDetectSwap(FFMemoryStorage* swap)
 {
     SYSTEM_INFO sysInfo;
     GetNativeSystemInfo(&sysInfo);
diff --git a/src/fastfetch.h b/src/fastfetch.h
@@ -25,6 +25,7 @@
 
 static inline void ffUnused(int dummy, ...) { (void) dummy; }
 #define FF_UNUSED(...) ffUnused(0, __VA_ARGS__);
+#define FF_UNUSED_PARAM __attribute__ ((__unused__))
 
 #define FASTFETCH_LOGO_MAX_COLORS 9 //two digits would make parsing much more complicated (index 1 - 9)
 
diff --git a/src/modules/memory.c b/src/modules/memory.c
@@ -76,10 +76,18 @@ static void printMemory(FFinstance* instance, const char* name, const FFModuleAr
 
 void ffPrintMemory(FFinstance* instance)
 {
-    printMemory(instance, FF_MEMORY_MODULE_NAME, &instance->config.memory, ffDetectMemory());
+    FFMemoryStorage result;
+    ffStrbufInit(&result.error);
+    ffDetectMemory(&result);
+    printMemory(instance, FF_MEMORY_MODULE_NAME, &instance->config.memory, &result);
+    ffStrbufDestroy(&result.error);
 }
 
 void ffPrintSwap(FFinstance* instance)
 {
-    printMemory(instance, FF_SWAP_MODULE_NAME, &instance->config.swap, ffDetectSwap());
+    FFMemoryStorage result;
+    ffStrbufInit(&result.error);
+    ffDetectSwap(&result);
+    printMemory(instance, FF_SWAP_MODULE_NAME, &instance->config.swap, &result);
+    ffStrbufDestroy(&result.error);
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#include <string.h>`
`5`	`5`	`#include <mach/mach.h>`
`6`	`6`
`7`		`-void ffDetectMemoryImpl(FFMemoryStorage* ram)`
	`7`	`+void ffDetectMemory(FFMemoryStorage* ram)`
`8`	`8`	`{`
`9`	`9`	`ram->bytesTotal = (uint64_t) ffSysctlGetInt64("hw.memsize", 0);`
`10`	`10`	`if(ram->bytesTotal == 0)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#include "memory.h"`
`2`	`2`	`#include "common/sysctl.h"`
`3`	`3`
`4`		`-void ffDetectMemoryImpl(FFMemoryStorage* ram)`
	`4`	`+void ffDetectMemory(FFMemoryStorage* ram)`
`5`	`5`	`{`
`6`	`6`	`uint32_t pageSize = (uint32_t) ffSysctlGetInt("hw.pagesize", 0);`
`7`	`7`	`if(pageSize == 0)`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,12 @@`
`3`	`3`	`#include <stdlib.h>`
`4`	`4`	`#include <string.h>`
`5`	`5`
`6`		`-void ffDetectMemoryImpl(FFMemoryStorage* swap)`
	`6`	`+void ffDetectMemory(FFMemoryStorage* ram)`
`7`	`7`	`{`
`8`	`8`	`FILE* meminfo = fopen("/proc/meminfo", "r");`
`9`	`9`	`if(meminfo == NULL)`
`10`	`10`	`{`
`11`		`- ffStrbufAppendS(&swap->error, "Failed to open /proc/meminfo");`
	`11`	`+ ffStrbufAppendS(&ram->error, "Failed to open /proc/meminfo");`
`12`	`12`	`return;`
`13`	`13`	`}`
`14`	`14`
`@@ -37,9 +37,9 @@ void ffDetectMemoryImpl(FFMemoryStorage* swap)`
`37`	`37`
`38`	`38`	`fclose(meminfo);`
`39`	`39`
`40`		`- swap->bytesTotal = memTotal * (uint64_t) 1024;`
`41`		`- if(swap->bytesTotal == 0)`
`42`		`- ffStrbufAppendS(&swap->error, "Failed to read MemTotal");`
	`40`	`+ ram->bytesTotal = memTotal * (uint64_t) 1024;`
	`41`	`+ if(ram->bytesTotal == 0)`
	`42`	`+ ffStrbufAppendS(&ram->error, "Failed to read MemTotal");`
`43`	`43`	`else`
`44`		`- swap->bytesUsed = (memTotal + shmem - memFree - buffers - cached - sReclaimable) * (uint64_t) 1024;`
	`44`	`+ ram->bytesUsed = (memTotal + shmem - memFree - buffers - cached - sReclaimable) * (uint64_t) 1024;`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#include "memory.h"`
`2`	`2`
`3`		`-void ffDetectMemoryImpl(FFMemoryStorage* ram)`
	`3`	`+void ffDetectMemory(FFMemoryStorage* ram)`
`4`	`4`	`{`
`5`	`5`	`MEMORYSTATUSEX statex = {`
`6`	`6`	`.dwLength = sizeof(statex),`