cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better processList: do not filter out init (so tree view works), use

Browse Source 
one single sysctl to get the whole list (ouch performance), mark a few
more processes as known...
This commit is contained in:
espie 2006-02-18 13:07:02 +00:00
parent 68b0b8a590
commit da95881fd2
3 changed files with 64 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/kde/base3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.55 2006/02/18 12:06:50 espie Exp $
# $OpenBSD: Makefile,v 1.56 2006/02/18 13:07:02 espie Exp $
COMMENT= "K Desktop Environment, basic applications"
COMMENT-plugins= "Konqueror nsplugins, essentially native JDK"
@ -6,7 +6,7 @@ COMMENT-samba= "K Desktop Environment, samba support"
CATEGORIES= x11 x11/kde
VERSION= 3.5.1
DISTNAME= kdebase-${VERSION}
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
PKGNAME-samba= kdesamba-${VERSION}
MODKDE_VERSION?= 3.5
SHARED_LIBS= kasbar 2.0 \

24
x11/kde/base3/patches/patch-ksysguard_gui_SensorDisplayLib_ProcessList_cc Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-ksysguard_gui_SensorDisplayLib_ProcessList_cc,v 1.1 2006/02/18 13:07:02 espie Exp $
--- ksysguard/gui/SensorDisplayLib/ProcessList.cc.orig Sat Feb 18 13:27:44 2006
+++ ksysguard/gui/SensorDisplayLib/ProcessList.cc Sat Feb 18 13:30:45 2006
@@ -170,6 +170,12 @@ ProcessList::ProcessList(QWidget *parent
aliases.insert("wwwoffled", new QString("daemon"));
aliases.insert("xntpd", new QString("daemon"));
aliases.insert("ypbind", new QString("daemon"));
+ aliases.insert("apmd", new QString("daemon"));
+ aliases.insert("getty", new QString("daemon"));
+ aliases.insert("mountd", new QString("daemon"));
+ aliases.insert("inetd", new QString("daemon"));
+ aliases.insert("nfsd", new QString("daemon"));
+ aliases.insert("wsmoused", new QString("daemon"));
/* kde applications */
aliases.insert("appletproxy", new QString("kdeapp"));
aliases.insert("dcopserver", new QString("kdeapp"));
@@ -194,6 +200,7 @@ ProcessList::ProcessList(QWidget *parent
aliases.insert("cat", new QString("tools"));
aliases.insert("egrep", new QString("tools"));
aliases.insert("emacs", new QString("wordprocessing"));
+ aliases.insert("vim", new QString("wordprocessing"));
aliases.insert("fgrep", new QString("tools"));
aliases.insert("find", new QString("tools"));
aliases.insert("grep", new QString("tools"));

81
x11/kde/base3/patches/patch-ksysguard_ksysguardd_OpenBSD_ProcessList_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ksysguard_ksysguardd_OpenBSD_ProcessList_c,v 1.2 2006/02/18 12:06:50 espie Exp $
$OpenBSD: patch-ksysguard_ksysguardd_OpenBSD_ProcessList_c,v 1.3 2006/02/18 13:07:02 espie Exp $
--- ksysguard/ksysguardd/OpenBSD/ProcessList.c.orig Sat Feb 11 11:45:05 2006
+++ ksysguard/ksysguardd/OpenBSD/ProcessList.c Sat Feb 18 13:03:33 2006
@@ -0,0 +1,505 @@
+++ ksysguard/ksysguardd/OpenBSD/ProcessList.c Sat Feb 18 14:02:58 2006
@@ -0,0 +1,500 @@
+/*
+ KSysGuard, the KDE System Guard
+
@ -210,15 +210,13 @@ $OpenBSD: patch-ksysguard_ksysguardd_OpenBSD_ProcessList_c,v 1.2 2006/02/18 12:0
+}
+
+static int
+updateProcess(int pid)
+updateProcess(struct kinfo_proc2 *p)
+{
+ static char *statuses[] = { "idle","run","sleep","stop","zombie" };
+
+ ProcessInfo* ps;
+ struct passwd* pwent;
+ int mib[6];
+ struct kinfo_proc2 p;
+ size_t len;
+ pid_t pid = p->p_pid;
+
+ if ((ps = findProcessInList(pid)) == 0)
+ {
@ -227,30 +225,19 @@ $OpenBSD: patch-ksysguard_ksysguardd_OpenBSD_ProcessList_c,v 1.2 2006/02/18 12:0
+ ps->centStamp = 0;
+ push_ctnr(ProcessList, ps);
+ bsort_ctnr(ProcessList, processCmp);
+ }
+ }
+
+ ps->alive = 1;
+
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_PROC2;
+ mib[2] = KERN_PROC_PID;
+ mib[3] = pid;
+ mib[4] = sizeof(p);
+ mib[5] = 1;
+
+ len = mib[4];
+ if (sysctl(mib, 6, &p, &len, NULL, 0) == -1 || !len)
+ return -1;
+
+ ps->pid = p.p_pid;
+ ps->ppid = p.p_ppid;
+ ps->uid = p.p_uid;
+ ps->gid = p.p_gid;
+ ps->priority = p.p_priority;
+ ps->niceLevel = p.p_nice;
+ ps->pid = p->p_pid;
+ ps->ppid = p->p_ppid;
+ ps->uid = p->p_uid;
+ ps->gid = p->p_gid;
+ ps->priority = p->p_priority;
+ ps->niceLevel = p->p_nice;
+
+ /* this isn't usertime -- it's total time (??) */
+ ps->userTime = p.p_uutime_sec*100+p.p_uutime_usec/100;
+ ps->userTime = p->p_uutime_sec*100+p->p_uutime_usec/100;
+ ps->sysTime = 0;
+ ps->sysLoad = 0;
+
@ -260,15 +247,15 @@ $OpenBSD: patch-ksysguard_ksysguardd_OpenBSD_ProcessList_c,v 1.2 2006/02/18 12:0
+ strlcpy(ps->userName,pwent&&pwent->pw_name? pwent->pw_name:"????",sizeof(ps->userName));
+ ps->userName[sizeof(ps->userName)-1]='\0';
+
+ ps->userLoad = p.p_pctcpu / 100;
+ ps->vmSize = (p.p_vm_tsize +
+ p.p_vm_dsize +
+ p.p_vm_ssize) * getpagesize();
+ ps->vmRss = p.p_vm_rssize * getpagesize();
+ strlcpy(ps->name,p.p_comm ? p.p_comm : "????", sizeof(ps->name));
+ strlcpy(ps->status,(p.p_stat>=1)&&(p.p_stat<=5)? statuses[p.p_stat-1]:"????", sizeof(ps->status));
+ ps->userLoad = p->p_pctcpu / 100;
+ ps->vmSize = (p->p_vm_tsize +
+ p->p_vm_dsize +
+ p->p_vm_ssize) * getpagesize();
+ ps->vmRss = p->p_vm_rssize * getpagesize();
+ strlcpy(ps->name,p->p_comm ? p->p_comm : "????", sizeof(ps->name));
+ strlcpy(ps->status,(p->p_stat>=1)&&(p->p_stat<=5)? statuses[p->p_stat-1]:"????", sizeof(ps->status));
+
+ fillProcessCmdline(ps->cmdline, &p, sizeof(ps->cmdline));
+ fillProcessCmdline(ps->cmdline, p, sizeof(ps->cmdline));
+ /* process command line */
+
+ return (0);
@ -334,21 +321,30 @@ $OpenBSD: patch-ksysguard_ksysguardd_OpenBSD_ProcessList_c,v 1.2 2006/02/18 12:0
+int
+updateProcessList(void)
+{
+ int mib[3];
+ int mib[6];
+ size_t len;
+ size_t num;
+ struct kinfo_proc *p;
+ struct kinfo_proc2 *p;
+
+
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_PROC;
+ mib[1] = KERN_PROC2;
+ mib[2] = KERN_PROC_ALL;
+ sysctl(mib, 3, NULL, &len, NULL, 0);
+ mib[3] = 0;
+ mib[4] = sizeof(struct kinfo_proc2);
+ mib[5] = 0;
+ if (sysctl(mib, 6, NULL, &len, NULL, 0) == -1)
+ return 0;
+ len = 5 * len / 4;
+ p = malloc(len);
+ sysctl(mib, 3, p, &len, NULL, 0);
+ if (!p)
+ return 0;
+ mib[5] = len/ sizeof(struct kinfo_proc2);
+ if (sysctl(mib, 6, p, &len, NULL, 0) == -1)
+ return 0;
+
+ for (num = 0; num < len / sizeof(struct kinfo_proc); num++)
+ updateProcess(p[num].kp_proc.p_pid);
+ for (num = 0; num < len / sizeof(struct kinfo_proc2); num++)
+ updateProcess(&p[num]);
+ free(p);
+ cleanupProcessList();
+
@ -367,8 +363,7 @@ $OpenBSD: patch-ksysguard_ksysguardd_OpenBSD_ProcessList_c,v 1.2 2006/02/18 12:0
+{
+ ProcessInfo* ps;
+
+ ps = first_ctnr(ProcessList); /* skip 'kernel' entry */
+ for (ps = next_ctnr(ProcessList); ps; ps = next_ctnr(ProcessList))
+ for (ps = first_ctnr(ProcessList); ps; ps = next_ctnr(ProcessList))
+ {
+ fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%d\t%d\t%s\t%s\n",
+ ps->name, (long)ps->pid, (long)ps->ppid,