kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 2.12.0. Thanks go to the FreeBSD GNOME developers for all the

Browse source 
patches I borrowed from them (patch-b*).

September 4, 2005: Overview of changes from 2.11.92 to 2.12.0
=============================================================
* Updated translations.

August 22, 2005: Overview of changes from 2.11.91 to 2.11.92
============================================================
* Linux:
  - fixed for 2.6 without /sys
  - glibtop_get_cpu() : Do not add irq, softirq and iowait to idle.

August 9, 2005: Overview of changes from 2.11.90 to 2.11.91
===========================================================
* All:
  - cleaned some headers.
  - removed static examples.
* Linux:
  - fixed some issues with 2.6 without /sys

July 24, 2005: Overview of changes from 2.11.2 to 2.11.90
=========================================================
* Linux:
  - fixed glibtop_uptime .flags.

July &3, 2005: Overview of changes from 2.11.1 to 2.11.2
========================================================
* Linux:
  - little improvements for 2.6.

July 3, 2005: Overview of changes from 2.11.0 to 2.11.1
=======================================================
* Linux:
  - glibtop_get_swap : added page(in|out) for linux 2.6.

June 8, 2005: Overview of changes from 2.10.x to 2.11.0
=======================================================
* Replaced a lot of macros by functions
* Got rid of dozens of useless files.
* libgtop 2.11.x are and will stay API and ABI compatible with 2.10.x, i swear.
This commit is contained in:
jmmv 2005-10-12 21:49:39 +00:00
parent 758eeb65a9
commit 148fbbee73
14 changed files with 493 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sysutils/libgtop2/Makefile
View file

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.23 2005/08/21 11:25:48 jmmv Exp $
# $NetBSD: Makefile,v 1.24 2005/10/12 21:49:39 jmmv Exp $
DISTNAME= libgtop-2.10.2
DISTNAME= libgtop-2.12.0
PKGNAME= ${DISTNAME:S/-/2-/}
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/2.10/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/2.12/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= tech-pkg@NetBSD.org

