head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.50 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.48 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.46 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.44 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.42 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.40 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.38 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.36 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.34 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.32 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.30 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.28 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.26 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.24 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.22 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.20 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.18 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.16 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.14 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.12 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.10 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.8 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.6 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.4 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.2 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.3.0.2 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.2.0.4 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.2 netbsd-1-6-1-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2004.04.01.18.34.27; author jmmv; state dead; branches; next 1.3; 1.3 date 2003.12.13.20.27.42; author xtraeme; state Exp; branches; next 1.2; 1.2 date 2003.01.21.20.08.10; author rh; state Exp; branches; next 1.1; 1.1 date 2002.11.04.02.56.17; author rh; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.11.04.02.56.17; author rh; state Exp; branches; next ; desc @@ 1.4 log @Update to 2.5.2: - plenty of code cleanups - removed the dependency on libgnome, only glib required now - Linux 2.6 support, NetBSD support and better FreeBSD support - Make the block size available for filesystem statistics @ text @$NetBSD: patch-an,v 1.3 2003/12/13 20:27:42 xtraeme Exp $ --- sysdeps/freebsd/procuid.c.orig Fri Sep 5 23:46:58 2003 +++ sysdeps/freebsd/procuid.c Fri Sep 5 23:51:37 2003 @@@@ -35,15 +35,7 @@@@ (1L << GLIBTOP_PROC_UID_NICE); static const unsigned long _glibtop_sysdeps_proc_uid_groups = -#if LIBGTOP_VERSION_CODE >= 1001000 -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) -(1L << GLIBTOP_PROC_UID_NGROUPS) + (1L << GLIBTOP_PROC_UID_GROUPS); -#else -0L; -#endif -#else /* LIBGTOP_VERSION_CODE < 1001000 */ 0L; -#endif /* Init function. */ @@@@ -84,24 +76,57 @@@@ return; } - buf->uid = pinfo [0].kp_eproc.e_pcred.p_ruid; - buf->euid = pinfo [0].kp_eproc.e_pcred.p_svuid; - buf->gid = pinfo [0].kp_eproc.e_pcred.p_rgid; - buf->egid = pinfo [0].kp_eproc.e_pcred.p_svgid; - - buf->ppid = pinfo [0].kp_eproc.e_ppid; - buf->pgrp = pinfo [0].kp_eproc.e_pgid; - buf->tpgid = pinfo [0].kp_eproc.e_tpgid; +#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013) + +#define XXX_P_RUID ki_ruid +#define XXX_P_SVUID ki_svuid +#define XXX_P_RGID ki_rgid +#define XXX_P_SVGID ki_svgid +#define XXX_E_PPID ki_ppid +#define XXX_E_PGID ki_pgid +#define XXX_E_TPGID ki_tpgid +#define XXX_P_NICE ki_nice +#if __FreeBSD_version >= 500013 +#define XXX_P_PRIORITY ki_pri.pri_user +#else +#define XXX_P_PRIORITY ki_priority +#endif +#else + +#define XXX_P_RUID kp_eproc.e_pcred.p_ruid +#define XXX_P_SVUID kp_eproc.e_pcred.p_svuid +#define XXX_P_RGID kp_eproc.e_pcred.p_rgid +#define XXX_P_SVGID kp_eproc.e_pcred.p_svgid +#define XXX_E_PPID kp_eproc.e_ppid +#define XXX_E_PGID kp_eproc.e_pgid +#define XXX_E_TPGID kp_eproc.e_tpgid +#define XXX_P_NICE kp_proc.p_nice +#define XXX_P_PRIORITY kp_proc.p_priority + +#endif - buf->nice = pinfo [0].kp_proc.p_nice; - buf->priority = pinfo [0].kp_proc.p_priority; + buf->uid = pinfo [0].XXX_P_RUID; + buf->euid = pinfo [0].XXX_P_SVUID; + buf->gid = pinfo [0].XXX_P_RGID; + buf->egid = pinfo [0].XXX_P_SVGID; + + buf->ppid = pinfo [0].XXX_E_PPID; + buf->pgrp = pinfo [0].XXX_E_PGID; + buf->tpgid = pinfo [0].XXX_E_TPGID; + + buf->nice = pinfo [0].XXX_P_NICE; +#if defined(__NetBSD__) && defined(SACTIVE) + buf->priority = 0; +#else + buf->priority = pinfo [0].XXX_P_PRIORITY; +#endif /* Set the flags for the data we're about to return*/ buf->flags = _glibtop_sysdeps_proc_uid; /* Use LibGTop conditionals here so we can more easily merge this * code into the LIBGTOP_STABLE_1_0 branch. */ -#if LIBGTOP_VERSION_CODE >= 1001000 +#if 0 /* This probably also works with other versions, but not yet * tested. Please remove the conditional if this is true. */ #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) @ 1.3 log @Updated to 2.0.7. Changes: o Added more locale files. o Makefile.am: Change subdirectory build order so that 'distclean' target work (and other targets remain working). o libgtop-2.0.pc.in: Fix missing build flags. Patch from Julio Merino. o sysdeps/linux/mem.c: (glibtop_get_mem_s): Fix memory calculation under Linux. Patch from . And more... please review Changelog for a complete list of changes. pkgsrc-changes: o FreeBSD 4.x/5.x support (only tested on 5.x) @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Make this compile with native threads by applying similar patches to those committed by tron for libgtop. Bump PKGREVISION. @ text @d3 3 a5 3 --- sysdeps/freebsd/procuid.c.orig Tue Jun 11 07:34:42 2002 +++ sysdeps/freebsd/procuid.c @@@@ -35,15 +35,7 @@@@ static const unsigned long _glibtop_sysd d21 3 a23 2 @@@@ -94,14 +86,18 @@@@ glibtop_get_proc_uid_p (glibtop *server, buf->tpgid = pinfo [0].kp_eproc.e_tpgid; d25 49 a73 1 buf->nice = pinfo [0].kp_proc.p_nice; d77 1 a77 1 buf->priority = pinfo [0].kp_proc.p_priority; @ 1.1 log @Initial revision @ text @d21 12 a32 1 @@@@ -101,7 +93,7 @@@@ glibtop_get_proc_uid_p (glibtop *server, @ 1.1.1.1 log @Initial import of libgtop2-2.0.0, a library to retrieve system information, used in GNOME2 @ text @@