diff options
Diffstat (limited to 'sysutils/libgtop2/patches/patch-ab')
| -rw-r--r-- | sysutils/libgtop2/patches/patch-ab | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/sysutils/libgtop2/patches/patch-ab b/sysutils/libgtop2/patches/patch-ab index d3c64551715..8cf6050d38d 100644 --- a/sysutils/libgtop2/patches/patch-ab +++ b/sysutils/libgtop2/patches/patch-ab @@ -1,8 +1,19 @@ -$NetBSD: patch-ab,v 1.4 2006/03/03 15:02:13 adam Exp $ +$NetBSD: patch-ab,v 1.5 2006/06/26 12:14:25 drochner Exp $ ---- sysdeps/freebsd/proctime.c.orig 2005-02-23 08:20:45.000000000 +0000 +--- sysdeps/freebsd/proctime.c.orig 2005-12-12 11:09:39.000000000 +0100 +++ sysdeps/freebsd/proctime.c -@@ -57,7 +57,7 @@ glibtop_init_proc_time_p (glibtop *serve +@@ -32,6 +32,10 @@ + #include <osreldate.h> + #endif + ++#ifdef __NetBSD__ ++#include <sys/resourcevar.h> ++#endif ++ + static const unsigned long _glibtop_sysdeps_proc_time = + (1L << GLIBTOP_PROC_TIME_RTIME) + (1L << GLIBTOP_PROC_TIME_FREQUENCY); + +@@ -58,7 +62,7 @@ glibtop_init_proc_time_p (glibtop *serve * system, and interrupt time usage. */ @@ -11,7 +22,7 @@ $NetBSD: patch-ab,v 1.4 2006/03/03 15:02:13 adam Exp $ #ifndef __FreeBSD__ static void -@@ -137,21 +137,20 @@ glibtop_get_proc_time_p (glibtop *server +@@ -138,20 +142,19 @@ glibtop_get_proc_time_p (glibtop *server #if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) if (server->sysdeps.proc_time == 0) return; @@ -33,14 +44,12 @@ $NetBSD: patch-ab,v 1.4 2006/03/03 15:02:13 adam Exp $ #if defined(__FreeBSD__) && (__FreeBSD_version >= 500013) buf->rtime = pinfo [0].ki_runtime; --#elif (defined __FreeBSD__) && (__FreeBSD_version <= 500013) +#elif defined(__DragonFly__) + buf->rtime = pinfo[0].kp_eproc.e_uticks / 100000; -+#elif (defined __FreeBSD__) && (__FreeBSD_version <= 500013) + #elif (defined __FreeBSD__) && (__FreeBSD_version <= 500013) buf->rtime = pinfo [0].kp_proc.p_runtime; #else - buf->rtime = tv2sec (pinfo [0].kp_proc.p_rtime); -@@ -193,18 +192,26 @@ glibtop_get_proc_time_p (glibtop *server +@@ -194,18 +197,26 @@ glibtop_get_proc_time_p (glibtop *server if ((pinfo [0].ki_flag & P_INMEM)) { #endif buf->utime = pinfo [0].ki_runtime; @@ -70,7 +79,7 @@ $NetBSD: patch-ab,v 1.4 2006/03/03 15:02:13 adam Exp $ kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc, (unsigned long) &u_addr->u_stats, (char *) &pstats, sizeof (pstats)) == sizeof (pstats)) -@@ -214,13 +221,21 @@ glibtop_get_proc_time_p (glibtop *server +@@ -215,13 +226,21 @@ glibtop_get_proc_time_p (glibtop *server buf->stime = tv2sec (pinfo[0].kp_eproc.e_stats.p_ru.ru_stime); buf->cutime = tv2sec (pinfo[0].kp_eproc.e_stats.p_cru.ru_utime); buf->cstime = tv2sec (pinfo[0].kp_eproc.e_stats.p_cru.ru_stime); |