4
sysutils/libgtop2/buildlink3.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.3 2005/03/22 16:03:37 jmmv Exp $
# $NetBSD: buildlink3.mk,v 1.4 2005/10/12 21:49:39 jmmv Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGTOP2_BUILDLINK3_MK:= ${LIBGTOP2_BUILDLINK3_MK}+
@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgtop2}
BUILDLINK_PACKAGES+= libgtop2
.if !empty(LIBGTOP2_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.libgtop2+= libgtop2>=2.10.0
BUILDLINK_DEPENDS.libgtop2+= libgtop2>=2.12.0
BUILDLINK_PKGSRCDIR.libgtop2?= ../../sysutils/libgtop2
.endif # LIBGTOP2_BUILDLINK3_MK

20
sysutils/libgtop2/distinfo
View file

@ -1,9 +1,19 @@
$NetBSD: distinfo,v 1.13 2005/08/21 11:25:48 jmmv Exp $
$NetBSD: distinfo,v 1.14 2005/10/12 21:49:39 jmmv Exp $
SHA1 (libgtop-2.10.2.tar.bz2) = 532028cb83cf61142cf0ad845be302c471207b62
RMD160 (libgtop-2.10.2.tar.bz2) = db3ebf1e9853b0fdfae03aaa809f3ba8a41667ed
Size (libgtop-2.10.2.tar.bz2) = 751695 bytes
SHA1 (patch-aa) = 5fe5ccdf8444b3efaaa1bc3cff4c2d4944729f1e
SHA1 (libgtop-2.12.0.tar.bz2) = 9969b5b96ef6298cf61e00e1b5ff62bd4ef1290f
RMD160 (libgtop-2.12.0.tar.bz2) = 86800ea47ccead46812d969b1112bab734117ac1
Size (libgtop-2.12.0.tar.bz2) = 740843 bytes
SHA1 (patch-aa) = 94c3affb12ad78aa5020d81963f7898b38e3ef72
SHA1 (patch-ab) = 55f4c875e4886194cba25874ab042da8e17261c7
SHA1 (patch-ac) = dea1b6fba42d77a4fe6b2e9269cdab0521d3a305
SHA1 (patch-ad) = c707545313bd4382825cedde30032f9083003823
SHA1 (patch-ba) = ebe5f9a5148ff72ae978934b259e63ce15f2d4c8
SHA1 (patch-bb) = 2e98f16668f74b64848f54db57037289623ed3f2
SHA1 (patch-bc) = a48255606b5c340a20d01cc7f4e2c1e821d9d629
SHA1 (patch-bd) = 7825fd4d2e6c06510fa3d76b4efa4d2ffab2a7d8
SHA1 (patch-be) = ba1b688ea04f41a88b5d65b8af90927843619c0f
SHA1 (patch-bf) = 86578d0779b706da3fcf02507ce8515571d9ed1a
SHA1 (patch-bg) = 330de57b732550a92b4e077ad8e850acf7e0e24d
SHA1 (patch-bh) = afdf0dec92984528efd181a24d3ef8f3eb383173
SHA1 (patch-bi) = 56ec02e230f0c4401b95ce728d63a3d0798971e8
SHA1 (patch-bj) = 48c46dec8d1f8ed35e452b66f3a5283a6a8f521f

95
sysutils/libgtop2/patches/patch-aa
View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.2 2004/05/04 23:36:16 minskim Exp $
$NetBSD: patch-aa,v 1.3 2005/10/12 21:49:39 jmmv Exp $
--- configure.orig 2004-04-07 05:19:43.000000000 -0500
--- configure.orig 2005-09-04 17:54:58.000000000 +0200
+++ configure
@@ -20463,13 +20463,13 @@ echo $ECHO_N "checking for libgtop sysde
@@ -20141,13 +20141,13 @@ echo $ECHO_N "checking for libgtop sysde
libgtop_sysdeps_dir=freebsd
libgtop_use_machine_h=yes
libgtop_need_server=yes
@ -18,7 +18,86 @@ $NetBSD: patch-aa,v 1.2 2004/05/04 23:36:16 minskim Exp $
;;
aix*)
libgtop_sysdeps_dir=aix
@@ -30110,7 +30110,7 @@ cat >>conftest.$ac_ext <<_ACEOF
@@ -23761,6 +23761,78 @@ fi
esac
+echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5
+echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6
+if test "${ac_cv_lib_mach_kvm_open+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lkvm $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char kvm_open ();
+int
+main ()
+{
+kvm_open ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_mach_kvm_open=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_mach_kvm_open=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_mach_kvm_open" >&5
+echo "${ECHO_T}$ac_cv_lib_mach_kvm_open" >&6
+if test $ac_cv_lib_mach_kvm_open = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBMACH 1
+_ACEOF
+
+ KVM_LIBS="-lkvm $KVM_LIBS"
+
+fi
+
echo "$as_me:$LINENO: checking for vm_statistics in -lmach" >&5
echo $ECHO_N "checking for vm_statistics in -lmach... $ECHO_C" >&6
if test "${ac_cv_lib_mach_vm_statistics+set}" = set; then
@@ -30106,7 +30178,7 @@ cat >>conftest.$ac_ext <<_ACEOF
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@ -27,3 +106,11 @@ $NetBSD: patch-aa,v 1.2 2004/05/04 23:36:16 minskim Exp $
ok=yes
fi
rm -f conftest*
@@ -31512,6 +31584,7 @@ s,@ECHO_C@,$ECHO_C,;t t
s,@ECHO_N@,$ECHO_N,;t t
s,@ECHO_T@,$ECHO_T,;t t
s,@LIBS@,$LIBS,;t t
+s,@KVM_LIBS@,$KVM_LIBS,;t t
s,@build@,$build,;t t
s,@build_cpu@,$build_cpu,;t t
s,@build_vendor@,$build_vendor,;t t

34
sysutils/libgtop2/patches/patch-ba Normal file
View file

@ -0,0 +1,34 @@
$NetBSD: patch-ba,v 1.1 2005/10/12 21:49:39 jmmv Exp $
From FreeBSD's GNOME development repository.
--- lib/read.c.orig 2005-06-06 14:33:42.000000000 +0200
+++ lib/read.c
@@ -22,6 +22,7 @@
*/
#include <config.h>
+#include <errno.h>
#include <glibtop/read.h>
#include <glibtop/error.h>
#include <glib/gi18n-lib.h>
@@ -56,14 +57,18 @@ glibtop_read_l (glibtop *server, size_t
fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size);
#endif
+retry:
if (server->socket) {
do_read (server->socket, buf, size);
} else {
- if(read (server->input [0], buf, size) < 0)
+ if(read (server->input [0], buf, size) < 0) {
+ if (errno == EINTR)
+ goto retry;
glibtop_error_io_r (
server,
ngettext ("read %d byte",
"read %d bytes", size),
size);
+ }
}
}

