ports/153179: net-snmp corrected memory stats output patch

[Y.A.]

>Number:         153179
>Category:       ports
>Synopsis:       net-snmp corrected memory stats output patch
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 15 14:00:19 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Y.A.
>Release:        7.3-RELEASE
>Organization:
>Environment:
FreeBSD test.inernal.net 7.3-RELEASE FreeBSD 7.3-RELEASE #2: Fri Jun 11 13:45:01 EEST 2010 root at test.inernal.net:/usr/obj/usr/src/sys/TEST amd64
>Description:
hi!

I create new version of patch-memory_freebsd.c which give us mostly right memory statistic output for UCD-SNMP-MIB and HOST_RESOURSE-MIB.


>How-To-Repeat:
compare output from snmpwalk memory from host and sysctl vm.stats.vm

>Fix:
take this patch and replace files/patch-memory_freebsd.c from net-snmp port dir

Patch attached with submission follows:

--- agent/mibgroup/hardware/memory/memory_freebsd.c.orig	2008-05-28 14:48:46.000000000 +0300
+++ agent/mibgroup/hardware/memory/memory_freebsd.c	2010-12-15 14:56:48.000000000 +0200
@@ -43,10 +43,17 @@
 
     u_long         phys_mem;
     u_long         user_mem;
+    unsigned int   cache_count;
+    unsigned int   cache_max;
     unsigned int   bufspace;
     unsigned int   maxbufspace;
+    unsigned int   inact_count;
+    unsigned int   page_count;
     size_t         mem_size  = sizeof(phys_mem);
+    size_t         cache_size  = sizeof(cache_count);
     size_t         buf_size  = sizeof(bufspace);
+    size_t         inact_size  = sizeof(inact_count);
+    size_t         page_size  = sizeof(page_count);
     int            phys_mem_mib[] = { CTL_HW, HW_PHYSMEM };
     int            user_mem_mib[] = { CTL_HW, HW_USERMEM };
 
@@ -56,15 +63,20 @@
     sysctl(total_mib,    2, &total,    &total_size,    NULL, 0);
     sysctl(phys_mem_mib, 2, &phys_mem, &mem_size,      NULL, 0);
     sysctl(user_mem_mib, 2, &user_mem, &mem_size,      NULL, 0);
+    sysctlbyname("vm.stats.vm.v_cache_count",    &cache_count,    &cache_size, NULL, 0);
+    sysctlbyname("vm.stats.vm.v_cache_max",    &cache_max,    &cache_size, NULL, 0);
+    sysctlbyname("vm.stats.vm.v_inactive_count",    &inact_count,    &inact_size, NULL, 0);
+    sysctlbyname("vm.stats.vm.v_page_count",    &page_count,    &page_size, NULL, 0);
     sysctlbyname("vfs.bufspace",    &bufspace,    &buf_size, NULL, 0);
     sysctlbyname("vfs.maxbufspace", &maxbufspace, &buf_size, NULL, 0);
-    auto_nlist(SUM_SYMBOL,      (char *) &vmem,     sizeof(vmem));
 #ifndef freebsd4
     pagesize = 1024;
 #else
     pagesize = getpagesize();
 #endif
 
+    nswap = swapmode(pagesize);
+
     /*
      * ... and save this in a standard form.
      */
@@ -75,7 +87,7 @@
         if (!mem->descr)
              mem->descr = strdup("Physical memory");
         mem->units = pagesize;
-        mem->size  = user_mem/pagesize;
+        mem->size  = page_count;
         mem->free  = total.t_free;
     }
 
@@ -87,7 +99,7 @@
              mem->descr = strdup("Real memory");
         mem->units = pagesize;
         mem->size  = total.t_rm;
-        mem->free  = total.t_arm;
+        mem->free  = total.t_rm - total.t_arm;
     }
 
     mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_VIRTMEM, 1 );
@@ -97,8 +109,8 @@
         if (!mem->descr)
              mem->descr = strdup("Virtual memory");
         mem->units = pagesize;
-        mem->size  = total.t_vm;
-        mem->free  = total.t_avm;
+        mem->size  = phys_mem/pagesize + swapTotal;
+        mem->free  = total.t_free + swapFree;
     }
 
     mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_SHARED, 1 );
@@ -109,7 +121,7 @@
              mem->descr = strdup("Shared virtual memory");
         mem->units = pagesize;
         mem->size  = total.t_vmshr;
-        mem->free  = total.t_avmshr;
+        mem->free  = total.t_vmshr - total.t_avmshr;
     }
 
     mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_SHARED2, 1 );
@@ -120,7 +132,7 @@
              mem->descr = strdup("Shared real memory");
         mem->units = pagesize;
         mem->size  = total.t_rmshr;
-        mem->free  = total.t_armshr;
+        mem->free  = total.t_rmshr - total.t_armshr;
     }
 
     mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_CACHED, 1 );
@@ -129,12 +141,11 @@
     } else {
         if (!mem->descr)
              mem->descr = strdup("Cached memory");
-        mem->units = vmem.v_page_size;
-        mem->size  = vmem.v_cache_max;
-        mem->free  = vmem.v_cache_max - vmem.v_cache_count;
+        mem->units = pagesize;
+        mem->size  = cache_count + inact_count;
+        mem->free  = cache_max - cache_count;
     }
 
-    nswap = swapmode(pagesize);
     mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_SWAP, 1 );
     if (!mem) {
         snmp_log_perror("No Swap info entry");


>Release-Note:
>Audit-Trail:
>Unformatted: