Add support for CPU, Network, and Disk applet load monitors.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3707 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 319 insertions, 11 deletions

diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index de8824582..91ed62b3d 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgtop2
 PORTVERSION=	2.9.91
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.9
diff --git a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c
index de564dcfd..e6dd6d097 100644
--- a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c
+++ b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c
@@ -1,6 +1,22 @@
---- sysdeps/common/fsusage.c.orig	Sun Oct 17 00:51:26 2004
-+++ sysdeps/common/fsusage.c	Sun Oct 17 00:52:07 2004
-@@ -253,8 +253,9 @@
+--- sysdeps/common/fsusage.c.orig	Thu Dec 23 16:56:10 2004
++++ sysdeps/common/fsusage.c	Fri Feb 25 21:55:06 2005
+@@ -134,6 +134,15 @@
+ #define _glibtop_get_fsusage_read_write(S, B, P) \
+         _glibtop_linux_get_fsusage_read_write(S, B, P)
+ 
++#elif defined(__FreeBSD__)
++void G_GNUC_INTERNAL
++_glibtop_freebsd_get_fsusage_read_write(glibtop *server,
++					glibtop_fsusage *buf,
++					const char *path);
++
++#define _glibtop_get_fsusage_read_write(S, B, P) \
++	_glibtop_freebsd_get_fsusage_read_write(S, B, P)
++
+ #else /* default fallback */
+ #warning glibtop_get_fsusage .read .write are not implemented.
+ static inline void
+@@ -254,8 +263,9 @@
    if (statvfs (path, &fsd) < 0)
      return;
  
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in
index e8d052d31..32d2574bc 100644
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in
+++ b/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in
@@ -1,11 +1,11 @@
---- sysdeps/freebsd/Makefile.in.orig	Wed Jan 12 02:16:52 2005
-+++ sysdeps/freebsd/Makefile.in	Wed Jan 12 02:17:33 2005
+--- sysdeps/freebsd/Makefile.in.orig	Fri Feb 25 21:29:00 2005
++++ sysdeps/freebsd/Makefile.in	Sat Feb 26 00:41:15 2005
 @@ -150,7 +150,7 @@
  
  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
-+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
++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_LDFLAGS = $(LT_VERSION_INFO)
@@ -14,7 +14,7 @@
  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