32
sysutils/libgtop2/patches/patch-bb Normal file
View file

@ -0,0 +1,32 @@
$NetBSD: patch-bb,v 1.1 2005/10/12 21:49:39 jmmv Exp $
From FreeBSD's GNOME development repository.
--- lib/write.c.orig 2005-06-06 14:33:42.000000000 +0200
+++ lib/write.c
@@ -22,6 +22,7 @@
*/
#include <config.h>
+#include <errno.h>
#include <glibtop/write.h>
#include <glibtop/error.h>
@@ -42,12 +43,16 @@ glibtop_write_l (glibtop *server, size_t
fprintf (stderr, "LIBRARY: really writing %d bytes.\n", size);
#endif
+retry:
if (server->socket) {
ret = send (server->socket, buf, size, 0);
} else {
ret = write (server->output [1], buf, size);
}
- if (ret < 0)
+ if (ret < 0) {
+ if (errno == EINTR)
+ goto retry;
glibtop_error_io_r (server, ngettext ("wrote %d byte", "wrote %d bytes", size), size);
+ }
}

61
sysutils/libgtop2/patches/patch-bc Normal file
View file

@ -0,0 +1,61 @@
$NetBSD: patch-bc,v 1.1 2005/10/12 21:49:39 jmmv Exp $
From FreeBSD's GNOME development repository.
--- src/daemon/io.c.orig Mon Apr 11 03:30:12 2005
+++ src/daemon/io.c Mon Apr 11 03:33:22 2005
@@ -21,6 +21,7 @@
Boston, MA 02111-1307, USA.
*/
+#include <errno.h>
#include "daemon.h"
#include <glibtop/error.h>
@@ -36,9 +37,13 @@
resp->offset = offset;
resp->data_size = data_size;
+retry1:
if (s == 0) {
- if (write (1, (const void *) resp, sizeof (glibtop_response)) < 0)
+ if (write (1, (const void *) resp, sizeof (glibtop_response)) < 0) {
+ if (errno == EINTR)
+ goto retry1;
glibtop_warn_io ("write");
+ }
} else {
if (send (s, (const void *) resp, sizeof (glibtop_response), 0) < 0)
glibtop_warn_io ("send");
@@ -49,9 +54,13 @@
fprintf (stderr, "Writing %d bytes of data.\n", resp->data_size);
#endif
+retry2:
if (s == 0) {
- if (write (1, data, resp->data_size) < 0)
+ if (write (1, data, resp->data_size) < 0) {
+ if (errno == EINTR)
+ goto retry2;
glibtop_warn_io ("write");
+ }
} else {
if (send (s, data, resp->data_size, 0) , 0)
glibtop_warn_io ("send");
@@ -67,6 +76,7 @@
size_t already_read = 0, remaining = total_size;
while (already_read < total_size) {
+retry:
if (s)
nread = recv (s, ptr, remaining, 0);
else
@@ -78,6 +88,8 @@
}
if (nread <= 0) {
+ if (errno == EINTR)
+ goto retry;
glibtop_warn_io ("recv");
return 0;
}

22
sysutils/libgtop2/patches/patch-bd Normal file
View file

@ -0,0 +1,22 @@
$NetBSD: patch-bd,v 1.1 2005/10/12 21:49:39 jmmv Exp $
From FreeBSD's GNOME development repository.
--- src/daemon/server.c.orig 2004-06-09 20:52:21.000000000 +0200
+++ src/daemon/server.c
@@ -88,11 +88,13 @@ main(int argc, char *argv[])
if (strcmp (uts.sysname, LIBGTOP_COMPILE_SYSTEM) ||
strcmp (uts.release, LIBGTOP_COMPILE_RELEASE) ||
strcmp (uts.machine, LIBGTOP_COMPILE_MACHINE)) {
- fprintf (stderr, "Can only run on %s %s %s\n",
+ fprintf (stderr, "This libgtop was compiled on %s %s %s\n",
LIBGTOP_COMPILE_SYSTEM,
LIBGTOP_COMPILE_RELEASE,
LIBGTOP_COMPILE_MACHINE);
- _exit (1);
+ fprintf (stderr, "If you see strange problems caused by it,\n");
+ fprintf (stderr, "you should recompile libgtop and dependent"
+ "applications.\n");
}
#endif

25
sysutils/libgtop2/patches/patch-be Normal file
View file

@ -0,0 +1,25 @@
$NetBSD: patch-be,v 1.1 2005/10/12 21:49:39 jmmv Exp $
From FreeBSD's GNOME development repository.
--- sysdeps/freebsd/glibtop_server.h.orig Mon Oct 20 11:19:49 2003
+++ sysdeps/freebsd/glibtop_server.h Mon Aug 8 15:10:14 2005
@@ -21,8 +21,8 @@
Boston, MA 02111-1307, USA.
*/
-#ifndef __GLIBTOP_SERVER_H__
-#define __GLIBTOP_SERVER_H__
+#ifndef __FREEBSD__GLIBTOP_SERVER_H__
+#define __FREEBSD__GLIBTOP_SERVER_H__
G_BEGIN_DECLS
@@ -45,6 +45,7 @@ G_BEGIN_DECLS
#define GLIBTOP_SUID_PROC_ARGS (1 << GLIBTOP_SYSDEPS_PROC_ARGS)
#define GLIBTOP_SUID_PROC_MAP (1 << GLIBTOP_SYSDEPS_PROC_MAP)
#define GLIBTOP_SUID_NETLOAD (1 << GLIBTOP_SYSDEPS_NETLOAD)
+#define GLIBTOP_SUID_NETLIST 0
#define GLIBTOP_SUID_PPP (1 << GLIBTOP_SYSDEPS_PPP)
G_END_DECLS

100
sysutils/libgtop2/patches/patch-bf Normal file
View file

@ -0,0 +1,100 @@
$NetBSD: patch-bf,v 1.1 2005/10/12 21:49:39 jmmv Exp $
From FreeBSD's GNOME development repository.
--- sysdeps/freebsd/sysinfo.c.orig Thu Jun 9 22:56:29 2005
+++ sysdeps/freebsd/sysinfo.c Thu Jun 9 22:58:36 2005
@@ -0,0 +1,93 @@
+/* $Id: patch-bf,v 1.1 2005/10/12 21:49:39 jmmv Exp $ */
+
+/* Copyright (C) 1998-99 Martin Baulig
+ This file is part of LibGTop 1.0.
+
+ Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
+
+ LibGTop is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License,
+ or (at your option) any later version.
+
+ LibGTop is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LibGTop; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+#include <config.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <glibtop/error.h>
+#include <glibtop/cpu.h>
+#include <glibtop/sysinfo.h>
+
+static const unsigned long _glibtop_sysdeps_sysinfo =
+(1L << GLIBTOP_SYSINFO_CPUINFO);
+
+static glibtop_sysinfo sysinfo = { .flags = 0 };
+
+static void
+init_sysinfo (glibtop *server)
+{
+ char *model;
+ int ncpus = 1;
+ int mhz = 0;
+ size_t len;
+
+ if(G_LIKELY(sysinfo.flags)) return;
+
+ glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0);
+
+ len = sizeof (ncpus);
+ sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0);
+ len = 0;
+ sysctlbyname ("hw.model", NULL, &len, NULL, 0);
+ model = malloc (len);
+ sysctlbyname ("hw.model", model, &len, NULL, 0);
+ len = sizeof (mhz);
+ sysctlbyname ("hw.clockrate", &mhz, &len, NULL, 0);
+
+ for(sysinfo.ncpu = 0;
+ sysinfo.ncpu < GLIBTOP_NCPU && sysinfo.ncpu < ncpus;
+ sysinfo.ncpu++) {
+
+ glibtop_entry * const cpuinfo = &sysinfo.cpuinfo[sysinfo.ncpu];
+
+ cpuinfo->labels = g_ptr_array_new ();
+
+ cpuinfo->values = g_hash_table_new_full(g_str_hash, g_str_equal,
+ g_free, g_free);
+
+ cpuinfo->descriptions = g_hash_table_new_full(g_str_hash, g_str_equal,
+ g_free, g_free);
+
+ g_ptr_array_add (cpuinfo->labels, "processor");
+ g_hash_table_insert (cpuinfo->values, "processor", &sysinfo.ncpu);
+
+ g_ptr_array_add (cpuinfo->labels, "vendor_id");
+ g_hash_table_insert (cpuinfo->values, "vendor_id", model);
+
+ g_ptr_array_add (cpuinfo->labels, "cpu MHz");
+ g_hash_table_insert (cpuinfo->values, "cpu MHz", &mhz);
+
+ }
+
+ free (model);
+
+ sysinfo.flags = _glibtop_sysdeps_sysinfo;
+}
+
+const glibtop_sysinfo *
+glibtop_get_sysinfo_s (glibtop *server)
+{
+ init_sysinfo (server);
+ return &sysinfo;
+}

19
sysutils/libgtop2/patches/patch-bg Normal file
View file

@ -0,0 +1,19 @@
$NetBSD: patch-bg,v 1.1 2005/10/12 21:49:39 jmmv Exp $
From FreeBSD's GNOME development repository.
--- sysdeps/freebsd/prockernel.c Mon Jul 19 05:33:56 2004
+++ sysdeps/freebsd/prockernel.c.orig Sat Mar 19 02:39:47 2005
@@ -115,8 +115,10 @@
/* Get the process information */
pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
- if ((pinfo == NULL) || (count != 1))
- glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
+ if ((pinfo == NULL) || (count != 1)) {
+ glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
+ return;
+ }
#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)

15
sysutils/libgtop2/patches/patch-bh Normal file
View file

@ -0,0 +1,15 @@
$NetBSD: patch-bh,v 1.1 2005/10/12 21:49:39 jmmv Exp $
From FreeBSD's GNOME development repository.
--- sysdeps/freebsd/procmap.c Wed Feb 23 17:20:45 2005
+++ sysdeps/freebsd/procmap.c.orig Sat Mar 19 02:46:57 2005
@@ -129,7 +129,7 @@
/* Get the process data */
pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
if ((pinfo == NULL) || (count < 1)) {
- glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
+ glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
return NULL;
}

35
sysutils/libgtop2/patches/patch-bi Normal file
View file

@ -0,0 +1,35 @@
$NetBSD: patch-bi,v 1.1 2005/10/12 21:49:39 jmmv Exp $
From FreeBSD's GNOME development repository.
--- sysdeps/freebsd/proctime.c.orig Wed Feb 23 03:20:45 2005
+++ sysdeps/freebsd/proctime.c Tue Aug 2 12:49:38 2005
@@ -146,8 +146,10 @@ glibtop_get_proc_time_p (glibtop *server
/* Get the process information */
pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
- if ((pinfo == NULL) || (count != 1))
- glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
+ if ((pinfo == NULL) || (count != 1)) {
+ glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
+ return;
+ }
#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
buf->rtime = pinfo [0].ki_runtime;
@@ -193,9 +195,13 @@ glibtop_get_proc_time_p (glibtop *server
if ((pinfo [0].ki_flag & P_INMEM)) {
#endif
buf->utime = pinfo [0].ki_runtime;
- buf->stime = 0; /* XXX */
+ buf->stime = tv2sec (pinfo [0].ki_rusage.ru_stime);
buf->cutime = tv2sec (pinfo [0].ki_childtime);
- buf->cstime = 0; /* XXX */
+#if __FreeBSD_version >= 600000
+ buf->cstime = tv2sec (pinfo [0].ki_rusage_ch.ru_stime);
+#else
+ buf->cstime = 0;
+#endif
buf->start_time = tv2sec (pinfo [0].ki_start);
buf->flags = _glibtop_sysdeps_proc_time_user;
}

39
sysutils/libgtop2/patches/patch-bj Normal file
View file

@ -0,0 +1,39 @@
$NetBSD: patch-bj,v 1.1 2005/10/12 21:49:39 jmmv Exp $
From FreeBSD's GNOME development repository.
--- sysdeps/freebsd/Makefile.in.orig 2005-09-05 00:32:25.000000000 +0200
+++ sysdeps/freebsd/Makefile.in
@@ -143,11 +143,11 @@ INCLUDES = @INCLUDES@
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
-libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c
+libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c netlist.c
libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
-libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netlist.c netload.c ppp.c procopenfiles.c fsusage.c
+libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netload.c ppp.c procopenfiles.c fsusage.c sysinfo.c
libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
@@ -170,14 +170,14 @@ X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-libgtop_sysdeps_2_0_la_LIBADD =
-libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo
-libgtop_sysdeps_suid_2_0_la_LIBADD =
+libgtop_sysdeps_2_0_la_LIBADD = @KVM_LIBS@
+libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo netlist.lo
+libgtop_sysdeps_suid_2_0_la_LIBADD = @KVM_LIBS@
libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo cpu.lo mem.lo \
swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo sem_limits.lo \
proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \
procsignal.lo prockernel.lo procsegment.lo procargs.lo procmap.lo \
-netlist.lo netload.lo ppp.lo procopenfiles.lo fsusage.lo
+netload.lo ppp.lo procopenfiles.lo fsusage.lo sysinfo.lo
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)