d872659bfa
snmplib:
- [PATCH 1921861]: Avoid endless loop after truncating 64bit int
- Better handling of CONTAINER_INSERT failures with multiple indices
snmpd:
- [PATCH 2023633]: add SCTP-MIB implementation (Linux only)
- suppress annoying "registration != duplicate" warning for root oids
build:
- [BUG 2023803]: Compilation problems on HP-UX 11.31
- Update to libtool 1.5.26
AIX:
- Add support for AIX 6.x.
52 lines
1.7 KiB
Text
52 lines
1.7 KiB
Text
$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);
|