1 files changed, 120 insertions, 0 deletions
diff --git a/sysutils/wmtop/files/patch-wmtop.c b/sysutils/wmtop/files/patch-wmtop.c
new file mode 100644
index 000000000000..7ce361ad4045
--- /dev/null
+++ b/sysutils/wmtop/files/patch-wmtop.c
@@ -0,0 +1,120 @@
+--- wmtop.c.orig	Wed Mar  7 05:30:56 2001
++++ wmtop.c	Fri Feb 25 22:34:36 2005
+@@ -70,6 +70,13 @@
+ #include "xpm/wmtop-neon2.xpm"
+ #include "xpm/wmtop-rainbow.xpm"
+ 
++#ifdef NO_PROCFS
++#include <kvm.h>
++#include <sys/sysctl.h>
++#include <sys/user.h>
++#include <sys/resource.h>
++#endif
++
+ /******************************************/
+ /* Defines                                */
+ /******************************************/
+@@ -191,6 +198,9 @@
+     int rss;
+     int time_stamp;
+     int counted;
++#ifdef NO_PROCFS
++    struct kinfo_proc *kp;
++#endif
+ };
+ 
+ /******************************************/
+@@ -455,17 +465,19 @@
+  * Anyone hoping to port wmtop should look here first.
+  */
+ int process_parse_procfs(struct process *process) {
++#if !defined(NO_PROCFS)
+     char line[WMTOP_BUFLENGTH],filename[WMTOP_BUFLENGTH],procname[WMTOP_BUFLENGTH];
+     int ps;
+     struct stat sbuf;
+-    int user_time,kernel_time;
+     int rc;
++#endif
++    int user_time,kernel_time;
+ #if defined(LINUX)
+     char *r,*q;
+     char deparenthesised_name[WMTOP_BUFLENGTH];
+ 		int endl;
+ #endif /* defined(LINUX) */
+-#if defined(FREEBSD)
++#if defined(FREEBSD) && !defined(NO_PROCFS)
+     int us,um,ks,km;
+ #endif /* defined(FREEBSD) */
+ 
+@@ -473,6 +485,15 @@
+     assert(process->id==0x0badfeed);
+ #endif /* defined(PARANOID) */
+ 
++#if defined(NO_PROCFS)
++#define GETV(u) ((u).tv_sec * 1000 + (u).tv_usec / 1000)
++    process->time_stamp = g_time;
++    if(process->name)
++        wmtop_free(process->name);
++    process->name = wmtop_strdup(process->kp->ki_comm);
++    process->user_time = GETV(process->kp->ki_rusage.ru_utime);
++    process->kernel_time = GETV(process->kp->ki_rusage.ru_stime);
++#else
+     sprintf(filename,PROCFS_TEMPLATE,process->pid);
+ 
+     /*
+@@ -582,6 +603,7 @@
+     process->user_time = us*1000+um/1000;
+     process->kernel_time = ks*1000+km/1000;
+ #endif /* defined(FREEBSD) */
++#endif /* defined(NO_PROCFS) */
+ 
+     process->rss *= getpagesize();
+ 
+@@ -607,6 +629,39 @@
+ /******************************************/
+ 
+ int update_process_table() {
++#if defined(NO_PROCFS)
++    kvm_t *kd;
++    int n;
++    struct kinfo_proc *p;
++
++    if((kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "wmtop")) == NULL)
++        return 1;
++
++    if((p = kvm_getprocs(kd, KERN_PROC_ALL, 0, &n)) == NULL)
++        return 1;
++
++    for(; n > 0; n --, p ++)
++    {
++      char **argv;
++      struct process *pp;
++
++      if((argv = kvm_getargv(kd, p, 0)) == NULL ||
++         argv[0] == NULL)
++        continue;
++
++      pp = find_process(p->ki_pid);
++      if(!pp)
++          pp = new_process(p->ki_pid);
++
++      pp->kp = p;
++      calculate_cpu(pp);
++    }
++
++    if(kvm_close(kd) != 0)
++        return 1;
++
++    return 0;
++#else
+     DIR *dir;
+     struct dirent *entry;
+ 
+@@ -640,6 +695,7 @@
+     closedir(dir);
+ 
+     return 0;
++#endif /* defined(NO_PROCFS) */
+ }
+ 
+ /******************************************/