$NetBSD: patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c,v 1.7 2017/10/06 02:39:38 gavan Exp $

--- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig	2014-12-08 20:23:22.000000000 +0000
+++ agent/mibgroup/hardware/cpu/cpu_sysctl.c
@@ -10,6 +10,7 @@
 
 #include <stdlib.h>
 #include <unistd.h>
+#include <errno.h>
 #include <sys/types.h>
 
 #if defined(__FreeBSD__)
@@ -24,6 +25,9 @@
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/vmmeter.h>
+#ifdef HAVE_UVM_UVM_EXTERN_H
+#include <uvm/uvm_extern.h>
+#endif
 #ifdef HAVE_VM_VM_PARAM_H
 #include <vm/vm_param.h>
 #endif
@@ -43,7 +47,7 @@ void init_cpu_sysctl( void ) {
     int               i, n;
     size_t            siz;
     int               ncpu_mib[]  = { CTL_HW, HW_NCPU };
-#if !(defined(__NetBSD__) && ( defined(__i386__) || defined(__x86_64__) ) )
+#if !(defined(__FreeBSD__) && ( defined(__i386__) || defined(__x86_64__) ) )
     int               model_mib[] = { CTL_HW, HW_MODEL };
 #endif
     char              descr[ SNMP_MAXBUF ];
@@ -51,14 +55,17 @@ void init_cpu_sysctl( void ) {
     strcpy(cpu->name, "Overall CPU statistics");
 
     siz = sizeof(n);
-    sysctl(ncpu_mib, 2, &n, &siz, NULL, 0);
+    if (sysctl(ncpu_mib, 2, &n, &siz, NULL, 0) == -1)
+	snmp_log(LOG_ERR, "sysctl hw.ncpu failed (errno %d)\n", errno);
     if ( n <= 0 )
         n = 1;   /* Single CPU system */
     siz = sizeof(descr);
-#if defined(__NetBSD__) && ( defined(__i386__) || defined(__x86_64__) )
-    sysctlbyname("machdep.cpu_brand", descr, &siz, NULL, 0);
+#if defined(__FreeBSD__) && ( defined(__i386__) || defined(__x86_64__) )
+    if (sysctlbyname("machdep.cpu_brand", descr, &siz, NULL, 0) == -1)
+	snmp_log(LOG_ERR, "sysctl machdep.cpu_brand failed (errno %d)\n", errno)
 #else
-    sysctl(model_mib, 2, descr, &siz, NULL, 0);
+    if (sysctl(model_mib, 2, descr, &siz, NULL, 0) == -1)
+	snmp_log(LOG_ERR, "sysctl hw.model failed (errno %d)\n", errno);
 #endif
     for ( i = 0; i < n; i++ ) {
         cpu = netsnmp_cpu_get_byIdx( i, 1 );
@@ -158,7 +165,7 @@
     /*
      * Load the latest CPU usage statistics
      */
-int netsnmp_cpu_arch_load( netsnmp_cache *cache, void *magic ) {
+int __attribute__((optimize("O0"))) netsnmp_cpu_arch_load( netsnmp_cache *cache, void *magic ) {
 
     /*
      * Strictly speaking, BSDi ought to use
@@ -190,9 +197,11 @@ int netsnmp_cpu_arch_load( netsnmp_cache
     netsnmp_cpu_info *cpu = netsnmp_cpu_get_byIdx( -1, 0 );
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
-    sysctlbyname("kern.cp_time", cpu_stats, &cpu_size, NULL, 0);
+    if (sysctlbyname("kern.cp_time", cpu_stats, &cpu_size, NULL, 0) == -1)
+	snmp_log(LOG_ERR, "sysctl kern.cp_time failed (errno %d)\n", errno);
 #else
-    sysctl(cpu_mib, 2,  cpu_stats, &cpu_size, NULL, 0);
+    if (sysctl(cpu_mib, 2,  cpu_stats, &cpu_size, NULL, 0) == -1)
+	snmp_log(LOG_ERR, "sysctl kern.cpu failed (errno %d)\n", errno);
 #endif
     cpu->user_ticks = cpu_stats[CP_USER];
     cpu->nice_ticks = cpu_stats[CP_NICE];
@@ -206,7 +215,8 @@ int netsnmp_cpu_arch_load( netsnmp_cache
          * Interrupt/Context Switch statistics
          *   XXX - Do these really belong here ?
          */
-    sysctl(mem_mib, 2, &mem_stats, &mem_size, NULL, 0);
+    if (sysctl(mem_mib, 2, &mem_stats, &mem_size, NULL, 0) == -1)
+	snmp_log(LOG_ERR, "sysctl vm.vm_meter failed (errno %d)\n", errno);
     cpu->nInterrupts  = mem_stats.NS_VM_INTR;
     cpu->nCtxSwitches = mem_stats.NS_VM_SWTCH;
     cpu->swapIn       = mem_stats.NS_VM_SWAPIN;
@@ -218,6 +228,32 @@ int netsnmp_cpu_arch_load( netsnmp_cache
     cpu->pageOut      = mem_stats.NS_VM_PAGEOUT;
 #endif
 
+#if defined(__NetBSD__)
+    {
+	NETSNMP_CPU_STATS *ncpu_stats;
+	size_t ncpu_size = sizeof(*ncpu_stats) * cpu_num * CPUSTATES;
+	ncpu_stats = malloc(ncpu_size);
+	int i;
+	if (ncpu_stats == NULL) {
+	    snmp_log(LOG_ERR, "no memory for kern.cp_time (errno %d)\n", errno);
+	    return -1;
+	}
+	if (sysctlbyname("kern.cp_time", ncpu_stats, &ncpu_size, NULL, 0) == -1)
+	    snmp_log(LOG_ERR, "sysctl kern.cp_time failed (errno %d)\n", errno);
+	for (i = 0; i < cpu_num; i++) {
+	    netsnmp_cpu_info  *ncpu = netsnmp_cpu_get_byIdx( i, 1 );
+	    size_t j = i * CPUSTATES;
+	    ncpu->user_ticks = (unsigned long long)ncpu_stats[j + CP_USER];
+	    ncpu->nice_ticks = (unsigned long long)ncpu_stats[j + CP_NICE];
+	    ncpu->sys2_ticks = (unsigned long long)ncpu_stats[j + CP_SYS]+cpu_stats[j + CP_INTR];
+	    ncpu->kern_ticks = (unsigned long long)ncpu_stats[j + CP_SYS];
+	    ncpu->idle_ticks = (unsigned long long)ncpu_stats[j + CP_IDLE];
+	    ncpu->intrpt_ticks = (unsigned long long)ncpu_stats[j + CP_INTR];
+	}
+	free(ncpu_stats);
+    }
+#endif
+
 #ifdef NETSNMP_KERN_MCPU
 #if defined(KERN_CPTIME2)
     mcpu_size  = cpu_num*sizeof(cpu_stats);
@@ -225,7 +261,8 @@ int netsnmp_cpu_arch_load( netsnmp_cache
 #elif defined(__NetBSD__)
     mcpu_size  = cpu_num*sizeof(cpu_stats);
     mcpu_stats = malloc(mcpu_size);
-    sysctlbyname("kern.cp_time", mcpu_stats, &mcpu_size, NULL, 0);
+    if (sysctlbyname("kern.cp_time", mcpu_stats, &mcpu_size, NULL, 0) == -1)
+	snmp_log(LOG_ERR, "sysctl kern.mcpu failed (errno %d)\n", errno);
 #elif defined(__FreeBSD__)
     if (cp_times == -1) {
 	int ret = sysctlbyname("kern.cp_times", NULL, &mcpu_size, NULL, 0);