head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.54 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.52 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.50 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.48 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.46 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.44 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.42 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.40 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.38 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.36 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.34 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.32 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.30 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.28 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.26 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.1.1.1.0.6 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2003.03.09.09.55.46; author jmmv; state dead; branches; next 1.1; 1.1 date 2002.03.24.18.04.57; author wiz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.03.24.18.04.57; author wiz; state Exp; branches; next ; desc @@ 1.2 log @Update to 1.0.1. Changes since 0.9.0: * src/cpu_freebsd.c: changed to use instead of in the case of __FreeBSD_version >= 500101. (Thanks to Philip Paeps ) * main.c: changed description for `--cpu' oprion to be more clear. * README: updated * cpu_irix.c: added for IRIX (Jonathan C. Patschke ) * version 1.0.0 released * code cleanup/review * dockapp.c: renamed dockapp_getcolor() to dockapp_getcolor_pixel(). * dockapp.c: added get_closest_color_pixel() to find closest color in Pseudo visual class. * src/Makefile.am: added missing @@DFLAGS@@ * cpu_bsdi.c: added (Nicolas Belan ) * dockapp.c, dockapp.h: moved to libdockapp/dockapp.[ch] * libdockapp/{COPYING,AUTHORS}: added (taken from libdockapp-0.4.0) * configure.ac: removed '-L/usr/local/lib' '-I/usr/local/include' from *_search_path (Thanks to Thomas Runge ) * README: added 'for GNOME users' section * cpu_cywin.c: rewrote to separate cpu_get_usage(). ( ==> cpu_get_usage_9x(), cpu_get_usage_NT()) * dockapp.c: removed background panel from windowed mode. * dockapp.c: added '-wp, --windowed-withpanel' option. * main.c: added '-t, --title' option to specify title name (Thanks to Ryan Lovett ) * wmcpuload.1: updated * cpu_netbsd.c: added 'CP_INTR' parameter * added NetBSD support (Thomas Runge ) Closes PR pkg/20631 by Thomas Runge (the maintainer). @ text @$NetBSD: patch-ac,v 1.1 2002/03/24 18:04:57 wiz Exp $ --- src/cpu_netbsd.c.orig Sun Mar 24 18:18:37 2002 +++ src/cpu_netbsd.c @@@@ -0,0 +1,62 @@@@ +/* + * cpu_netbsd - module to get cpu usage, for NetBSD + * + * Copyright (C) 2001, 2002 Seiichi SATO + * + * Licensed under the GPL + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include +#include +#include "cpu.h" + +#include +#include +#include +#include + +void cpu_init(void) +{ + /* You don't need initialization under NetBSD */ + return; +} + +/* Returns the current CPU usage in percent */ +int cpu_get_usage(struct cpu_options *opts) +{ + int total, used, result; + static int pre_total, pre_used; + + int mib[] = { CTL_KERN, KERN_CP_TIME }; + u_int64_t cpu_time[CPUSTATES]; + size_t size = sizeof(cpu_time); + + /* get cpu time*/ + if (sysctl(mib, 2, &cpu_time, &size, NULL, 0) < 0) + return 0; + + /* calc usage */ + used = cpu_time[CP_USER] + cpu_time[CP_SYS]; + if (!opts->ignore_nice) + used += cpu_time[CP_NICE]; + total = used + cpu_time[CP_IDLE]; + + if (pre_total == 0) + result = 0; + else if ((total - pre_total) > 0) + result = 100 * (double)(used - pre_used) / (double)(total - pre_total); + else + result = 0; + + /* save used/total for next calculation */ + pre_used = used; + pre_total = total; + + return result; +} @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Add wmcpuload, a windowmaker dockapp for showing CPU usage, provided by Thomas Runge in pkg/16036, buildlinked by me. @ text @@