$NetBSD: patch-fi,v 1.3 2006/10/08 07:49:27 markd Exp $

--- ksysguard/ksysguardd/NetBSD/Memory.c.orig	2006-10-08 15:49:27.000000000 +1300
+++ ksysguard/ksysguardd/NetBSD/Memory.c
@@ -45,8 +45,11 @@
 static size_t Total = 0;
 static size_t MFree = 0;
 static size_t Used = 0;
-static size_t Buffers = 0;
-static size_t Cached = 0;
+static size_t Active = 0;
+static size_t Inactive = 0;
+static size_t Wired = 0;
+static size_t Execpages = 0;
+static size_t Filepages = 0;
 static size_t STotal = 0;
 static size_t SFree = 0;
 static size_t SUsed = 0;
@@ -55,19 +58,18 @@ static kvm_t *kd;
 void
 initMemory(struct SensorModul* sm)
 {
-	char *nlistf = NULL;
-	char *memf = NULL;
-	char buf[_POSIX2_LINE_MAX];
-	
-	if ((kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, buf)) == NULL) {
-		log_error("kvm_openfiles()");
+	if ((kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, "kvm_open")) == NULL) {
+		log_error("kvm_open()");
 		return;
 	}
 
         registerMonitor("mem/physical/free", "integer", printMFree, printMFreeInfo, sm);
 	registerMonitor("mem/physical/used", "integer", printUsed, printUsedInfo, sm);
-	registerMonitor("mem/physical/buf", "integer", printBuffers, printBuffersInfo, sm);
-	registerMonitor("mem/physical/cached", "integer", printCached, printCachedInfo, sm);
+	registerMonitor("mem/physical/active", "integer", printActive, printActiveInfo, sm);
+	registerMonitor("mem/physical/inactive", "integer", printInactive, printInactiveInfo, sm);
+	registerMonitor("mem/physical/wired", "integer", printWired, printWiredInfo, sm);
+	registerMonitor("mem/physical/execpages", "integer", printExecpages, printExecpagesInfo, sm);
+	registerMonitor("mem/physical/filepages", "integer", printFilepages, printFilepagesInfo, sm);
 	registerMonitor("mem/swap/free", "integer", printSwapFree, printSwapFreeInfo, sm);
 	registerMonitor("mem/swap/used", "integer", printSwapUsed, printSwapUsedInfo, sm);
 }
@@ -83,7 +85,6 @@ updateMemory(void)
 {
 
 #define ARRLEN(X) (sizeof(X)/sizeof(X[0]))
-  long pagesize; /* using a long promotes the arithmetic */
   size_t len;
   
   {
@@ -95,37 +96,26 @@ updateMemory(void)
   }
  
   {
-    struct uvmexp x;
-    static int mib[] = { CTL_VM, VM_UVMEXP };
+    struct uvmexp_sysctl x;
+    static int mib[] = { CTL_VM, VM_UVMEXP2 };
     
     len = sizeof(x);
     STotal = SUsed = SFree = -1;
-    pagesize = 1;
+    Active = Inactive = Wired = Execpages = Filepages = MFree = Used = -1;
     if (-1 < sysctl(mib, ARRLEN(mib), &x, &len, NULL, 0)) {
-      pagesize = x.pagesize;
-      STotal = (pagesize*x.swpages) >> 10;
-      SUsed = (pagesize*x.swpginuse) >> 10;
+      STotal = (x.pagesize*x.swpages) >> 10;
+      SUsed = (x.pagesize*x.swpginuse) >> 10;
       SFree = STotal - SUsed;
+      MFree = (x.free * x.pagesize) >> 10;
+      Active = (x.active * x.pagesize) >> 10;
+      Inactive = (x.inactive * x.pagesize) >> 10;
+      Wired = (x.wired * x.pagesize) >> 10;
+      Execpages = (x.execpages * x.pagesize) >> 10;
+      Filepages = (x.filepages * x.pagesize) >> 10;
+      Used = Total - MFree;
     }
   }
  
-  /* can't find NetBSD filesystem buffer info */
-  Buffers = -1;
- 
-  /* NetBSD doesn't know about vm.stats */
-  Cached = -1;
-  
-  {
-    static int mib[]={ CTL_VM, VM_METER };
-    struct vmtotal x;
-    
-    len = sizeof(x);
-    MFree = Used = -1;
-    if (sysctl(mib, ARRLEN(mib), &x, &len, NULL, 0) > -1) {
-      MFree = (x.t_free * pagesize) >> 10;
-      Used = (x.t_rm * pagesize) >> 10;
-    }
-  }
   return 0;
 }
 
@@ -154,27 +144,63 @@ printUsedInfo(const char* cmd)
 }
 
 void
-printBuffers(const char* cmd)
+printActive(const char* cmd)
+{
+	fprintf(CurrentClient, "%d\n", Active);
+}
+
+void
+printActiveInfo(const char* cmd)
+{
+	fprintf(CurrentClient, "Active Memory\t0\t%d\tKB\n", Total);
+}
+
+void
+printInactive(const char* cmd)
+{
+	fprintf(CurrentClient, "%d\n", Inactive);
+}
+
+void
+printInactiveInfo(const char* cmd)
+{
+	fprintf(CurrentClient, "Inactive Memory\t0\t%d\tKB\n", Total);
+}
+
+void
+printWired(const char* cmd)
+{
+	fprintf(CurrentClient, "%d\n", Wired);
+}
+
+void
+printWiredInfo(const char* cmd)
+{
+	fprintf(CurrentClient, "Wired Memory\t0\t%d\tKB\n", Total);
+}
+
+void
+printExecpages(const char* cmd)
 {
-	fprintf(CurrentClient, "%d\n", Buffers);
+	fprintf(CurrentClient, "%d\n", Execpages);
 }
 
 void
-printBuffersInfo(const char* cmd)
+printExecpagesInfo(const char* cmd)
 {
-	fprintf(CurrentClient, "Buffer Memory\t0\t%d\tKB\n", Total);
+	fprintf(CurrentClient, "Exec Pages\t0\t%d\tKB\n", Total);
 }
 
 void
-printCached(const char* cmd)
+printFilepages(const char* cmd)
 {
-	fprintf(CurrentClient, "%d\n", Cached);
+	fprintf(CurrentClient, "%d\n", Filepages);
 }
 
 void
-printCachedInfo(const char* cmd)
+printFilepagesInfo(const char* cmd)
 {
-	fprintf(CurrentClient, "Cached Memory\t0\t%d\tKB\n", Total);
+	fprintf(CurrentClient, "File Pages\t0\t%d\tKB\n", Total);
 }
 
 void