darwin: Enhance memory metrics support for Apple Silicon (ARM64)

SuCicada · Apr 10, 2024 · 592d4fe · 592d4fe
1 parent b3d2dcc
commit 592d4fe
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 37 deletions.
diff --git a/darwin/DarwinMachine.c b/darwin/DarwinMachine.c
@@ -59,23 +59,21 @@ static unsigned DarwinMachine_allocateCPULoadInfo(processor_cpu_load_info_t* p)
    return cpu_count;
 }
 
-static void DarwinMachine_getVMStats(vm_statistics_t p) {
-   mach_msg_type_number_t info_size = HOST_VM_INFO_COUNT;
-
-   if (host_statistics(mach_host_self(), HOST_VM_INFO, (host_info_t)p, &info_size) != 0) {
-      CRT_fatalError("Unable to retrieve VM statistics");
-   }
-}
-
+static void DarwinMachine_getVMStats(DarwinMachine* this) {
 #if defined(__arm64__)
-static void DarwinMachine_getVMStats64(vm_statistics64_t p) {
    mach_msg_type_number_t info_size = HOST_VM_INFO64_COUNT;
 
-   if (host_statistics64(mach_host_self(), HOST_VM_INFO64, (host_info_t) p, &info_size) != 0) {
+   if (host_statistics64(mach_host_self(), HOST_VM_INFO64, (host_info_t)&this->vm_stats64, &info_size) != 0) {
       CRT_fatalError("Unable to retrieve VM statistics64");
    }
-}
+#else
+   mach_msg_type_number_t info_size = HOST_VM_INFO_COUNT;
+
+   if (host_statistics(mach_host_self(), HOST_VM_INFO, (host_info_t)&this->vm_stats, &info_size) != 0) {
+      CRT_fatalError("Unable to retrieve VM statistics");
+   }
 #endif
+}
 
 void Machine_scan(Machine* super) {
    DarwinMachine* host = (DarwinMachine*) super;
@@ -84,10 +82,7 @@ void Machine_scan(Machine* super) {
    DarwinMachine_freeCPULoadInfo(&host->prev_load);
    host->prev_load = host->curr_load;
    DarwinMachine_allocateCPULoadInfo(&host->curr_load);
-   DarwinMachine_getVMStats(&host->vm_stats);
-#if defined(__arm64__)
-   DarwinMachine_getVMStats64(&host->vm_stats64);
-#endif
+   DarwinMachine_getVMStats(host);
    openzfs_sysctl_updateArcStats(&host->zfs);
 }
 
@@ -104,10 +99,7 @@ Machine* Machine_new(UsersTable* usersTable, uid_t userId) {
    DarwinMachine_allocateCPULoadInfo(&this->curr_load);
 
    /* Initialize the VM statistics */
-   DarwinMachine_getVMStats(&this->vm_stats);
-#if defined(__arm64__)
-   DarwinMachine_getVMStats64(&this->vm_stats64);
-#endif
+   DarwinMachine_getVMStats(this);
 
    /* Initialize the ZFS kstats, if zfs.kext loaded */
    openzfs_sysctl_init(&this->zfs);

diff --git a/darwin/DarwinMachine.h b/darwin/DarwinMachine.h
@@ -18,9 +18,10 @@ typedef struct DarwinMachine_ {
    Machine super;
 
    host_basic_info_data_t host_info;
-   vm_statistics_data_t vm_stats;
 #if defined(__arm64__)
    vm_statistics64_data_t vm_stats64;
+#else
+   vm_statistics_data_t vm_stats;
 #endif
    processor_cpu_load_info_t prev_load;
    processor_cpu_load_info_t curr_load;

diff --git a/darwin/Platform.c b/darwin/Platform.c
@@ -290,38 +290,33 @@ double Platform_setCPUValues(Meter* mtr, unsigned int cpu) {
    return CLAMP(total, 0.0, 100.0);
 }
 
-#if defined(__arm64__)
 void Platform_setMemoryValues(Meter *mtr) {
    const DarwinMachine *dhost = (const DarwinMachine *) mtr->host;
+#if defined(__arm64__)
    const struct vm_statistics64 *vm = &dhost->vm_stats64;
+#else
+   const struct vm_statistics* vm = &dhost->vm_stats;
+#endif
    double page_K = (double) vm_page_size / (double) 1024;
-
    mtr->total = dhost->host_info.max_mem / 1024;
-   int used = vm->active_count + vm->inactive_count +
+#if defined(__arm64__)
+   natural_t used = vm->active_count + vm->inactive_count +
               vm->speculative_count + vm->wire_count +
               vm->compressor_page_count - vm->purgeable_count - vm->external_page_count;
-   mtr->values[MEMORY_METER_USED] = (double) (used - vm->compressor_page_count) * page_K;
-   // mtr->values[MEMORY_METER_SHARED] = "shared memory, like tmpfs and shm"
-   mtr->values[MEMORY_METER_COMPRESSED] = (double) vm->compressor_page_count * page_K;
-   mtr->values[MEMORY_METER_BUFFERS] = (double) vm->purgeable_count * page_K;
-   mtr->values[MEMORY_METER_CACHE] = (double) vm->inactive_count * page_K;
-   // mtr->values[MEMORY_METER_AVAILABLE] = "available memory"
-}
+   mtr->values[MEMORY_METER_USED] = (double)(used - vm->compressor_page_count) * page_K;
 #else
-void Platform_setMemoryValues(Meter* mtr) {
-   const DarwinMachine* dhost = (const DarwinMachine*) mtr->host;
-   const struct vm_statistics* vm = &dhost->vm_stats;
-   double page_K = (double)vm_page_size / (double)1024;
-
-   mtr->total = dhost->host_info.max_mem / 1024;
    mtr->values[MEMORY_METER_USED] = (double)(vm->active_count + vm->wire_count) * page_K;
+#endif
    // mtr->values[MEMORY_METER_SHARED] = "shared memory, like tmpfs and shm"
+#if defined(__arm64__)
+   mtr->values[MEMORY_METER_COMPRESSED] = (double)vm->compressor_page_count * page_K;
+#else
    // mtr->values[MEMORY_METER_COMPRESSED] = "compressed memory, like zswap on linux"
+#endif
    mtr->values[MEMORY_METER_BUFFERS] = (double)vm->purgeable_count * page_K;
    mtr->values[MEMORY_METER_CACHE] = (double)vm->inactive_count * page_K;
    // mtr->values[MEMORY_METER_AVAILABLE] = "available memory"
 }
-#endif
 
 void Platform_setSwapValues(Meter* mtr) {
    int mib[2] = {CTL_VM, VM_SWAPUSAGE};