From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 31 14:50:12 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A58E516A4CE for ; Fri, 31 Oct 2003 14:50:12 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3810443FA3 for ; Fri, 31 Oct 2003 14:50:11 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h9VMoBFY091062 for ; Fri, 31 Oct 2003 14:50:11 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h9VMoBOA091061; Fri, 31 Oct 2003 14:50:11 -0800 (PST) (envelope-from gnats) Resent-Date: Fri, 31 Oct 2003 14:50:11 -0800 (PST) Resent-Message-Id: <200310312250.h9VMoBOA091061@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Thorsten Greiner Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA01316A4CE for ; Fri, 31 Oct 2003 14:43:42 -0800 (PST) Received: from smtp.web.de (smtp02.web.de [217.72.192.151]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB19643FBD for ; Fri, 31 Oct 2003 14:43:40 -0800 (PST) (envelope-from thorsten.greiner@web.de) Received: from [80.141.3.70] (helo=tybalt) by smtp.web.de with asmtp (WEB.DE 4.99 #516) id 1AFhzX-0005Xt-00 for FreeBSD-gnats-submit@freebsd.org; Fri, 31 Oct 2003 23:43:39 +0100 Message-Id: <20031031224321.GA1480@tybalt> Date: Fri, 31 Oct 2003 23:43:21 +0100 From: Thorsten Greiner Sender: thorsten.greiner@web.de To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/58788: Update port: sysutils/xfce4-systemload-plugin to 0.3.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Oct 2003 22:50:12 -0000 >Number: 58788 >Category: ports >Synopsis: Update port: sysutils/xfce4-systemload-plugin to 0.3.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Oct 31 14:50:10 PST 2003 >Closed-Date: >Last-Modified: >Originator: Thorsten Greiner >Release: FreeBSD 5.1-CURRENT i386 >Organization: n/a >Environment: System: FreeBSD tybalt 5.1-CURRENT FreeBSD 5.1-CURRENT #6: Fri Oct 31 15:28:50 CET 2003 toor@tybalt:/usr/src/sys/i386/compile/TYBALT i386 >Description: Update sysutils/xfce4-systemload-plugin to 0.3.3 >How-To-Repeat: Apply patch. Please note that files/patch-memswap.c should be deleted since it has been incorporated by the upstream author. >Fix: Index: distinfo =================================================================== --- distinfo (revision 169) +++ distinfo (working copy) @@ -1 +1 @@ -MD5 (xfce4/xfce4-systemload-plugin-0.3.2.tar.gz) = 54f940ea77261bb61ca54dd77253c222 +MD5 (xfce4/xfce4-systemload-plugin-0.3.3.tar.gz) = 10868e9e910e0c8ac355436d2a44e641 Index: files/patch-memswap.c =================================================================== --- files/patch-memswap.c (revision 169) +++ files/patch-memswap.c (working copy) @@ -1,118 +0,0 @@ ---- panel-plugin/memswap.c.orig Tue Jul 29 21:40:55 2003 -+++ panel-plugin/memswap.c Thu Jul 31 22:43:10 2003 -@@ -193,4 +193,113 @@ - - return 0; - } --#endif -\ No newline at end of file -+#endif -+ -+#if defined(__FreeBSD__) -+/* -+ * This is inspired by /usr/src/usr.bin/top/machine.c -+ * -+ * Adapted by Thorsten Greiner -+ * -+ * Original authors: Christos Zoulas -+ * Steven Wallace -+ * Wolfram Schneider -+ * Thomas Moestl -+ */ -+ -+#include -+#include -+#include -+ -+#define GETSYSCTL(name, var) getsysctl(name, &(var), sizeof(var)) -+ -+static int getsysctl (char *name, void *ptr, size_t len) -+{ -+ size_t nlen = len; -+ if (sysctlbyname(name, ptr, &nlen, NULL, 0) == -1) { -+ return -1; -+ } -+ if (nlen != len) { -+ return -1; -+ } -+ return 0; -+} -+ -+static kvm_t *kd = NULL; -+ -+static int swapmode(int *retavail, int *retfree) -+{ -+ int n; -+ int pagesize = getpagesize(); -+ struct kvm_swap swapary[1]; -+ static int kd_init = TRUE; -+ -+ if(kd_init) { -+ kd_init = FALSE; -+ if ((kd = kvm_open("/dev/null", "/dev/null", "/dev/null", -+ O_RDONLY, "kvm_open")) == NULL) { -+ g_warning("Cannot read kvm."); -+ return -1; -+ } -+ } -+ if(kd == NULL) { -+ return -1; -+ } -+ -+ *retavail = 0; -+ *retfree = 0; -+ -+#define CONVERT(v) ((quad_t)(v) * pagesize / 1024) -+ -+ n = kvm_getswapinfo(kd, swapary, 1, 0); -+ if (n < 0 || swapary[0].ksw_total == 0) -+ return(0); -+ -+ *retavail = CONVERT(swapary[0].ksw_total); -+ *retfree = CONVERT(swapary[0].ksw_total - swapary[0].ksw_used); -+ -+ n = (int)((double)swapary[0].ksw_used * 100.0 / -+ (double)swapary[0].ksw_total); -+ return(n); -+} -+ -+gint read_memswap(gulong *mem, gulong *swap, gulong *MT, gulong *MU, gulong *ST, gulong *SU) -+{ -+ int total_pages; -+ int free_pages; -+ int inactive_pages; -+ int pagesize = getpagesize(); -+ int swap_avail; -+ int swap_free; -+ -+ if(GETSYSCTL("vm.stats.vm.v_page_count", total_pages)) { -+ g_warning("Cannot read sysctl \"vm.stats.vm.v_page_count\""); -+ return -1; -+ } -+ if(GETSYSCTL("vm.stats.vm.v_free_count", free_pages)) { -+ g_warning("Cannot read sysctl \"vm.stats.vm.v_free_count\""); -+ return -1; -+ } -+ if(GETSYSCTL("vm.stats.vm.v_inactive_count", inactive_pages)) { -+ g_warning("Cannot read sysctl \"vm.stats.vm.v_inactive_count\""); -+ return -1; -+ } -+ -+ *MT = (total_pages*pagesize) >> 10; -+ *MU = ((total_pages-free_pages-inactive_pages) * pagesize) >> 10; -+ *mem = *MU * 100 / *MT; -+ -+ if((*swap = swapmode(&swap_avail, &swap_free)) >= 0) { -+ *ST = swap_avail; -+ *SU = (swap_avail - swap_free); -+ } -+ else { -+ *swap = 0; -+ *ST = 0; -+ *SU = 0; -+ } -+ -+ return 0; -+} -+ -+#endif /* defined(__FREEBSD) */ Index: Makefile =================================================================== --- Makefile (revision 170) +++ Makefile (working copy) @@ -6,7 +6,7 @@ # PORTNAME= xfce4-systemload-plugin -PORTVERSION= 0.3.2 +PORTVERSION= 0.3.3 CATEGORIES= sysutils xfce MASTER_SITES= http://download.berlios.de/xfce-goodies/ DIST_SUBDIR= xfce4 >Release-Note: >Audit-Trail: >Unformatted: