commit libstatgrab for openSUSE:Factory

Hello community, here is the log from the commit of package libstatgrab for openSUSE:Factory checked in at 2012-02-27 18:34:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstatgrab (Old) and /work/SRC/openSUSE:Factory/.libstatgrab.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstatgrab", Maintainer is "ro@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libstatgrab/libstatgrab.changes 2012-01-25 10:37:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libstatgrab.new/libstatgrab.changes 2012-02-27 18:35:42.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Feb 19 11:47:39 UTC 2012 - pascal.bleser@opensuse.org + +- update to 0.17: + * provide iowait cpu information on Linux version 2.5.41 or later + * use utmpx when available + +------------------------------------------------------------------- Old: ---- libstatgrab-0.16.tar.gz New: ---- libstatgrab-0.17.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstatgrab.spec ++++++ --- /var/tmp/diff_new_pack.YtCTwS/_old 2012-02-27 18:35:43.000000000 +0100 +++ /var/tmp/diff_new_pack.YtCTwS/_new 2012-02-27 18:35:43.000000000 +0100 @@ -15,10 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define soname 6 Name: libstatgrab -Version: 0.16 +Version: 0.17 Release: 0 Summary: Interface to System Statistics License: LGPL-2.1+ @@ -40,6 +41,7 @@ BuildRequires: make BuildRequires: ncurses-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig %description The libstatgrab library provides an easy-to-use interface for accessing system ++++++ libstatgrab-0.16.tar.gz -> libstatgrab-0.17.tar.gz ++++++ ++++ 2058 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libstatgrab-0.16/ChangeLog new/libstatgrab-0.17/ChangeLog --- old/libstatgrab-0.16/ChangeLog 2008-03-13 14:58:50.000000000 +0100 +++ new/libstatgrab-0.17/ChangeLog 2010-02-21 11:08:53.000000000 +0100 @@ -1,3 +1,81 @@ +2010-02-21 Sunday 10:05 tdb + + * NEWS (1.48, LIBSTATGRAB_0_17): + + Add FreeBSD memory fix and correctly attribute other changes. + +2010-02-21 Sunday 10:04 tdb + + * src/libstatgrab/memory_stats.c (1.36, LIBSTATGRAB_0_17): + + Support larger amounts of memory on FreeBSD. + +2010-02-20 Saturday 18:17 tdb + + * NEWS (1.47), src/libstatgrab/Makefile.am (1.35, + LIBSTATGRAB_0_17): + + Bump library version and NEWS for next release. + +2010-02-20 Saturday 18:15 tdb + + * configure.in (1.100, LIBSTATGRAB_0_17): + + Support FreeBSD 9. + +2010-02-20 Saturday 17:55 tdb + + * configure.in (1.99), src/libstatgrab/user_stats.c (1.29, + LIBSTATGRAB_0_17): + + Support utmpx in user_stats as well as utmp. + +2009-12-04 Friday 22:09 tdb + + * src/libstatgrab/disk_stats.c (1.88, LIBSTATGRAB_0_17): + + Make list of valid filesystem types dynamic on FreeBSD. Based on patch + by Baptiste Daroussin. + +2009-05-16 Saturday 02:01 tdb + + * src/libstatgrab/disk_stats.c (1.87): + + FreeBSD has zfs these days. + +2008-08-03 Sunday 18:43 tdb + + * src/libstatgrab/disk_stats.c (1.86): + + Add zfs to allowed FSs on Solaris. + +2008-06-17 Tuesday 16:52 tdb + + * src/libstatgrab/cpu_stats.c (1.28, LIBSTATGRAB_0_17): + + Linux version 2.5.41 or later provides iowait data in /proc/stat. Use + it if it's available. + +2008-05-24 Saturday 23:30 ats + + * docs/: libstatgrab/Makefile.am (1.2), saidar/Makefile.am (1.3), + statgrab/Makefile.am (1.3) (utags: LIBSTATGRAB_0_17): + + Avoid a GNU-make-ism in the docs. + +2008-05-24 Saturday 22:05 ats + + * configure.in (1.98): + + Disable autoconf maintainer mode -- it's less broken in modern autoconf, + so it's useful now. + +2008-03-17 Monday 08:50 tdb + + * configure.in (1.97): + + Post release version increment. + 2008-03-13 Thursday 11:23 tdb * NEWS (1.46, LIBSTATGRAB_0_16): @@ -7,7 +85,7 @@ 2008-03-13 Thursday 10:29 tdb * src/statgrab/statgrab-make-mrtg-config.in (1.10, - LIBSTATGRAB_0_16): + LIBSTATGRAB_0_17, LIBSTATGRAB_0_16): Fix mrtg config generation on machines with no swap. @@ -53,16 +131,16 @@ 2007-07-05 Thursday 17:46 tdb - * src/libstatgrab/swap_stats.c (1.25, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15): + * src/libstatgrab/swap_stats.c (1.25, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15): Last argument to sysctl is an integer not a pointer. It should be set to 0 if the preceding argument is NULL. 2007-06-18 Monday 21:58 tdb - * src/libstatgrab/tools.c (1.65, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15): + * src/libstatgrab/tools.c (1.65, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15): Update strlcat and strlcpy to latest OpenBSD versions. Remove last references to strcat and strcpy. @@ -81,8 +159,8 @@ 2007-01-06 Saturday 01:01 tdb - * acinclude.m4 (1.3, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, - LIBSTATGRAB_0_14): + * acinclude.m4 (1.3, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, + LIBSTATGRAB_0_15, LIBSTATGRAB_0_14): Fix bug in curses detection - LIBS was not properly reset. Also remove to redundant variable declarations. @@ -101,8 +179,8 @@ 2007-01-05 Friday 13:30 tdb - * src/saidar/saidar.c (1.41, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, - LIBSTATGRAB_0_14): + * src/saidar/saidar.c (1.41, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, + LIBSTATGRAB_0_15, LIBSTATGRAB_0_14): Fix problem with saidar crashing when window is rapidly resized. Done by moving the code out of the signal handler and in to the main loop, and @@ -149,8 +227,8 @@ 2006-11-30 Thursday 23:42 tdb - * docs/saidar/saidar.xml (1.3, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, - LIBSTATGRAB_0_14), src/saidar/saidar.c (1.36): + * docs/saidar/saidar.xml (1.3, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, + LIBSTATGRAB_0_15, LIBSTATGRAB_0_14), src/saidar/saidar.c (1.36): Add support for coloured fields in saidar. Optionally enabled by using the new -c flag. Manpage updated with details. @@ -180,8 +258,8 @@ 2006-10-09 Monday 18:25 tdb - * src/libstatgrab/network_stats.c (1.80, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14): + * src/libstatgrab/network_stats.c (1.80, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14): When checking the interface up status check the link status as well. @@ -196,8 +274,8 @@ 2006-10-09 Monday 15:47 tdb - * src/libstatgrab/process_stats.c (1.82, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14): + * src/libstatgrab/process_stats.c (1.82, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14): Fix process time_spent on Linux. @@ -207,10 +285,10 @@ * src/libstatgrab/: disk_stats.c (1.85, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14), load_stats.c (1.19, - LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14), - network_stats.c (1.78), os_info.c (1.24, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14), tools.c (1.64, - LIBSTATGRAB_0_14): + LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, + LIBSTATGRAB_0_14), network_stats.c (1.78), os_info.c (1.24, + LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, + LIBSTATGRAB_0_14), tools.c (1.64, LIBSTATGRAB_0_14): Make sure we always close kstat. @@ -262,8 +340,9 @@ 2006-03-17 Friday 13:23 ats - * src/statgrab/statgrab.c (1.37, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13): + * src/statgrab/statgrab.c (1.37, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, + LIBSTATGRAB_0_13): Replace both spaces and dots with underscores in name components, so that filesystem paths containing dots work correctly. @@ -276,8 +355,9 @@ 2006-03-11 Saturday 13:11 tdb - * src/libstatgrab/statgrab.h (1.58, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13): + * src/libstatgrab/statgrab.h (1.58, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, + LIBSTATGRAB_0_13): Nasty hack to make inclusion in C++ code easier. We seem to be getting regular reports of problems with C++, and this should fix them. @@ -290,8 +370,8 @@ 2006-02-18 Saturday 15:24 tdb - * src/libstatgrab/win32.c (1.2, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, - LIBSTATGRAB_0_14, LIBSTATGRAB_0_13): + * src/libstatgrab/win32.c (1.2, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, + LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13): Apply fix to Win32 code. @@ -317,28 +397,29 @@ 2005-09-24 Saturday 14:29 tdb * configure.in (1.87), examples/cpu_usage.c (1.11, - LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, - LIBSTATGRAB_0_13), src/libstatgrab/Makefile.am (1.31), - src/libstatgrab/cpu_stats.c (1.26, LIBSTATGRAB_0_13), + LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, + LIBSTATGRAB_0_14, LIBSTATGRAB_0_13), src/libstatgrab/Makefile.am + (1.31), src/libstatgrab/cpu_stats.c (1.26, LIBSTATGRAB_0_13), src/libstatgrab/disk_stats.c (1.83), src/libstatgrab/error.c (1.17, - LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, - LIBSTATGRAB_0_13), src/libstatgrab/load_stats.c (1.18, - LIBSTATGRAB_0_13), src/libstatgrab/memory_stats.c (1.32, + LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, + LIBSTATGRAB_0_14, LIBSTATGRAB_0_13), src/libstatgrab/load_stats.c + (1.18, LIBSTATGRAB_0_13), src/libstatgrab/memory_stats.c (1.32, LIBSTATGRAB_0_13), src/libstatgrab/network_stats.c (1.76), src/libstatgrab/os_info.c (1.23, LIBSTATGRAB_0_13), - src/libstatgrab/page_stats.c (1.23, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13), - src/libstatgrab/process_stats.c (1.81, LIBSTATGRAB_0_13), - src/libstatgrab/statgrab.h (1.57), src/libstatgrab/swap_stats.c - (1.24, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13), src/libstatgrab/tools.c - (1.63, LIBSTATGRAB_0_13), src/libstatgrab/tools.h (1.26, + src/libstatgrab/page_stats.c (1.23, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, + LIBSTATGRAB_0_13), src/libstatgrab/process_stats.c (1.81, + LIBSTATGRAB_0_13), src/libstatgrab/statgrab.h (1.57), + src/libstatgrab/swap_stats.c (1.24, LIBSTATGRAB_0_14, + LIBSTATGRAB_0_13), src/libstatgrab/tools.c (1.63, + LIBSTATGRAB_0_13), src/libstatgrab/tools.h (1.26, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13), src/libstatgrab/user_stats.c (1.28, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13), src/libstatgrab/win32.c (1.1), - src/libstatgrab/win32.h (1.1, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, - LIBSTATGRAB_0_14, LIBSTATGRAB_0_13), src/statgrab/statgrab.c - (1.36): + src/libstatgrab/win32.h (1.1, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, + LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13), + src/statgrab/statgrab.c (1.36): Add WIN32 support via MINGW. We'll need to add stuff to the README file about what this requires to build. @@ -395,10 +476,11 @@ 2005-07-13 Wednesday 14:01 tdb - * docs/libstatgrab/sg_get_fs_stats.xml (1.5, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13), - src/libstatgrab/disk_stats.c (1.82), src/libstatgrab/statgrab.h - (1.56), src/statgrab/statgrab.c (1.35) (utags: LIBSTATGRAB_0_12): + * docs/libstatgrab/sg_get_fs_stats.xml (1.5, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, + LIBSTATGRAB_0_13), src/libstatgrab/disk_stats.c (1.82), + src/libstatgrab/statgrab.h (1.56), src/statgrab/statgrab.c (1.35) + (utags: LIBSTATGRAB_0_12): Add more fs stats. @@ -407,9 +489,10 @@ 2005-07-13 Wednesday 10:31 tdb * docs/libstatgrab/sg_get_network_iface_stats.xml (1.7, + LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, + LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12), + examples/network_iface_stats.c (1.7, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, - LIBSTATGRAB_0_13, LIBSTATGRAB_0_12), examples/network_iface_stats.c - (1.7, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12), src/libstatgrab/network_stats.c (1.74), src/libstatgrab/statgrab.h (1.55), src/statgrab/statgrab.c (1.34): @@ -433,20 +516,21 @@ 2005-04-25 Monday 13:37 tdb - * configure.in (1.84), docs/Makefile.am (1.28, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, - LIBSTATGRAB_0_12), docs/libstatgrab/Makefile.am (1.1, + * configure.in (1.84), docs/Makefile.am (1.28, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, + LIBSTATGRAB_0_13, LIBSTATGRAB_0_12), docs/libstatgrab/Makefile.am + (1.1, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12), docs/saidar/Makefile.am (1.1, LIBSTATGRAB_0_12), docs/saidar/saidar.xml (1.1), docs/statgrab/Makefile.am (1.1, LIBSTATGRAB_0_12), - docs/statgrab/statgrab-make-mrtg-config.xml (1.1, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, - LIBSTATGRAB_0_12), docs/statgrab/statgrab-make-mrtg-index.xml (1.1, + docs/statgrab/statgrab-make-mrtg-config.xml (1.1, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, + LIBSTATGRAB_0_13, LIBSTATGRAB_0_12), + docs/statgrab/statgrab-make-mrtg-index.xml (1.1, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12), docs/statgrab/statgrab.xml - (1.1, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, - LIBSTATGRAB_0_13, LIBSTATGRAB_0_12): + (1.1, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, + LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12): Add manpages for the various tools. @@ -458,45 +542,49 @@ 2005-04-25 Monday 12:25 tdb - * docs/libstatgrab/: sg_get_cpu_stats.xml (1.7, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, - LIBSTATGRAB_0_12), sg_get_disk_io_stats.xml (1.9, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, - LIBSTATGRAB_0_12), sg_get_fs_stats.xml (1.4), sg_get_host_info.xml - (1.6, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, - LIBSTATGRAB_0_13, LIBSTATGRAB_0_12), sg_get_load_stats.xml (1.6, + * docs/libstatgrab/: sg_get_cpu_stats.xml (1.7, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, - LIBSTATGRAB_0_13, LIBSTATGRAB_0_12), sg_get_mem_stats.xml (1.6, + LIBSTATGRAB_0_13, LIBSTATGRAB_0_12), sg_get_disk_io_stats.xml (1.9, + LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, + LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12), + sg_get_fs_stats.xml (1.4), sg_get_host_info.xml (1.6, + LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, + LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12), + sg_get_load_stats.xml (1.6, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, + LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, + LIBSTATGRAB_0_12), sg_get_mem_stats.xml (1.6, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12), sg_get_network_iface_stats.xml - (1.6), sg_get_network_io_stats.xml (1.8, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, - LIBSTATGRAB_0_12), sg_get_page_stats.xml (1.6, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, - LIBSTATGRAB_0_12), sg_get_process_stats.xml (1.10, + (1.6), sg_get_network_io_stats.xml (1.8, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, - LIBSTATGRAB_0_13, LIBSTATGRAB_0_12), sg_get_user_stats.xml (1.6, + LIBSTATGRAB_0_13, LIBSTATGRAB_0_12), sg_get_page_stats.xml (1.6, + LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, + LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12), + sg_get_process_stats.xml (1.10, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, + LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, + LIBSTATGRAB_0_12), sg_get_user_stats.xml (1.6, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12), statgrab.xml (1.14, - LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, - LIBSTATGRAB_0_13, LIBSTATGRAB_0_12): + LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, + LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12): Move by repocopy the libstatgrab docs in to a subdirectory. This is so I can create separate directories for statgrab/saidar docs. 2005-04-25 Monday 12:01 tdb - * configure.in (1.83), src/Makefile.am (1.5, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, - LIBSTATGRAB_0_12): + * configure.in (1.83), src/Makefile.am (1.5, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, + LIBSTATGRAB_0_13, LIBSTATGRAB_0_12): Nuke sgps - Pete's decided it's actually rather pointless as it doesn't offer anything that other ps programs don't. 2005-04-25 Monday 11:59 tdb - * PLATFORMS (1.10, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, - LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12): + * PLATFORMS (1.10, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, + LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, + LIBSTATGRAB_0_12): Update list of platforms - we've tested on Solaris 10. @@ -660,7 +748,7 @@ * examples/: os_info.c (1.9), vm_stats.c (1.12) (utags: LIBSTATGRAB_0_11, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_12, LIBSTATGRAB_0_13, LIBSTATGRAB_0_14, LIBSTATGRAB_0_15, - LIBSTATGRAB_0_16): + LIBSTATGRAB_0_16, LIBSTATGRAB_0_17): Remove a couple of unused parameters. @@ -988,10 +1076,10 @@ 2004-06-21 Monday 22:41 tdb - * configure.in (1.71), libstatgrab.pc.in (1.4, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, - LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, - LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2) (utags: + * configure.in (1.71), libstatgrab.pc.in (1.4, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, + LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, + LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2) (utags: LIBSTATGRAB_0_10_1): Add three variables to the pkg-config file: bin_owner, bin_group, bin_perm @@ -1039,7 +1127,7 @@ (utags: LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_11, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_12, LIBSTATGRAB_0_13, LIBSTATGRAB_0_14, LIBSTATGRAB_0_15, - LIBSTATGRAB_0_16): + LIBSTATGRAB_0_16, LIBSTATGRAB_0_17): Fix permission setting when DESTDIR is used. There still seems to be an issue with libtool on my FreeBSD box, but a google search suggests this is @@ -1213,12 +1301,13 @@ 2004-04-08 Thursday 14:16 ats - * examples/process_snapshot.c (1.10, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, - LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, - LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, - LIBSTATGRAB_0_10), src/libstatgrab/process_stats.c (1.69), - src/libstatgrab/statgrab.h (1.48): + * examples/process_snapshot.c (1.10, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, + LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, + LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, + LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10), + src/libstatgrab/process_stats.c (1.69), src/libstatgrab/statgrab.h + (1.48): Nuke sg_process_sort, and make the process stats example demonstrate how to sort using the compare functions and qsort. @@ -1345,10 +1434,10 @@ memory_stats.c (1.26), network_stats.c (1.65), os_info.c (1.17), page_stats.c (1.20), process_stats.c (1.63), statgrab.h (1.40), tools.c (1.49), user_stats.c (1.24), vector.c (1.9, - LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, - LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, - LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, - LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10): + LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, + LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, + LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, + LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10): Whitespace tidyup - change spaces to tabs. @@ -1414,10 +1503,10 @@ 2004-04-06 Tuesday 22:08 tdb * src/libstatgrab/: process_stats.c (1.59), statgrab_deprecated.c - (1.2, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, - LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, - LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, - LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10): + (1.2, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, + LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, + LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, + LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10): Fix a couple of includes. @@ -1442,11 +1531,11 @@ * configure.in (1.67, LIBSTATGRAB_0_10), src/libstatgrab/Makefile.am (1.23), src/libstatgrab/statgrab.h (1.35), src/libstatgrab/statgrab_deprecated.c (1.1), - src/libstatgrab/statgrab_deprecated.h (1.1, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, - LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, - LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, - LIBSTATGRAB_0_10): + src/libstatgrab/statgrab_deprecated.h (1.1, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, + LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, + LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, + LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10): Add compatibility code. This provides a working pre-0.10 API for old applications. To use simply change the #include line to: @@ -1465,11 +1554,11 @@ 2004-04-06 Tuesday 15:54 tdb - * src/libstatgrab/vector.h (1.7, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, - LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, - LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, - LIBSTATGRAB_0_10): + * src/libstatgrab/vector.h (1.7, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, + LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, + LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, + LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10): Add header block. @@ -1478,30 +1567,32 @@ * examples/cpu_usage.c (1.10, LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10), examples/disk_traffic.c - (1.10, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, + (1.10, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, + LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, + LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, + LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10), + examples/load_stats.c (1.10, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, + LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, + LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, + LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, + LIBSTATGRAB_0_10), examples/network_iface_stats.c (1.5), + examples/network_traffic.c (1.14, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, - LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10), examples/load_stats.c (1.10, + LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10), examples/os_info.c (1.8, + LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, + LIBSTATGRAB_0_10), examples/page_stats.c (1.9, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, - LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10), - examples/network_iface_stats.c (1.5), examples/network_traffic.c - (1.14, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, + LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10), examples/process_snapshot.c + (1.8), examples/process_stats.c (1.10, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, - LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10), examples/os_info.c (1.8, - LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, - LIBSTATGRAB_0_10), examples/page_stats.c (1.9, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, - LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, - LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, - LIBSTATGRAB_0_10), examples/process_snapshot.c (1.8), - examples/process_stats.c (1.10, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, - LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, - LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, - LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10), - examples/user_list.c (1.10, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, + LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10), examples/user_list.c (1.10, + LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10), @@ -1517,11 +1608,12 @@ (1.6), src/saidar/saidar.c (1.28), src/statgrab/statgrab-make-mrtg-config.in (1.5, LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10), - src/statgrab/statgrab-make-mrtg-index.in (1.7, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, - LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, - LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, - LIBSTATGRAB_0_10), src/statgrab/statgrab.c (1.25): + src/statgrab/statgrab-make-mrtg-index.in (1.7, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, + LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, + LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, + LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10), src/statgrab/statgrab.c + (1.25): Update name of project at the top of all soure files. These files now exist in their own right, rather than as part of the "CMS". @@ -1985,11 +2077,11 @@ 2004-04-03 Saturday 17:55 tdb - * examples/: Makefile.am (1.12, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, - LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, - LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, - LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10), - process_snapshot.c (1.1): + * examples/: Makefile.am (1.12, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, + LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, + LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, + LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, + LIBSTATGRAB_0_10), process_snapshot.c (1.1): Add process_snapshot example for testing the new process stats code. @@ -2046,10 +2138,11 @@ 2004-03-20 Saturday 19:25 tdb - * Makefile.am (1.17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, - LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, - LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, - LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10): + * Makefile.am (1.17, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, + LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, + LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, + LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, + LIBSTATGRAB_0_10): The libstatgrab python bindings are now their own package - pystatgrab. @@ -2113,11 +2206,11 @@ 2004-03-09 Tuesday 12:24 tdb - * PLATFORMS (1.5), README (1.9, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, - LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, - LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, - LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10, - LIBSTATGRAB_0_9): + * PLATFORMS (1.5), README (1.9, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, + LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, + LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, + LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, + LIBSTATGRAB_0_10, LIBSTATGRAB_0_9): Add platform specific notes (particularly on required privileges) to the PLATFORMS file. @@ -2277,11 +2370,11 @@ 2004-02-15 Sunday 17:47 tdb - * AUTHORS (1.7, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, - LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, - LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, - LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10, - LIBSTATGRAB_0_9): + * AUTHORS (1.7, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, + LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, + LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, + LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, + LIBSTATGRAB_0_10, LIBSTATGRAB_0_9): Update AUTHORS; it's not quite so clear cut anymore, so just list names. @@ -2709,21 +2802,21 @@ * AUTHORS (1.6, LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), Makefile.am (1.13, LIBSTATGRAB_0_8_1), NEWS (1.21), README (1.8, LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), README.CVS (1.5, - LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, - LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, - LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, - LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10, LIBSTATGRAB_0_9, - LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), libstatgrab.pc.in (1.3, - LIBSTATGRAB_0_10, LIBSTATGRAB_0_9, LIBSTATGRAB_0_8_2, - LIBSTATGRAB_0_8_1), docs/Makefile.am (1.22, LIBSTATGRAB_0_8_2, - LIBSTATGRAB_0_8_1), examples/Makefile.am (1.10, LIBSTATGRAB_0_8_2, - LIBSTATGRAB_0_8_1), examples/cpu_usage.c (1.7, LIBSTATGRAB_0_9, - LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), examples/disk_traffic.c - (1.7, LIBSTATGRAB_0_9, LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), - examples/load_stats.c (1.7, LIBSTATGRAB_0_9, LIBSTATGRAB_0_8_2, - LIBSTATGRAB_0_8_1), examples/network_traffic.c (1.8, - LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), examples/os_info.c (1.6, + LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, + LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, + LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, + LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10, LIBSTATGRAB_0_9, LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), + libstatgrab.pc.in (1.3, LIBSTATGRAB_0_10, LIBSTATGRAB_0_9, + LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), docs/Makefile.am (1.22, + LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), examples/Makefile.am (1.10, + LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), examples/cpu_usage.c (1.7, + LIBSTATGRAB_0_9, LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), + examples/disk_traffic.c (1.7, LIBSTATGRAB_0_9, LIBSTATGRAB_0_8_2, + LIBSTATGRAB_0_8_1), examples/load_stats.c (1.7, LIBSTATGRAB_0_9, + LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), examples/network_traffic.c + (1.8, LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), examples/os_info.c + (1.6, LIBSTATGRAB_0_9, LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), examples/page_stats.c (1.6, LIBSTATGRAB_0_9, LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), examples/process_stats.c (1.7, LIBSTATGRAB_0_9, LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), examples/user_list.c (1.7, @@ -2768,24 +2861,24 @@ 2004-01-16 Friday 15:54 tdb - * COPYING (1.1, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, - LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, - LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, - LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10, - LIBSTATGRAB_0_9, LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), - COPYING.LGPL (1.1, LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, - LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, - LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, - LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10, - LIBSTATGRAB_0_9, LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), Makefile.am - (1.12), README (1.7), examples/cpu_usage.c (1.6), - examples/disk_traffic.c (1.6), examples/load_stats.c (1.6), - examples/network_traffic.c (1.7), examples/os_info.c (1.5), - examples/page_stats.c (1.5), examples/process_stats.c (1.6), - examples/user_list.c (1.6), examples/vm_stats.c (1.6), - src/libstatgrab/cpu_stats.c (1.16), src/libstatgrab/disk_stats.c - (1.48), src/libstatgrab/load_stats.c (1.8), - src/libstatgrab/memory_stats.c (1.18), + * COPYING (1.1, LIBSTATGRAB_0_17, LIBSTATGRAB_0_16, + LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, + LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, + LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, + LIBSTATGRAB_0_10, LIBSTATGRAB_0_9, LIBSTATGRAB_0_8_2, + LIBSTATGRAB_0_8_1), COPYING.LGPL (1.1, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, + LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, + LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, + LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10, LIBSTATGRAB_0_9, + LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1), Makefile.am (1.12), README + (1.7), examples/cpu_usage.c (1.6), examples/disk_traffic.c (1.6), + examples/load_stats.c (1.6), examples/network_traffic.c (1.7), + examples/os_info.c (1.5), examples/page_stats.c (1.5), + examples/process_stats.c (1.6), examples/user_list.c (1.6), + examples/vm_stats.c (1.6), src/libstatgrab/cpu_stats.c (1.16), + src/libstatgrab/disk_stats.c (1.48), src/libstatgrab/load_stats.c + (1.8), src/libstatgrab/memory_stats.c (1.18), src/libstatgrab/network_stats.c (1.22), src/libstatgrab/os_info.c (1.12), src/libstatgrab/page_stats.c (1.13), src/libstatgrab/process_stats.c (1.17), src/libstatgrab/statgrab.h @@ -3657,13 +3750,13 @@ 2003-10-04 Saturday 18:07 tdb - * README.CVS (1.4), autogen.sh (1.1, LIBSTATGRAB_0_16, - LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, LIBSTATGRAB_0_13, - LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, LIBSTATGRAB_0_11, - LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, LIBSTATGRAB_0_10_1, - LIBSTATGRAB_0_10, LIBSTATGRAB_0_9, LIBSTATGRAB_0_8_2, - LIBSTATGRAB_0_8_1) (utags: LIBSTATGRAB_0_6, LIBSTATGRAB_0_6_1, - LIBSTATGRAB_0_7, LIBSTATGRAB_0_8): + * README.CVS (1.4), autogen.sh (1.1, LIBSTATGRAB_0_17, + LIBSTATGRAB_0_16, LIBSTATGRAB_0_15, LIBSTATGRAB_0_14, + LIBSTATGRAB_0_13, LIBSTATGRAB_0_12, LIBSTATGRAB_0_11_1, + LIBSTATGRAB_0_11, LIBSTATGRAB_0_10_3, LIBSTATGRAB_0_10_2, + LIBSTATGRAB_0_10_1, LIBSTATGRAB_0_10, LIBSTATGRAB_0_9, + LIBSTATGRAB_0_8_2, LIBSTATGRAB_0_8_1) (utags: LIBSTATGRAB_0_6, + LIBSTATGRAB_0_6_1, LIBSTATGRAB_0_7, LIBSTATGRAB_0_8): Add autogen.sh, a script to run automake/autoconf/etc. This is used to build the build system when the package is checked out of CVS. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libstatgrab-0.16/NEWS new/libstatgrab-0.17/NEWS --- old/libstatgrab-0.16/NEWS 2008-03-13 12:23:43.000000000 +0100 +++ new/libstatgrab-0.17/NEWS 2010-02-21 11:05:05.000000000 +0100 @@ -1,13 +1,24 @@ libstatgrab NEWS http://www.i-scream.org/libstatgrab/ -$Id: NEWS,v 1.46 2008/03/13 11:23:43 tdb Exp $ +$Id: NEWS,v 1.48 2010/02/21 10:05:05 tdb Exp $ PLANS: We're now working towards a 1.0 release which is where we plan to stabilise the API. We'll be doing test releases before hand, but as always we'll like to hear about any bugs found in the current release. +libstatgrab 0.17 (21 February 2010) + * Provide iowait cpu information on Linux version 2.5.41 or later. + * Display data for ZFS on Solaris. + * Dynamically get list of valid filesystems on FreeBSD. + (Thanks to Baptiste Daroussin) + * Support FreeBSD 9. + * Use utmpx when available (required for FreeBSD 9). + (Thanks to Ed Schouten) + * Support larger amounts of memory on FreeBSD. + (Thanks to Tom Bird) + libstatgrab 0.16 (13 March 2008) * Fix saidar build on Solaris with Sun's compiler. * Add support for FreeBSD 8.0. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libstatgrab-0.16/config.h.in new/libstatgrab-0.17/config.h.in --- old/libstatgrab-0.16/config.h.in 2008-03-13 14:59:00.000000000 +0100 +++ new/libstatgrab-0.17/config.h.in 2010-02-21 11:09:08.000000000 +0100 @@ -15,7 +15,7 @@ /* Building on FreeBSD */ #undef FREEBSD -/* Building on FreeBSD 5.x - 8.x */ +/* Building on FreeBSD 5.x - 9.x */ #undef FREEBSD5 /* Define to 1 if you have the `atoll' function. */ @@ -91,6 +91,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* utmpx */ +#undef HAVE_UTMPX + /* Building on HP-UX 11.11 */ #undef HPUX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libstatgrab-0.16/configure.in new/libstatgrab-0.17/configure.in --- old/libstatgrab-0.16/configure.in 2008-02-16 17:11:16.000000000 +0100 +++ new/libstatgrab-0.17/configure.in 2010-02-21 11:08:51.000000000 +0100 @@ -2,16 +2,15 @@ # Process this file with autoconf to produce a configure script. # # configure.in for libstatgrab -# $Id: configure.in,v 1.96 2008/02/16 16:11:16 tdb Exp $ +# $Id: configure.in,v 1.100 2010/02/20 18:15:51 tdb Exp $ # # Change these to change the package name and version -AC_INIT(libstatgrab, 0.16, bugs@i-scream.org) -AM_INIT_AUTOMAKE(libstatgrab, 0.16) -AM_MAINTAINER_MODE +AC_INIT(libstatgrab, 0.17, bugs@i-scream.org) +AM_INIT_AUTOMAKE(libstatgrab, 0.17) # Revision number (automatically updated) -AC_REVISION($Revision: 1.96 $) +AC_REVISION($Revision: 1.100 $) # Might work with older autoconfs... but tested on 2.57 AC_PREREQ(2.57) @@ -52,6 +51,12 @@ [], [#include ]) +# FreeBSD 9 (and others) uses utmpx rather than utmp +AC_CHECK_MEMBER(struct utmpx.ut_type, + [AC_DEFINE(HAVE_UTMPX, , [utmpx])], + [], + [#include ]) + # Check for sys/loadavg.h AC_CHECK_HEADERS([sys/loadavg.h]) @@ -97,10 +102,10 @@ BIN_PERM="2755" LINKFLAGS="-lkvm -ldevstat" ;; -freebsd[[5-8]].*) +freebsd[[5-9]].*) AC_DEFINE(ALLBSD, , [Building on a BSD-derived system]) AC_DEFINE(FREEBSD, , [Building on FreeBSD]) - AC_DEFINE(FREEBSD5, , [Building on FreeBSD 5.x - 8.x]) + AC_DEFINE(FREEBSD5, , [Building on FreeBSD 5.x - 9.x]) LINKFLAGS="-ldevstat" ;; netbsdelf1*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libstatgrab-0.16/docs/libstatgrab/Makefile.am new/libstatgrab-0.17/docs/libstatgrab/Makefile.am --- old/libstatgrab-0.16/docs/libstatgrab/Makefile.am 2005-04-25 14:37:21.000000000 +0200 +++ new/libstatgrab-0.17/docs/libstatgrab/Makefile.am 2008-05-25 00:30:28.000000000 +0200 @@ -1,6 +1,6 @@ # Makefile for libstatgrab/docs/libstatgrab # http://www.i-scream.org/libstatgrab/ -# $Id: Makefile.am,v 1.1 2005/04/25 12:37:21 tdb Exp $ +# $Id: Makefile.am,v 1.2 2008/05/24 22:30:28 ats Exp $ if MANPAGES man_MANS = sg_get_cpu_stats.3 sg_get_cpu_stats_diff.3 \ @@ -16,6 +16,5 @@ EXTRA_DIST = $(man_MANS) -%.3: %.xml +.xml.3: docbook2man -N --symlinks $< - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libstatgrab-0.16/docs/saidar/Makefile.am new/libstatgrab-0.17/docs/saidar/Makefile.am --- old/libstatgrab-0.16/docs/saidar/Makefile.am 2005-11-12 00:37:17.000000000 +0100 +++ new/libstatgrab-0.17/docs/saidar/Makefile.am 2008-05-25 00:30:31.000000000 +0200 @@ -1,6 +1,6 @@ # Makefile for libstatgrab/docs/saidar # http://www.i-scream.org/libstatgrab/ -# $Id: Makefile.am,v 1.2 2005/11/11 23:37:17 tdb Exp $ +# $Id: Makefile.am,v 1.3 2008/05/24 22:30:31 ats Exp $ if MANPAGES if SAIDAR @@ -10,6 +10,6 @@ EXTRA_DIST = $(man_MANS) -%.1: %.xml +.xml.1: docbook2man -N --symlinks $< diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libstatgrab-0.16/docs/statgrab/Makefile.am new/libstatgrab-0.17/docs/statgrab/Makefile.am --- old/libstatgrab-0.16/docs/statgrab/Makefile.am 2005-11-12 00:37:20.000000000 +0100 +++ new/libstatgrab-0.17/docs/statgrab/Makefile.am 2008-05-25 00:30:32.000000000 +0200 @@ -1,6 +1,6 @@ # Makefile for libstatgrab/docs/statgrab # http://www.i-scream.org/libstatgrab/ -# $Id: Makefile.am,v 1.2 2005/11/11 23:37:20 tdb Exp $ +# $Id: Makefile.am,v 1.3 2008/05/24 22:30:32 ats Exp $ if MANPAGES if STATGRAB @@ -11,6 +11,6 @@ EXTRA_DIST = $(man_MANS) -%.1: %.xml +.xml.1: docbook2man -N --symlinks $< diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libstatgrab-0.16/src/libstatgrab/Makefile.am new/libstatgrab-0.17/src/libstatgrab/Makefile.am --- old/libstatgrab-0.16/src/libstatgrab/Makefile.am 2007-07-13 22:40:21.000000000 +0200 +++ new/libstatgrab-0.17/src/libstatgrab/Makefile.am 2010-02-20 19:17:04.000000000 +0100 @@ -1,6 +1,6 @@ # Makefile for libstatgrab/src/libstatgrab # http://www.i-scream.org/libstatgrab/ -# $Id: Makefile.am,v 1.34 2007/07/13 20:40:21 tdb Exp $ +# $Id: Makefile.am,v 1.35 2010/02/20 18:17:04 tdb Exp $ if DEPRECATED include_DEPRECATEDHEADERS = statgrab_deprecated.h @@ -8,7 +8,7 @@ include_HEADERS = statgrab.h $(include_DEPRECATEDHEADERS) lib_LTLIBRARIES = libstatgrab.la -libstatgrab_la_LDFLAGS = -version-info 8:2:2 +libstatgrab_la_LDFLAGS = -version-info 8:3:2 if DEPRECATED libstatgrab_la_DEPRECATEDSOURCES = statgrab_deprecated.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libstatgrab-0.16/src/libstatgrab/cpu_stats.c new/libstatgrab-0.17/src/libstatgrab/cpu_stats.c --- old/libstatgrab-0.16/src/libstatgrab/cpu_stats.c 2006-10-09 15:52:06.000000000 +0200 +++ new/libstatgrab-0.17/src/libstatgrab/cpu_stats.c 2008-06-17 17:52:52.000000000 +0200 @@ -17,7 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: cpu_stats.c,v 1.27 2006/10/09 13:52:06 tdb Exp $ + * $Id: cpu_stats.c,v 1.28 2008/06/17 15:52:52 tdb Exp $ */ #ifdef HAVE_CONFIG_H @@ -76,6 +76,7 @@ #endif #if defined(LINUX) || defined(CYGWIN) FILE *f; + int proc_stat_cpu; #endif #ifdef ALLBSD #if defined(NETBSD) || defined(OPENBSD) @@ -140,18 +141,26 @@ sg_set_error_with_errno(SG_ERROR_OPEN, "/proc/stat"); return NULL; } + /* The very first line should be cpu */ - if((fscanf(f, "cpu %lld %lld %lld %lld", \ + proc_stat_cpu = fscanf(f, "cpu %lld %lld %lld %lld %lld", \ &cpu_now.user, \ &cpu_now.nice, \ &cpu_now.kernel, \ - &cpu_now.idle)) != 4){ + &cpu_now.idle, \ + &cpu_now.iowait); + + fclose(f); + + if (proc_stat_cpu < 4 || proc_stat_cpu > 5) { sg_set_error(SG_ERROR_PARSE, "cpu"); - fclose(f); return NULL; } - fclose(f); + /* older linux doesn't give iowait */ + if (proc_stat_cpu == 4) { + cpu_now.iowait = 0; + } cpu_now.total=cpu_now.user+cpu_now.nice+cpu_now.kernel+cpu_now.idle; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libstatgrab-0.16/src/libstatgrab/disk_stats.c new/libstatgrab-0.17/src/libstatgrab/disk_stats.c --- old/libstatgrab-0.16/src/libstatgrab/disk_stats.c 2006-10-09 16:09:38.000000000 +0200 +++ new/libstatgrab-0.17/src/libstatgrab/disk_stats.c 2009-12-04 23:09:30.000000000 +0100 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA * 02111-1307 USA * - * $Id: disk_stats.c,v 1.85 2006/10/09 14:09:38 tdb Exp $ + * $Id: disk_stats.c,v 1.88 2009/12/04 22:09:30 tdb Exp $ */ #ifdef HAVE_CONFIG_H @@ -37,7 +37,7 @@ #include #include #include -#define VALID_FS_TYPES {"ufs", "tmpfs", "vxfs", "nfs"} +#define VALID_FS_TYPES {"ufs", "tmpfs", "vxfs", "nfs", "zfs"} #endif #if defined(LINUX) || defined(CYGWIN) @@ -66,8 +66,12 @@ #if defined(FREEBSD) || defined(DFBSD) #include #include -#define VALID_FS_TYPES {"hpfs", "msdosfs", "ntfs", "udf", "ext2fs", \ - "ufs", "mfs", "nfs"} +#include +#include +#include +/*#define VALID_FS_TYPES {"hpfs", "msdosfs", "ntfs", "udf", "ext2fs", \ + "ufs", "mfs", "nfs", "zfs", "tmpfs", "reiserfs", \ + "xfs"}*/ #endif #if defined(NETBSD) || defined(OPENBSD) #include @@ -151,14 +155,37 @@ #ifndef WIN32 /* not used by WIN32, so stop compiler throwing warnings */ static int is_valid_fs_type(const char *type) { - const char *types[] = VALID_FS_TYPES; int i; +#if defined(FREEBSD) || defined(DFBSD) + struct xvfsconf *xvfsp; + size_t buflen; + int cnt, nbvfs = 0; + + if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0) { + sg_set_error_with_errno(SG_ERROR_SYSCTLBYNAME, "vfs.conflist"); + return 0; + } + xvfsp = alloca(buflen); + if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) { + sg_set_error_with_errno(SG_ERROR_SYSCTLBYNAME, "vfs.conflist"); + return 0; + } + cnt = buflen / sizeof(struct xvfsconf); + for (i = 0; i < cnt; i++) { + if (strcmp(xvfsp[i].vfc_name, type) == 0) { + return 1; + } + } +#else + const char *types[] = VALID_FS_TYPES; + for (i = 0; i < (int) (sizeof types / sizeof *types); i++) { if (strcmp(types[i], type) == 0) { return 1; } } +#endif return 0; } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libstatgrab-0.16/src/libstatgrab/memory_stats.c new/libstatgrab-0.17/src/libstatgrab/memory_stats.c --- old/libstatgrab-0.16/src/libstatgrab/memory_stats.c 2007-06-18 22:56:22.000000000 +0200 +++ new/libstatgrab-0.17/src/libstatgrab/memory_stats.c 2010-02-21 11:04:26.000000000 +0100 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA * 02111-1307 USA * - * $Id: memory_stats.c,v 1.35 2007/06/18 20:56:22 tdb Exp $ + * $Id: memory_stats.c,v 1.36 2010/02/21 10:04:26 tdb Exp $ */ #ifdef HAVE_CONFIG_H @@ -86,9 +86,9 @@ int mib[2]; u_long physmem; size_t size; - u_int free_count; - u_int cache_count; - u_int inactive_count; + u_long free_count; + u_long cache_count; + u_long inactive_count; int pagesize; #endif #if defined(NETBSD) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libstatgrab-0.16/src/libstatgrab/user_stats.c new/libstatgrab-0.17/src/libstatgrab/user_stats.c --- old/libstatgrab-0.16/src/libstatgrab/user_stats.c 2005-09-24 15:29:23.000000000 +0200 +++ new/libstatgrab-0.17/src/libstatgrab/user_stats.c 2010-02-20 18:55:04.000000000 +0100 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA * 02111-1307 USA * - * $Id: user_stats.c,v 1.28 2005/09/24 13:29:23 tdb Exp $ + * $Id: user_stats.c,v 1.29 2010/02/20 17:55:04 tdb Exp $ */ #ifdef HAVE_CONFIG_H @@ -40,8 +40,12 @@ #include #endif #ifndef WIN32 +#ifdef HAVE_UTMPX +#include +#else #include #endif +#endif #ifdef CYGWIN #include #endif @@ -57,7 +61,7 @@ int num_users = 0, pos = 0, new_pos; VECTOR_DECLARE_STATIC(name_list, char, 128, NULL, NULL); static sg_user_stats user_stats; -#ifdef ALLBSD +#if defined(ALLBSD) && !defined(HAVE_UTMPX) struct utmp entry; FILE *f; @@ -132,10 +136,15 @@ } #else /* This works on everything else. */ +#ifdef HAVE_UTMPX + struct utmpx *entry; + setutxent(); + while((entry=getutxent()) != NULL) { +#else struct utmp *entry; - setutent(); while((entry=getutent()) != NULL) { +#endif if (entry->ut_type != USER_PROCESS) continue; new_pos = pos + strlen(entry->ut_user) + 1; @@ -148,8 +157,12 @@ pos = new_pos; num_users++; } +#ifdef HAVE_UTMPX + endutxent(); +#else endutent(); #endif +#endif /* Remove the extra space at the end, and append a \0. */ if (num_users != 0) { ++++++ saidar.desktop ++++++ --- /var/tmp/diff_new_pack.YtCTwS/_old 2012-02-27 18:35:43.000000000 +0100 +++ /var/tmp/diff_new_pack.YtCTwS/_new 2012-02-27 18:35:43.000000000 +0100 @@ -1,7 +1,6 @@ [Desktop Entry] Categories=System;Monitor; Encoding=UTF-8 -MultipleArgs=false Terminal=true Exec=saidar Type=Application ++++++ statgrab.desktop ++++++ --- /var/tmp/diff_new_pack.YtCTwS/_old 2012-02-27 18:35:43.000000000 +0100 +++ /var/tmp/diff_new_pack.YtCTwS/_new 2012-02-27 18:35:43.000000000 +0100 @@ -1,7 +1,6 @@ [Desktop Entry] Categories=System;Monitor; Encoding=UTF-8 -MultipleArgs=false Terminal=true Exec=statgrab Type=Application -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org