feat: improve stability on unified memory systems

Author: giladgd

llama/addon/addon.cpp

@@ -1,22 +1,23 @@
-#include "addonGlobals.h"
+#include <atomic>
+#include <cstdlib>
+#include <mutex>
+
+#include "AddonContext.h"
 #include "AddonGgufMetadata.h"
-#include "AddonModel.h"
-#include "AddonModelLora.h"
 #include "AddonGrammar.h"
 #include "AddonGrammarEvaluationState.h"
+#include "AddonModel.h"
+#include "AddonModelLora.h"
 #include "AddonSampler.h"
-#include "AddonContext.h"
+#include "addonGlobals.h"
 #include "globals/addonLog.h"
 #include "globals/addonProgress.h"
 #include "globals/getGpuInfo.h"
+#include "globals/getProcessMemoryInfo.h"
 #include "globals/getSwapInfo.h"
-#include "globals/getMemoryInfo.h"
-
-#include <atomic>
-#include <cstdlib>
-#include <mutex>
+#include "globals/getSystemMemoryInfo.h"
 
-    std::mutex backendMutex;
+std::mutex backendMutex;
 bool backendInitialized = false;
 bool backendDisposed = false;
 
@@ -307,7 +308,8 @@ Napi::Object registerCallback(Napi::Env env, Napi::Object exports) {
         Napi::PropertyDescriptor::Function("getGpuType", getGpuType),
         Napi::PropertyDescriptor::Function("ensureGpuDeviceIsSupported", ensureGpuDeviceIsSupported),
         Napi::PropertyDescriptor::Function("getSwapInfo", getSwapInfo),
-        Napi::PropertyDescriptor::Function("getMemoryInfo", getMemoryInfo),
+        Napi::PropertyDescriptor::Function("getProcessMemoryInfo", getProcessMemoryInfo),
+        Napi::PropertyDescriptor::Function("getSystemMemoryInfo", getSystemMemoryInfo),
         Napi::PropertyDescriptor::Function("loadBackends", addonLoadBackends),
         Napi::PropertyDescriptor::Function("setNuma", addonSetNuma),
         Napi::PropertyDescriptor::Function("init", addonInit),

llama/addon/globals/getMemoryInfo.h

@@ -1,4 +1,4 @@
-#include "getMemoryInfo.h"
+#include "getProcessMemoryInfo.h"
 #include "addonLog.h"
 
 #ifdef __APPLE__
@@ -16,7 +16,7 @@
 #endif
 
 
-Napi::Value getMemoryInfo(const Napi::CallbackInfo& info) {
+Napi::Value getProcessMemoryInfo(const Napi::CallbackInfo& info) {
     uint64_t totalMemoryUsage = 0;
 
 #ifdef __APPLE__

llama/addon/globals/getMemoryInfo.cpp …a/addon/globals/getProcessMemoryInfo.cppllama/addon/globals/getMemoryInfo.cpp renamed to llama/addon/globals/getProcessMemoryInfo.cpp llama/addon/globals/getMemoryInfo.cpp renamed to llama/addon/globals/getProcessMemoryInfo.cpp

@@ -0,0 +1,4 @@
+#pragma once
+#include "napi.h"
+
+Napi::Value getProcessMemoryInfo(const Napi::CallbackInfo& info);