diff options
| author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2002-04-09 00:31:17 +0000 |
|---|---|---|
| committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2002-04-09 00:31:17 +0000 |
| commit | af620e968cae9fe1e3dbaf9b20efa019ccd3d8e9 (patch) | |
| tree | 49c00d988508a1e5231d2bc9680fbd6f00ebf6ca /net-mgmt/net-snmp/files/patch-hr_swrun.c | |
| parent | New port xvid snapshot release 20020404: An opensource MPEG-4 codec, (diff) | |
Upgrade to 4.2.4.
Some of our patches are integrated into original distribution.
Enable diskio mib-module by default.
Diffstat (limited to '')
| -rw-r--r-- | net-mgmt/net-snmp/files/patch-hr_swrun.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net-mgmt/net-snmp/files/patch-hr_swrun.c b/net-mgmt/net-snmp/files/patch-hr_swrun.c index 554ac1e1daef..c232386f873e 100644 --- a/net-mgmt/net-snmp/files/patch-hr_swrun.c +++ b/net-mgmt/net-snmp/files/patch-hr_swrun.c @@ -1,6 +1,6 @@ ---- agent/mibgroup/host/hr_swrun.c~ Wed Mar 14 22:45:56 2001 -+++ agent/mibgroup/host/hr_swrun.c Tue Mar 27 12:37:57 2001 -@@ -365,7 +365,11 @@ +--- agent/mibgroup/host/hr_swrun.c.orig Sat Feb 16 09:41:19 2002 ++++ agent/mibgroup/host/hr_swrun.c Sat Feb 16 23:41:05 2002 +@@ -543,7 +543,11 @@ strcpy(string, proc_buf->p_user.u_comm); #endif #elif HAVE_KVM_GETPROCS @@ -12,7 +12,7 @@ #elif defined(linux) sprintf( string, "/proc/%d/status", pid ); if ((fp = fopen( string, "r")) == NULL) return NULL; -@@ -417,7 +421,11 @@ +@@ -638,7 +642,11 @@ *cp1 = 0; #endif #elif HAVE_KVM_GETPROCS @@ -24,7 +24,7 @@ #elif defined(linux) sprintf( string, "/proc/%d/cmdline", pid ); if ((fp = fopen( string, "r")) == NULL) return NULL; -@@ -550,7 +558,11 @@ +@@ -810,7 +818,11 @@ } #else #if HAVE_KVM_GETPROCS @@ -33,10 +33,10 @@ +#else switch ( proc_table[LowProcIndex].kp_proc.p_stat ) { +#endif + #elif defined(dynix) + switch ( lowpsinfo.pr_state ) { #elif defined(solaris2) - #if _SLASH_PROC_METHOD_ - switch (proc_buf ? proc_buf->pr_lwp.pr_state : SIDL) { -@@ -631,9 +643,17 @@ +@@ -906,9 +918,17 @@ proc_buf->p_stime*100; #endif #elif HAVE_KVM_GETPROCS @@ -54,9 +54,9 @@ #elif defined(linux) sprintf( string, "/proc/%d/stat", pid ); if ((fp = fopen( string, "r")) == NULL) return NULL; -@@ -673,6 +693,13 @@ +@@ -976,6 +996,13 @@ #elif HAVE_KVM_GETPROCS - #ifdef freebsd3 + #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 @@ -68,7 +68,7 @@ #else long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_tsize + proc_table[LowProcIndex].kp_eproc.e_vm.vm_ssize + -@@ -819,8 +846,13 @@ +@@ -1237,8 +1264,13 @@ #elif defined(solaris2) return proc_table[current_proc_entry++]; #elif HAVE_KVM_GETPROCS |