-+netlist.lo netload.lo ppp.lo procopenfiles.lo
++netlist.lo netload.lo ppp.lo procopenfiles.lo fsusage.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)
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_cpu.c b/devel/libgtop2/files/patch-sysdeps_freebsd_cpu.c
new file mode 100644
index 000000000..deef0180f
--- /dev/null
+++ b/devel/libgtop2/files/patch-sysdeps_freebsd_cpu.c
@@ -0,0 +1,21 @@
+--- sysdeps/freebsd/cpu.c.orig	Sat Feb 26 00:43:48 2005
++++ sysdeps/freebsd/cpu.c	Fri Feb 25 21:44:42 2005
+@@ -34,7 +34,8 @@
+ static const unsigned long _glibtop_sysdeps_cpu =
+ (1L << GLIBTOP_CPU_TOTAL) + (1L << GLIBTOP_CPU_USER) +
+ (1L << GLIBTOP_CPU_NICE) + (1L << GLIBTOP_CPU_SYS) +
+-(1L << GLIBTOP_CPU_IDLE) + (1L << GLIBTOP_CPU_FREQUENCY);
++(1L << GLIBTOP_CPU_IDLE) + (1L << GLIBTOP_CPU_FREQUENCY) +
++(1L << GLIBTOP_CPU_IOWAIT);
+ 
+ #ifndef KERN_CP_TIME
+ /* nlist structure for kernel access */
+@@ -122,6 +123,8 @@
+ 	buf->sys = cpts [CP_SYS];
+ 	/* set idle time */
+ 	buf->idle = cpts [CP_IDLE];
++	/* set iowait (really just interrupt) time */
++	buf->iowait = cpts [CP_INTR];
+ 
+ 	/* set frequency */
+ 	/*
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c b/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c
new file mode 100644
index 000000000..ca5d04bb3
--- /dev/null
+++ b/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c
@@ -0,0 +1,44 @@
+--- sysdeps/freebsd/fsusage.c.orig	Sat Feb 26 00:31:17 2005
++++ sysdeps/freebsd/fsusage.c	Sat Feb 26 00:40:27 2005
+@@ -0,0 +1,41 @@
++#include <glibtop.h>
++#include <glibtop/error.h>
++#include <glibtop/fsusage.h>
++
++#include <glibtop_suid.h>
++
++#include <glib.h>
++
++#include <unistd.h>
++#include <sys/param.h>
++#include <sys/mount.h>
++
++#include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
++
++void
++G_GNUC_INTERNAL
++_glibtop_freebsd_get_fsusage_read_write(glibtop *server,
++				      glibtop_fsusage *buf,
++				      const char *path);
++
++void G_GNUC_INTERNAL
++_glibtop_freebsd_get_fsusage_read_write(glibtop *server,
++				      glibtop_fsusage *buf,
++				      const char *path)
++{
++	int result;
++	struct statfs sfs;
++
++	result = statfs (path, &sfs);
++
++	if (result == -1) {
++		return;
++	}
++
++	buf->read = sfs.f_syncreads + sfs.f_asyncreads;
++	buf->write = sfs.f_syncwrites + sfs.f_asyncwrites;
++
++	buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE);
++}
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_netlist.c b/devel/libgtop2/files/patch-sysdeps_freebsd_netlist.c
index aca828d4d..a055baa3b 100644
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_netlist.c
+++ b/devel/libgtop2/files/patch-sysdeps_freebsd_netlist.c
@@ -1,6 +1,17 @@
---- sysdeps/freebsd/netlist.c.orig	Wed Feb 23 01:20:33 2005
-+++ sysdeps/freebsd/netlist.c	Wed Feb 23 01:20:44 2005
-@@ -50,6 +50,7 @@
+--- sysdeps/freebsd/netlist.c.orig	Sun Dec  5 07:01:43 2004
++++ sysdeps/freebsd/netlist.c	Sat Feb 26 00:13:28 2005
+@@ -43,6 +43,10 @@
+ 	struct if_nameindex *ifstart, *ifs;
+ 	GPtrArray *devices;
+ 
++	glibtop_init_s (&server, GLIBTOP_SYSDEPS_NETLIST, 0);
++
++	memset (buf, 0, sizeof (glibtop_netlist));
++
+ 	ifs = ifstart = if_nameindex();
+ 
+ 	devices = g_ptr_array_new();
+@@ -50,6 +54,7 @@
  	while(ifs && ifs->if_name) {
  		g_ptr_array_add(devices, g_strdup(ifs->if_name));
  		buf->number++;
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_netload.c b/devel/libgtop2/files/patch-sysdeps_freebsd_netload.c
new file mode 100644
index 000000000..c357dff29
--- /dev/null
+++ b/devel/libgtop2/files/patch-sysdeps_freebsd_netload.c
@@ -0,0 +1,216 @@
+--- sysdeps/freebsd/netload.c.orig	Sat Feb 26 00:43:56 2005
++++ sysdeps/freebsd/netload.c	Sat Feb 26 00:48:46 2005
+@@ -40,11 +40,6 @@
+ 
+ static const unsigned long _glibtop_sysdeps_netload =
+ (1L << GLIBTOP_NETLOAD_IF_FLAGS) +
+-(1L << GLIBTOP_NETLOAD_MTU) +
+-#if !defined(__bsdi__)
+-(1L << GLIBTOP_NETLOAD_SUBNET) +
+-#endif
+-(1L << GLIBTOP_NETLOAD_ADDRESS) +
+ (1L << GLIBTOP_NETLOAD_PACKETS_IN) +
+ (1L << GLIBTOP_NETLOAD_PACKETS_OUT) +
+ (1L << GLIBTOP_NETLOAD_PACKETS_TOTAL) +
+@@ -56,6 +51,13 @@
+ (1L << GLIBTOP_NETLOAD_ERRORS_TOTAL) +
+ (1L << GLIBTOP_NETLOAD_COLLISIONS);
+ 
++static const unsigned _glibtop_sysdeps_netload_data =
++(1L << GLIBTOP_NETLOAD_ADDRESS) +
++#if !defined(__bsdi__)
++(1L << GLIBTOP_NETLOAD_SUBNET) +
++#endif
++(1L << GLIBTOP_NETLOAD_MTU);
++
+ /* nlist structure for kernel access */
+ static struct nlist nlst [] = {
+     { "_ifnet" },
+@@ -81,9 +83,9 @@
+ {
+     struct ifnet ifnet;
+     u_long ifnetaddr, ifnetfound, ifaddraddr;
+-    struct sockaddr *sa;
++    struct sockaddr *sa = NULL;
+     char tname [16];
+-    char temp [16];
++    char name [32];
+ 
+     union {
+ 	struct ifaddr ifa;
+@@ -114,13 +116,22 @@
+ 	    if (kvm_read (server->machine.kd, (u_long) ifnet.if_name,
+ 			  tname, 16) != 16)
+ 		    glibtop_error_io_r (server, "kvm_read (if_name)");
+-	    snprintf(temp, (15 - strlen(tname)), "%d", ifnet.if_unit);
+-	    strcat(tname, temp);
+-	    tname [15] = 0;
++	    tname[15] = '\0';
++	    snprintf (name, 32, "%s%d", tname, ifnet.if_unit);
+ #else
+-	    g_strlcpy (tname, ifnet.if_xname, sizeof tname);
++	    g_strlcpy (name, ifnet.if_xname, sizeof(name));
++#endif
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 300000)
++	    ifnetaddr = (u_long) ifnet.if_link.tqe_next;
++#elif defined(__FreeBSD__) || defined(__bsdi__)
++	    ifnetaddr = (u_long) ifnet.if_next;
++#else
++	    ifnetaddr = (u_long) ifnet.if_list.tqe_next;
+ #endif
+ 
++	    if (strcmp (name, interface) != 0)
++		    continue;
++
+ #if defined(__FreeBSD__) && (__FreeBSD_version >= 300000)
+ 	    ifaddraddr = (u_long) ifnet.if_addrhead.tqh_first;
+ #elif defined(__FreeBSD__) || defined(__bsdi__)
+@@ -129,6 +140,55 @@
+ 	    ifaddraddr = (u_long) ifnet.if_addrlist.tqh_first;
+ #endif
+ 	}
++	if (ifnet.if_flags & IFF_UP)
++		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_UP);
++	if (ifnet.if_flags & IFF_BROADCAST)
++		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_BROADCAST);
++	if (ifnet.if_flags & IFF_DEBUG)
++		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_DEBUG);
++	if (ifnet.if_flags & IFF_LOOPBACK)
++		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LOOPBACK);
++	if (ifnet.if_flags & IFF_POINTOPOINT)
++		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_POINTOPOINT);
++	if (ifnet.if_flags & IFF_RUNNING)
++		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_RUNNING);
++	if (ifnet.if_flags & IFF_NOARP)
++		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_NOARP);
++	if (ifnet.if_flags & IFF_PROMISC)
++		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_PROMISC);
++	if (ifnet.if_flags & IFF_ALLMULTI)
++		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALLMULTI);
++	if (ifnet.if_flags & IFF_OACTIVE)
++		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_OACTIVE);
++	if (ifnet.if_flags & IFF_SIMPLEX)
++		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_SIMPLEX);
++	if (ifnet.if_flags & IFF_LINK0)
++		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK0);
++	if (ifnet.if_flags & IFF_LINK1)
++		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK1);
++	if (ifnet.if_flags & IFF_LINK2)
++		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK2);
++#ifdef __FreeBSD__
++	if (ifnet.if_flags & IFF_ALTPHYS)
++		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALTPHYS);
++#endif
++	if (ifnet.if_flags & IFF_MULTICAST)
++		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_MULTICAST);
++
++	buf->packets_in = ifnet.if_ipackets;
++	buf->packets_out = ifnet.if_opackets;
++	buf->packets_total = buf->packets_in + buf->packets_out;
++
++	buf->bytes_in = ifnet.if_ibytes;
++	buf->bytes_out = ifnet.if_obytes;
++	buf->bytes_total = buf->bytes_in + buf->bytes_out;
++
++	buf->errors_in = ifnet.if_ierrors;
++	buf->errors_out = ifnet.if_oerrors;
++	buf->errors_total = buf->errors_in + buf->errors_out;
++
++	buf->collisions = ifnet.if_collisions;
++	buf->flags = _glibtop_sysdeps_netload;
+ 
+ 	if (ifaddraddr) {
+ 	    if ((kvm_read (server->machine.kd, ifaddraddr, &ifaddr,
+@@ -137,86 +197,22 @@
+ 
+ #define CP(x) ((char *)(x))
+ 	    cp = (CP(ifaddr.ifa.ifa_addr) - CP(ifaddraddr)) +
+-		CP(&ifaddr); sa = (struct sockaddr *)cp;
++		CP(&ifaddr);
++	    sa = (struct sockaddr *)cp;
+ 
+-	    if (!strcmp (interface, tname) && (sa->sa_family == AF_INET)) {
++	    if (sa->sa_family == AF_INET) {
+ 		sin = (struct sockaddr_in *)sa;
+-
+-		if (ifnet.if_flags & IFF_UP)
+-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_UP);
+-		if (ifnet.if_flags & IFF_BROADCAST)
+-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_BROADCAST);
+-		if (ifnet.if_flags & IFF_DEBUG)
+-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_DEBUG);
+-		if (ifnet.if_flags & IFF_LOOPBACK)
+-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LOOPBACK);
+-		if (ifnet.if_flags & IFF_POINTOPOINT)
+-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_POINTOPOINT);
+-		if (ifnet.if_flags & IFF_RUNNING)
+-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_RUNNING);
+-		if (ifnet.if_flags & IFF_NOARP)
+-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_NOARP);
+-		if (ifnet.if_flags & IFF_PROMISC)
+-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_PROMISC);
+-		if (ifnet.if_flags & IFF_ALLMULTI)
+-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALLMULTI);
+-		if (ifnet.if_flags & IFF_OACTIVE)
+-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_OACTIVE);
+-		if (ifnet.if_flags & IFF_SIMPLEX)
+-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_SIMPLEX);
+-		if (ifnet.if_flags & IFF_LINK0)
+-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK0);
+-		if (ifnet.if_flags & IFF_LINK1)
+-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK1);
+-		if (ifnet.if_flags & IFF_LINK2)
+-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK2);
+-#ifdef __FreeBSD__
+-		if (ifnet.if_flags & IFF_ALTPHYS)
+-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALTPHYS);
+-#endif
+-		if (ifnet.if_flags & IFF_MULTICAST)
+-			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_MULTICAST);
+-
+ #if !defined(__bsdi__)
+ 		/* Commenting out to "fix" #13345. */
+ 		buf->subnet = htonl (ifaddr.in.ia_subnet);
+ #endif
+ 		buf->address = sin->sin_addr.s_addr;
+-
+ 		buf->mtu = ifnet.if_mtu;
+ 
+-		buf->packets_in = ifnet.if_ipackets;
+-		buf->packets_out = ifnet.if_opackets;
+-		buf->packets_total = buf->packets_in + buf->packets_out;
+-
+-		buf->bytes_in = ifnet.if_ibytes;
+-		buf->bytes_out = ifnet.if_obytes;
+-		buf->bytes_total = buf->bytes_in + buf->bytes_out;
+-
+-		buf->errors_in = ifnet.if_ierrors;
+-		buf->errors_out = ifnet.if_oerrors;
+-		buf->errors_total = buf->errors_in + buf->errors_out;
+-
+-		buf->collisions = ifnet.if_collisions;
+-		buf->flags = _glibtop_sysdeps_netload;
+-		return;
+-	    }
++		buf->flags |= _glibtop_sysdeps_netload_data;
+ 
+-#if defined(__FreeBSD__) && (__FreeBSD_version >= 300000)
+-	    ifaddraddr = (u_long)ifaddr.ifa.ifa_link.tqe_next;
+-#elif defined(__FreeBSD__) || defined(__bsdi__)
+-	    ifaddraddr = (u_long)ifaddr.ifa.ifa_next;
+-#else
+-	    ifaddraddr = (u_long)ifaddr.ifa.ifa_list.tqe_next;
+-#endif
++	    }
+ 	}
+-
+-#if defined(__FreeBSD__) && (__FreeBSD_version >= 300000)
+-	ifnetaddr = (u_long) ifnet.if_link.tqe_next;
+-#elif defined(__FreeBSD__) || defined(__bsdi__)
+-	ifnetaddr = (u_long) ifnet.if_next;
+-#else
+-	ifnetaddr = (u_long) ifnet.if_list.tqe_next;
+-#endif
++	return;
+     }
+ }