components/net-snmp/patches/026.7186501.cpu_kstat.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Thu, 30 Jan 2014 13:44:37 -0800
changeset 1679 51291a5fd692
parent 960 63899757c390
permissions -rw-r--r--
backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
960
63899757c390 7186501 net-snmp crashes in net_cpu_arch_load
lijo george - Sun Microsystems - Bangalore India <lijo.x.george@oracle.com>
parents:
diff changeset
     1
--- net-snmp-5.4.1/agent/mibgroup/hardware/cpu/cpu_kstat.c	Thu Oct  5 08:53:42 2006
63899757c390 7186501 net-snmp crashes in net_cpu_arch_load
lijo george - Sun Microsystems - Bangalore India <lijo.x.george@oracle.com>
parents:
diff changeset
     2
+++ net-snmp-5.4.1.mod/agent/mibgroup/hardware/cpu/cpu_kstat.c	Thu Mar 29 07:57:19 2012
63899757c390 7186501 net-snmp crashes in net_cpu_arch_load
lijo george - Sun Microsystems - Bangalore India <lijo.x.george@oracle.com>
parents:
diff changeset
     3
@@ -103,6 +103,8 @@
63899757c390 7186501 net-snmp crashes in net_cpu_arch_load
lijo george - Sun Microsystems - Bangalore India <lijo.x.george@oracle.com>
parents:
diff changeset
     4
         if (strcmp(ksp->ks_module, "cpu_stat") == 0) {
63899757c390 7186501 net-snmp crashes in net_cpu_arch_load
lijo george - Sun Microsystems - Bangalore India <lijo.x.george@oracle.com>
parents:
diff changeset
     5
             i    = ksp->ks_instance;
63899757c390 7186501 net-snmp crashes in net_cpu_arch_load
lijo george - Sun Microsystems - Bangalore India <lijo.x.george@oracle.com>
parents:
diff changeset
     6
             cpu2 = netsnmp_cpu_get_byIdx( i, 0 );
63899757c390 7186501 net-snmp crashes in net_cpu_arch_load
lijo george - Sun Microsystems - Bangalore India <lijo.x.george@oracle.com>
parents:
diff changeset
     7
+            if ( !cpu2 )
63899757c390 7186501 net-snmp crashes in net_cpu_arch_load
lijo george - Sun Microsystems - Bangalore India <lijo.x.george@oracle.com>
parents:
diff changeset
     8
+                    break;  /* or continue ?*/ /*Skip new CPUs */
63899757c390 7186501 net-snmp crashes in net_cpu_arch_load
lijo george - Sun Microsystems - Bangalore India <lijo.x.george@oracle.com>
parents:
diff changeset
     9
             if ((ksp->ks_type != KSTAT_TYPE_RAW) ||
63899757c390 7186501 net-snmp crashes in net_cpu_arch_load
lijo george - Sun Microsystems - Bangalore India <lijo.x.george@oracle.com>
parents:
diff changeset
    10
                 (ksp->ks_data_size != sizeof(cs))||
63899757c390 7186501 net-snmp crashes in net_cpu_arch_load
lijo george - Sun Microsystems - Bangalore India <lijo.x.george@oracle.com>
parents:
diff changeset
    11
                 (kstat_read(kstat_fd, ksp, &cs) == -1)) {