diff options
Diffstat (limited to 'net-mgmt/net-snmp/files/patch-hr_swrun.c')
| -rw-r--r-- | net-mgmt/net-snmp/files/patch-hr_swrun.c | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/net-mgmt/net-snmp/files/patch-hr_swrun.c b/net-mgmt/net-snmp/files/patch-hr_swrun.c deleted file mode 100644 index a2afd1c61cf3..000000000000 --- a/net-mgmt/net-snmp/files/patch-hr_swrun.c +++ /dev/null @@ -1,84 +0,0 @@ ---- agent/mibgroup/host/hr_swrun.c.orig Sat Apr 20 16:30:03 2002 -+++ agent/mibgroup/host/hr_swrun.c Wed Apr 24 01:43:15 2002 -@@ -557,7 +557,11 @@ - strcpy(string, proc_buf->p_user.u_comm); - #endif - #elif HAVE_KVM_GETPROCS -+#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) -@@ -662,7 +666,11 @@ - *cp1 = 0; - #endif - #elif HAVE_KVM_GETPROCS -+#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) -@@ -853,7 +861,11 @@ - } - #else - #if HAVE_KVM_GETPROCS -+#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) -@@ -948,9 +960,17 @@ - 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 - 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) -@@ -1022,6 +1042,13 @@ - #if defined(freebsd3) && !defined(darwin) - long_return = - proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size / 1024; -+#elif defined(freebsd5) && __FreeBSD_version >= 500014 -+ /* XXX -+ long_return = proc_table[LowProcIndex].ki_vmspace->vm_tsize + -+ proc_table[LowProcIndex].ki_vmspace->vm_ssize + -+ proc_table[LowProcIndex].ki_vmspace->vm_dsize; -+ long_return = long_return * (getpagesize() / 1024); */ -+ long_return = 0; - #else - long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_tsize + - proc_table[LowProcIndex].kp_eproc.e_vm.vm_ssize + -@@ -1299,8 +1326,13 @@ - #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; |