summaryrefslogtreecommitdiff
path: root/net/net-snmp/patches/patch-du
blob: b2eadd5dc786fdc420c999e41d1ecef8ac7cd454 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
$NetBSD: patch-du,v 1.2 2008/09/08 12:58:09 adam Exp $

--- agent/mibgroup/hardware/memory/memory_freebsd.c.orig	2008-05-28 13:48:46.000000000 +0200
+++ agent/mibgroup/hardware/memory/memory_freebsd.c
@@ -36,6 +36,12 @@ int netsnmp_mem_arch_load( netsnmp_cache
     long           pagesize;
     int            nswap;
 
+#ifdef dragonfly
+    struct vmstats vms;
+    size_t vms_size = sizeof(vms);
+    size_t vmem_size = sizeof(struct vmmeter);
+#endif
+
     struct vmmeter vmem;
     struct vmtotal total;
     size_t         total_size  = sizeof(total);
@@ -58,12 +64,18 @@ int netsnmp_mem_arch_load( netsnmp_cache
     sysctl(user_mem_mib, 2, &user_mem, &mem_size,      NULL, 0);
     sysctlbyname("vfs.bufspace",    &bufspace,    &buf_size, NULL, 0);
     sysctlbyname("vfs.maxbufspace", &maxbufspace, &buf_size, NULL, 0);
+#ifdef dragonfly
+    pagesize = getpagesize();
+    sysctlbyname("vm.vmstats", &vms, &vms_size, NULL, 0);
+    sysctlbyname("vm.vmmeter", &vmem, &vmem_size, NULL, 0);
+#else
     auto_nlist(SUM_SYMBOL,      (char *) &vmem,     sizeof(vmem));
 #ifndef freebsd4
     pagesize = 1024;
 #else
     pagesize = getpagesize();
 #endif
+#endif
 
     /*
      * ... and save this in a standard form.
@@ -129,9 +141,15 @@ int netsnmp_mem_arch_load( netsnmp_cache
     } else {
         if (!mem->descr)
              mem->descr = strdup("Cached memory");
+#ifdef dragonfly
+        mem->units = vms.v_page_size;
+        mem->size  = vms.v_cache_max;
+        mem->free  = vms.v_cache_max - vms.v_cache_count;
+#else
         mem->units = vmem.v_page_size;
         mem->size  = vmem.v_cache_max;
         mem->free  = vmem.v_cache_max - vmem.v_cache_count;
+#endif
     }
 
     nswap = swapmode(pagesize);