diff options
Diffstat (limited to 'net-mgmt/net-snmp-devel/files/patch-hr_swrun.c')
| -rw-r--r-- | net-mgmt/net-snmp-devel/files/patch-hr_swrun.c | 91 |
1 files changed, 37 insertions, 54 deletions
diff --git a/net-mgmt/net-snmp-devel/files/patch-hr_swrun.c b/net-mgmt/net-snmp-devel/files/patch-hr_swrun.c index 5ff95f18ca72..3bd1e7800e7b 100644 --- a/net-mgmt/net-snmp-devel/files/patch-hr_swrun.c +++ b/net-mgmt/net-snmp-devel/files/patch-hr_swrun.c @@ -1,60 +1,48 @@ ---- agent/mibgroup/host/hr_swrun.c.orig Fri Dec 20 00:07:30 2002 -+++ agent/mibgroup/host/hr_swrun.c Sat Aug 16 17:10:54 2003 -@@ -561,7 +561,11 @@ +--- agent/mibgroup/host/hr_swrun.c.orig Wed Jun 9 05:56:03 2004 ++++ agent/mibgroup/host/hr_swrun.c Fri Jun 25 10:56:38 2004 +@@ -585,7 +585,7 @@ string[ sizeof(string)-1 ] = 0; #endif #elif HAVE_KVM_GETPROCS -+#if defined(freebsd5) && __FreeBSD_version >= 500014 -+ strcpy(string, proc_table[LowProcIndex].ki_comm); -+#else +- #if defined(freebsd5) ++ #if defined(freebsd5) && __FreeBSD_version >= 500014 + strcpy(string, proc_table[LowProcIndex].ki_comm); + #else strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); -+#endif - #elif defined(linux) - sprintf(string, "/proc/%d/status", pid); - if ((fp = fopen(string, "r")) == NULL) -@@ -666,7 +670,11 @@ +@@ -694,7 +694,7 @@ *cp1 = 0; #endif #elif HAVE_KVM_GETPROCS -+#if defined(freebsd5) && __FreeBSD_version >= 500014 -+ strcpy(string, proc_table[LowProcIndex].ki_comm); -+#else +- #if defined(freebsd5) ++ #if defined(freebsd5) && __FreeBSD_version >= 500014 + strcpy(string, proc_table[LowProcIndex].ki_comm); + #else strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); -+#endif - #elif defined(linux) - sprintf(string, "/proc/%d/cmdline", pid); - if ((fp = fopen(string, "r")) == NULL) -@@ -857,7 +865,11 @@ +@@ -889,7 +889,7 @@ } #else #if HAVE_KVM_GETPROCS -+#if defined(freebsd5) && __FreeBSD_version >= 500014 -+ switch ( proc_table[LowProcIndex].ki_stat ) { -+#else +- #if defined(freebsd5) ++ #if defined(freebsd5) && __FreeBSD_version >= 500014 + switch (proc_table[LowProcIndex].ki_stat) { + #else switch (proc_table[LowProcIndex].kp_proc.p_stat) { -+#endif - #elif defined(dynix) - switch (lowpsinfo.pr_state) { - #elif defined(solaris2) -@@ -952,9 +964,17 @@ +@@ -988,7 +988,13 @@ long_return = proc_buf->p_utime * 100 + proc_buf->p_stime * 100; #endif #elif HAVE_KVM_GETPROCS -+#if defined(freebsd5) && __FreeBSD_version >= 500014 -+ /* XXX: Accessing ki_paddr causes sig10 ... -+ long_return = proc_table[LowProcIndex].ki_paddr->p_uticks + -+ proc_table[LowProcIndex].ki_paddr->p_sticks + -+ proc_table[LowProcIndex].ki_paddr->p_iticks; */ -+ long_return = 0; -+#else +- #if defined(freebsd5) ++ #if defined(freebsd5) && __FreeBSD_version >= 500014 ++ /* XXX: Accessing ki_paddr causes sig10 ... ++ long_return = proc_table[LowProcIndex].ki_paddr->p_uticks + ++ proc_table[LowProcIndex].ki_paddr->p_sticks + ++ proc_table[LowProcIndex].ki_paddr->p_iticks; */ ++ long_return = 0; ++ #elif defined(freebsd5) + long_return = proc_table[LowProcIndex].ki_runtime / 100000; + #else long_return = proc_table[LowProcIndex].kp_proc.p_uticks + - proc_table[LowProcIndex].kp_proc.p_sticks + - proc_table[LowProcIndex].kp_proc.p_iticks; -+#endif - #elif defined(linux) - sprintf(string, "/proc/%d/stat", pid); - if ((fp = fopen(string, "r")) == NULL) -@@ -1023,7 +1043,14 @@ +@@ -1063,7 +1069,14 @@ long_return = proc_buf->p_swrss; #endif #elif HAVE_KVM_GETPROCS @@ -68,19 +56,14 @@ + long_return = 0; +#elif defined(freebsd3) && !defined(darwin) long_return = - proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size / 1024; - #else -@@ -1303,8 +1330,13 @@ + #if defined(freebsd5) + proc_table[LowProcIndex].ki_size / 1024; +@@ -1349,7 +1362,7 @@ #elif defined(solaris2) return proc_table[current_proc_entry++]; #elif HAVE_KVM_GETPROCS -+#if defined(freebsd5) && __FreeBSD_version >= 500014 -+ if ( proc_table[current_proc_entry].ki_stat != 0 ) -+ return proc_table[current_proc_entry++].ki_pid; -+#else - if (proc_table[current_proc_entry].kp_proc.p_stat != 0) - return proc_table[current_proc_entry++].kp_proc.p_pid; -+#endif - #else - if (proc_table[current_proc_entry].p_stat != 0) - return proc_table[current_proc_entry++].p_pid; +- #if defined(freebsd5) ++ #if defined(freebsd5) && __FreeBSD_version >= 500014 + if (proc_table[current_proc_entry].ki_stat != 0) + return proc_table[current_proc_entry++].ki_pid; + #else |