head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.24
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.22
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.20
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.18
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.16
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.14
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.12
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.10
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.8
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.6
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.4
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.2
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.2.0.4
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.2
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.1.0.8
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.6
	pkgsrc-2006Q3-base:1.1
	pkgsrc-2006Q2:1.1.0.4
	pkgsrc-2006Q2-base:1.1
	pkgsrc-2006Q1:1.1.0.2
	pkgsrc-2006Q1-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2007.09.20.21.12.24;	author wiz;	state dead;
branches;
next	1.2;

1.2
date	2007.04.04.18.53.45;	author gdt;	state Exp;
branches;
next	1.1;

1.1
date	2006.02.28.23.48.12;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Rename libgtop2 to libgtop, to match upstream name.
@
text
@$NetBSD: patch-ao,v 1.2 2007/04/04 18:53:45 gdt Exp $

--- sysdeps/freebsd/procuid.c.orig	2005-12-12 10:09:39.000000000 +0000
+++ sysdeps/freebsd/procuid.c
@@@@ -53,11 +53,16 @@@@ void
 glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf,
 			pid_t pid)
 {
+#if defined(KERN_PROC2)
+	struct kinfo_proc2 *pinfo;
+#else
 	struct kinfo_proc *pinfo;
+#endif
 	int count = 0;
 
 #if LIBGTOP_VERSION_CODE >= 1001000
-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) \
+    && !defined(KERN_PROC2)
 	struct ucred ucred;
 	void *ucred_ptr;
 #endif
@@@@ -71,7 +76,12 @@@@ glibtop_get_proc_uid_p (glibtop *server,
 	if (pid == 0) return;
 
 	/* Get the process information */
+#if defined(KERN_PROC2)
+	pinfo = kvm_getproc2 (server->machine.kd, KERN_PROC_PID, pid,
+			sizeof(struct kinfo_proc2), &count);
+#else
 	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+#endif
 	if ((pinfo == NULL) || (count != 1)) {
 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
 		return;
@@@@ -92,8 +102,28 @@@@ glibtop_get_proc_uid_p (glibtop *server,
 #else
 #define	PROC_PRIORITY	ki_priority
 #endif
-#else
+#elif defined(__DragonFly__)
+#define	PROC_RUID	kp_eproc.e_ucred.cr_ruid
+#define	PROC_SVUID	kp_eproc.e_ucred.cr_svuid
+#define	PROC_RGID	kp_eproc.e_ucred.cr_rgid
+#define	PROC_SVGID	kp_eproc.e_ucred.cr_svgid
+#define	PROC_PPID	kp_eproc.e_ppid
+#define	PROC_PGID	kp_eproc.e_pgid
+#define	PROC_TPGID	kp_eproc.e_tpgid
+#define	PROC_NICE	kp_proc.p_nice
+
+#elif defined(KERN_PROC2) /* && defined(__NetBSD__) ? */
+#define	PROC_RUID	p_ruid
+#define	PROC_SVUID	p_svuid
+#define	PROC_RGID	p_rgid
+#define	PROC_SVGID	p_svgid
+#define	PROC_PPID	p_ppid
+#define	PROC_PGID	p__pgid
+#define	PROC_TPGID	p_tpgid
+#define	PROC_NICE	p_nice
+#define	PROC_PRIORITY	p_priority
 
+#else
 #define	PROC_RUID	kp_eproc.e_pcred.p_ruid
 #define	PROC_SVUID	kp_eproc.e_pcred.p_svuid
 #define	PROC_RGID	kp_eproc.e_pcred.p_rgid
@@@@ -116,7 +146,7 @@@@ glibtop_get_proc_uid_p (glibtop *server,
 	buf->tpgid = pinfo [0].PROC_TPGID;
 
 	buf->nice     = pinfo [0].PROC_NICE;
-#if defined(__NetBSD__) && defined(SACTIVE)
+#if defined(__DragonFly__) || (defined(__NetBSD__) && defined(SACTIVE))
 	buf->priority = 0;
 #else
 	buf->priority = pinfo [0].PROC_PRIORITY;
@


1.2
log
@Fix compilation under post-newlock2 NetBSD-current.  Now
gnome-system-monitor applet seems to work.  (Patch from Blair Sadewitz
on pkgsrc-users (maybe really from apb@@).)

Caveat:
  Switching on KERN_PROC2 sysctl define seems somewhat unclean.
  All of this needs to be merged upstream.
@
text
@d1 1
a1 1
$NetBSD: patch-ao,v 1.1 2006/02/28 23:48:12 joerg Exp $
@


1.1
log
@Add support for DragonFly. There are some minor issues left, e.g.
installing of the backend daemon as kmem, but I don't want to make
it the default, since almost all operations work without it.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- sysdeps/freebsd/procuid.c.orig	2004-09-23 22:44:19.000000000 +0000
d5 32
a36 1
@@@@ -91,8 +91,17 @@@@ glibtop_get_proc_uid_p (glibtop *server,
d50 11
d66 1
a66 1
@@@@ -115,7 +124,7 @@@@ glibtop_get_proc_uid_p (glibtop *server,
@