Attachment 57361 Details for Bug 86572 – file.diff

[patch] file.diff

file.diff (text/plain), 3.40 KB, created by wollman on 2005-09-26 03:50:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: wollman

Created: 2005-09-26 03:50:15 UTC

Size: 3.40 KB

patch

obsolete

>--- ../../work.orig/net-snmp-5.2.1.2/agent/mibgroup/host/hr_swrun.c	Tue Jun  8 16:56:03 2004
>+++ agent/mibgroup/host/hr_swrun.c	Sun Sep 25 22:02:35 2005
>@@ -585,7 +585,7 @@
>         string[ sizeof(string)-1 ] = 0;
> #endif
> #elif HAVE_KVM_GETPROCS
>-    #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);
>@@ -694,7 +694,7 @@
>         *cp1 = 0;
> #endif
> #elif HAVE_KVM_GETPROCS
>-    #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);
>@@ -857,8 +857,25 @@
>         if (pid < PID_MAXSYS)
>             long_return = 2;    /* operatingSystem */
>         else
>-#endif
>             long_return = 4;    /* application */
>+#elif HAVE_KVM_GETPROCS
>+    #if defined(freebsd5) && __FreeBSD_version >= 500014
>+	if (proc_table[LowProcIndex].ki_flag & P_SYSTEM) {
>+	    if (proc_table[LowProcIndex].ki_pri.pri_class == PRI_ITHD)
>+		long_return = 3;/* deviceDriver */
>+	    else
>+		long_return = 2;/* operatingSystem */
>+	} else
>+	    long_return = 4;	/* application */
>+    #else
>+        if (proc_table[LowProcIndex].kp_proc.p_flag & P_SYSTEM)
>+	    long_return = 2;	/* operatingSystem */
>+	else
>+	    long_return = 4;	/* application */
>+    #endif
>+#else
>+	long_return = 4;	/* application */
>+#endif
>         return (u_char *) & long_return;
>     case HRSWRUN_STATUS:
> #if defined(cygwin)
>@@ -889,7 +906,7 @@
>         }
> #else
> #if HAVE_KVM_GETPROCS
>-    #if defined(freebsd5)
>+    #if defined(freebsd5) && __FreeBSD_version >= 500014
>         switch (proc_table[LowProcIndex].ki_stat) {
>     #else
>         switch (proc_table[LowProcIndex].kp_proc.p_stat) {
>@@ -988,7 +1005,13 @@
>         long_return = proc_buf->p_utime * 100 + proc_buf->p_stime * 100;
> #endif
> #elif HAVE_KVM_GETPROCS
>-    #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 +
>@@ -1063,7 +1086,14 @@
>         long_return = proc_buf->p_swrss;
> #endif
> #elif HAVE_KVM_GETPROCS
>-#if defined(freebsd3) && !defined(darwin)
>+#if 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;
>+#elif defined(freebsd3) && !defined(darwin)
>         long_return =
>     #if defined(freebsd5)
>             proc_table[LowProcIndex].ki_size / 1024;
>@@ -1349,7 +1379,7 @@
> #elif defined(solaris2)
>         return proc_table[current_proc_entry++];
> #elif HAVE_KVM_GETPROCS
>-    #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

Actions: View | Diff

Attachments on bug 86572: 57361