diff options
Diffstat (limited to 'net-mgmt/net-snmp/files/patch-memory_freebsd.c')
| -rw-r--r-- | net-mgmt/net-snmp/files/patch-memory_freebsd.c | 42 |
1 files changed, 13 insertions, 29 deletions
diff --git a/net-mgmt/net-snmp/files/patch-memory_freebsd.c b/net-mgmt/net-snmp/files/patch-memory_freebsd.c index 1f996ad6edf2..ccdc537e629a 100644 --- a/net-mgmt/net-snmp/files/patch-memory_freebsd.c +++ b/net-mgmt/net-snmp/files/patch-memory_freebsd.c @@ -1,24 +1,14 @@ ---- agent/mibgroup/hardware/memory/memory_freebsd.c.orig 2006-03-07 01:23:52.000000000 +0900 -+++ agent/mibgroup/hardware/memory/memory_freebsd.c 2008-08-24 23:35:12.857234897 +0900 -@@ -47,6 +47,9 @@ - int phys_mem_mib[] = { CTL_HW, HW_PHYSMEM }; - int user_mem_mib[] = { CTL_HW, HW_USERMEM }; - -+ long bufspace; -+ -+ - /* - * Retrieve the memory information from the underlying O/S... - */ -@@ -54,6 +57,7 @@ - sysctl(phys_mem_mib, 2, &phys_mem, &mem_size, NULL, 0); - sysctl(user_mem_mib, 2, &user_mem, &mem_size, NULL, 0); +--- agent/mibgroup/hardware/memory/memory_freebsd.c.orig 2008-05-28 20:48:46.000000000 +0900 ++++ agent/mibgroup/hardware/memory/memory_freebsd.c 2008-11-14 16:56:48.000000000 +0900 +@@ -59,6 +59,7 @@ + sysctlbyname("vfs.bufspace", &bufspace, &buf_size, NULL, 0); + sysctlbyname("vfs.maxbufspace", &maxbufspace, &buf_size, NULL, 0); auto_nlist(SUM_SYMBOL, (char *) &vmem, sizeof(vmem)); + auto_nlist(BUFSPACE_SYMBOL, (char *) &bufspace, sizeof(bufspace)); #ifndef freebsd4 pagesize = 1024; #else -@@ -70,7 +74,7 @@ +@@ -75,7 +76,7 @@ if (!mem->descr) mem->descr = strdup("Physical memory"); mem->units = pagesize; @@ -27,26 +17,20 @@ mem->free = total.t_free; } -@@ -125,10 +129,22 @@ - if (!mem->descr) - mem->descr = strdup("Cached memory"); - mem->units = vmem.v_page_size; -- mem->size = vmem.v_cache_count; -+ mem->size = vmem.v_cache_count + vmem.v_inactive_count; -+ mem->free = -1; -+ } -+ +@@ -134,6 +135,17 @@ + mem->free = vmem.v_cache_max - vmem.v_cache_count; + } + + mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_MBUF, 1 ); + if (!mem) { + snmp_log_perror("No Memory Buffer info entry"); + } else { + if (!mem->descr) -+ mem->descr = strdup("Memory Buffer"); ++ mem->descr = strdup("Memory Buffer"); + mem->units = pagesize; + mem->size = bufspace/pagesize; - mem->free = -1; - } - ++ mem->free = -1; ++ } + nswap = swapmode(pagesize); mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_SWAP, 1 ); |