Released LibGTop 1.0.12 "Gerolzhofen".

2001-02-13  Martin Baulig  <baulig@suse.de>

	Released LibGTop 1.0.12 "Gerolzhofen".

	* NEWS: Added news entry to 1.0.12.

	* LIBGTOP-VERSION: Set version number to 1.0.12, binary age 11,
	interface age 11.

.cvsignore

@@ -13,6 +13,7 @@ gtopConf.sh
 i386-bsdi
 i686-pc-linux-gnu
 intl
+libgtop-0.01.tar.gz
 libgtop-mirror.sh.swp
 libgtopConf.sh
 libtool
@@ -20,7 +21,6 @@ ltconfig
 ltmain.sh
 macros
 stamp-h
-stamp-h.in
 sun4
 sun4sol2
 support
@@ -30,13 +30,7 @@ i686-pc-linux-gnu-linux
 libgtop-config
 ABOUT-NLS
 libgtop.spec
-libgtop*.tar.gz
+libgtop-0.99.*.tar.gz
+libgtop-0.99.*
 *-debstamp
-libgtop*.pc
-autom4te.cache
-COPYING
-INSTALL
-install-sh
-missing
-mkinstalldirs
-libgtopconfig.h
+libgtop-1.*.*.tar.gz

AUTHORS

@@ -1,3 +1,2 @@
 Martin Baulig (martin@home-of-linux.org)
 Drazen Kacar (dave@srce.hr)
-Benoît Dejean (tazforever@dlfp.org)

LIBGTOP-VERSION

@@ -0,0 +1,28 @@
+# Making releases:
+#   LIBGTOP_MICRO_VERSION += 1;
+#   LIBGTOP_INTERFACE_AGE += 1;
+#   LIBGTOP_BINARY_AGE += 1;
+# if any functions have been added, set LIBGTOP_INTERFACE_AGE to 0.
+# if backwards compatibility has been broken,
+# set LIBGTOP_BINARY_AGE and LIBGTOP_INTERFACE_AGE to 0.
+#
+LIBGTOP_MAJOR_VERSION=1
+LIBGTOP_MINOR_VERSION=0
+LIBGTOP_MICRO_VERSION=12
+
+LIBGTOP_INTERFACE_AGE=11
+LIBGTOP_BINARY_AGE=11
+# you can set this to `-snap' for instance to create
+# a `libgtop-1.x.y-snap.tar.gz' tarball.
+LIBGTOP_VERSION_SUFFIX=
+
+# Increase each time you change the client/server protocol.
+LIBGTOP_SERVER_VERSION=5
+
+# Don't change this
+LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
+LIBGTOP_VERSION_CODE=`echo "$LIBGTOP_MAJOR_VERSION 1000000 * $LIBGTOP_MINOR_VERSION 1000 * + $LIBGTOP_MICRO_VERSION + p q" | dc`
+
+# For automake.
+VERSION=$LIBGTOP_VERSION$LIBGTOP_VERSION_SUFFIX
+PACKAGE=libgtop

MAINTAINERS

@@ -1,3 +0,0 @@
-Email: martin@home-of-linux.org
-Email: dave@srce.hr
-Benoît Dejean (tazforever@dlfp.org)

Makefile.am

@@ -1,19 +1,88 @@
+## Process this file with automake to produce Makefile.in.
 
-SUBDIRS = po misc include sysdeps lib src examples doc
+if EXAMPLES
+examples_SUBDIRS = examples
+else
+examples_SUBDIRS =
+endif
 
-libgtopinclude_HEADERS = glibtop.h libgtopconfig.h
-libgtopincludedir = $(includedir)/libgtop-2.0
+if BUILD_GNOME_SUPPORT
+support = support
+endif
 
-EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \
-	 features.def libgtopconfig.h.in \
-	libgtop-sysdeps.m4 README \
-	 libgtop-2.0.pc.in acinclude.m4
+SUBDIRS = po intl $(support) macros misc include sysdeps lib src \
+	  $(examples_SUBDIRS) doc
+
+include_HEADERS = glibtop.h
+
+EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in \
+	LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 \
+	RELNOTES-1.0 RELNOTES-1.0.x libgtop-sysdeps.m4 README \
+	libgtop-mirror.sh
 
 dist-hook:
 	cp libgtop.spec $(distdir)
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgtop-2.0.pc
+release:
+	$(MAKE) dist distdir=$(PACKAGE)-$(VERSION)
+
+## Put `exec' in the name because this should be installed by
+## `install-exec', not `install-data'.
+confexecdir	= $(libdir)
+confexec_DATA	= $(top_builddir)/libgtopConf.sh \
+		  $(top_builddir)/libgtop-features.def
+
+CLEANFILES=libgtopConf.sh
+
+bin_SCRIPTS = $(top_builddir)/libgtop-config
+
+## to automatically rebuild aclocal.m4 if any of the macros in
+## `macros/' change
+@MAINT@ include macros/macros.dep
+@MAINT@macros/macros.dep: macros/Makefile.am
+@MAINT@	cd macros && $(MAKE) macros.dep
+
+@MAINT@$(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4 LIBGTOP-VERSION
+
+## We create libgtopConf.sh here and not from configure because we want
+## to get the paths expanded correctly.  Macros like srcdir are given
+## the value NONE in configure if the user doesn't specify them (this
+## is an autoconf feature, not a bug).
+libgtopConf.sh: libgtopConf.sh.in Makefile
+## Use sed and then mv to avoid problems if the user interrupts.
+	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
+	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)#g' \
+	  -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \
+	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
+	  -e 's#\@LIBGTOP_LIBS\@#$(LIBGTOP_LIBS)#g' \
+	  -e 's#\@LIBGTOP_INCS\@#$(LIBGTOP_INCS)#g' \
+	  -e 's#\@LIBGTOP_NAMES_LIBS\@#$(LIBGTOP_NAMES_LIBS)#g' \
+	  -e 's#\@LIBGTOP_NAMES_INCS\@#$(LIBGTOP_NAMES_INCS)#g' \
+	  -e 's#\@LIBGTOP_GUILE_LIBS\@#$(LIBGTOP_GUILE_LIBS)#g' \
+	  -e 's#\@LIBGTOP_GUILE_INCS\@#$(LIBGTOP_GUILE_INCS)#g' \
+	  -e 's#\@LIBGTOP_GUILE_NAMES_LIBS\@#$(LIBGTOP_GUILE_NAMES_LIBS)#g' \
+	  -e 's#\@LIBGTOP_GUILE_NAMES_INCS\@#$(LIBGTOP_GUILE_NAMES_INCS)#g' \
+	  -e 's#\@LIBGTOP_BINDIR\@#$(LIBGTOP_BINDIR)#g' \
+	  -e 's#\@LIBGTOP_SERVER\@#$(LIBGTOP_SERVER)#g' \
+	  -e 's#\@LIBGTOP_MAJOR_VERSION\@#$(LIBGTOP_MAJOR_VERSION)#g' \
+	  -e 's#\@LIBGTOP_MINOR_VERSION\@#$(LIBGTOP_MINOR_VERSION)#g' \
+	  -e 's#\@LIBGTOP_MICRO_VERSION\@#$(LIBGTOP_MICRO_VERSION)#g' \
+	  -e 's#\@LIBGTOP_VERSION\@#$(LIBGTOP_VERSION)#g' \
+	  -e 's#\@LIBGTOP_VERSION_CODE\@#$(LIBGTOP_VERSION_CODE)#g' \
+	  -e 's#\@LIBGTOP_SERVER_VERSION\@#$(LIBGTOP_SERVER_VERSION)#g' \
+	  -e 's#\@libgtop_sysdeps_dir\@#$(libgtop_sysdeps_dir)#g' \
+	  -e 's#\@libgtop_need_server\@#$(libgtop_need_server)#g' \
+	  -e 's#\@libgtop_use_machine_h\@#$(libgtop_use_machine_h)#g' \
+	  -e 's#\@libgtop_guile_found\@#$(libgtop_guile_found)#g' \
+	  -e 's#\@libgtop_want_examples\@#$(libgtop_want_examples)#g' \
+	      < $(srcdir)/libgtopConf.sh.in > libgtopConf.tmp \
+	  && mv libgtopConf.tmp libgtopConf.sh
+
+libgtop-config: libgtop-config.in Makefile
+	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
+	      < $(srcdir)/libgtop-config.in > libgtop-config.tmp \
+	  && mv libgtop-config.tmp libgtop-config && \
+		chmod 755 libgtop-config
 
 libgtop-features.def: features.def
 	@LN_S@ $< $@

NEWS

@@ -1,151 +1,3 @@
-November 29, 2005: Overview of changes from 2.12.0 to 2.12.1
-============================================================
-* Dropped dead files
-* linux: 1-line cleanup.
-
-September 4, 2005: Overview of changes from 2.11.92 to 2.12.0
-=============================================================
-* Updated translations.
-
-August 22, 2005: Overview of changes from 2.11.91 to 2.11.92
-============================================================
-* Linux:
-  - fixed for 2.6 without /sys
-  - glibtop_get_cpu() : Do not add irq, softirq and iowait to idle.
-
-August 9, 2005: Overview of changes from 2.11.90 to 2.11.91
-===========================================================
-* All:
-  - cleaned some headers.
-  - removed static examples.
-* Linux:
-  - fixed some issues with 2.6 without /sys
-
-July 24, 2005: Overview of changes from 2.11.2 to 2.11.90
-=========================================================
-* Linux:
-  - fixed glibtop_uptime .flags.
-
-July &3, 2005: Overview of changes from 2.11.1 to 2.11.2
-========================================================
-* Linux:
-  - little improvements for 2.6.
-
-July 3, 2005: Overview of changes from 2.11.0 to 2.11.1
-=======================================================
-* Linux:
-  - glibtop_get_swap : added page(in|out) for linux 2.6.
-
-June 8, 2005: Overview of changes from 2.10.x to 2.11.0
-=======================================================
-* Replaced a lot of macros by functions
-* Got rid of dozens of useless files.
-* libgtop 2.11.x are and will stay API and ABI compatible with 2.10.x, i swear.
-
-April 10, 2005: Overview of changes from 2.10.0 to 2.10.1
-=========================================================
-* Updated i18n.
-* Little cleanup and fixed gcc-4.0 compilation.
-* linux: fixed loadavg and uptime if locale != C.
-  Updated siglist.
-* Tighter libgtop-2.0.pc.
-
-Mars 7, 2005: Overview of Changes from 2.9.92 to 2.10.0
-=======================================================
-* Updated i18n.
-
-February 28, 2005: Overview of Changes from 2.9.90 to 2.9.92
-============================================================
-* *BSD updated by marcus@freebsd.org (Joe Marcus Clarke).
-* Removed a lot of dead files :)
-* Don't build&install libgtop_daemon when it's never used.
-
-February 6, 2004: Overview of Changes from 2.9.90 to 2.9.91
-==========================================================
-* Fixed typo in stub.
-* Updated i18n.
-
-January 24, 2004: Overview of Changes from 2.9.4 to 2.9.90
-==========================================================
-* Updated Linux support.
-
-January 10, 2004: Overview of Changes from 2.9.3 to 2.9.4
-=========================================================
-* New glibtop_proc_open_files nick@reloco.com.ar (Nicolás Lichtmaier).
-* Updated AIX support (Christophe Belle).
-
-December 20, 2004: Overview of Changes from 2.9.0 to 2.9.3
-==========================================================
-* Removed libgtop_names.
-* Fixed Argument passing between library and server. #139809.
-* *BSD updated by marcus@freebsd.org (Joe Marcus Clarke).
-* glibtop_get_mountlist(False) now ignores 'unknown' fs.
-
-
-November 30, 2004: Overview of Changes from 2.8.1 to 2.9.0
-=========================================================
-* glibtop_get_netload : Fixed segfault on linux with ppp devices.
-* NEW glibtop_get_netlist : retrieves the list of all available interfaces.
-* NEW LIBGTOP_CHECK_VERSION(major, minor, micro)
-* Removed dead kernel patch and implementation.
-* Cleanups on Linux and Solaris.
-
-October 11, 2004: Overview of Changes from 2.8.0 to 2.8.1
-=========================================================
-* Improved Solaris and AIX support.
-
-
-August 13, 2004: Overview of Changes from 2.7.92 to 2.8.0
-=========================================================
-* No changes
-
-
-August 30, 2004:
-===============
-* Applied some *BSD patches.
-* Removed old files.
-
-
-August 15, 2004:
-===============
-* Fixed compilation with C89-only compilers and old libc.
-
-
-August 3, 2004:
-==============
-* Some cleanups.
-* Fixed the behaviour of some linux proc_*() functions.
-* Updated the documentation.
-
-
-July 19, 2004: Overview of Changes from 2.6.1 to 2.7.4
-======================================================
-* Plenty of code cleanups. Uninlined a lot of functions. ~5-10KB object size
-  reduction.
-* Glibify a bit more.
-* API changes:
- - glibtop_fsusage provides total read and writes since boot_time.
- - glibtop_netload provides hardware address. IPv6 enable.
- - Added glibtop_get_proc_argv.
-
-Work in progress :
-* Finish glibtop_fsusage implementation for Linux.
-* Some fuctions don't conform to the documentation, e.g. proctime.
-
-March 11, 2004:
-===============
-
-* Released LibGTop 2.5.99 "Gross Work", dedicated to people who do push-ups
-  in the loos.
-
-  - plenty of code cleanups
-
-  - removed the dependency on libgnome, only glib required now
-
-  - Linux 2.6 support, NetBSD support and better FreeBSD support
-
-  - Make the block size available for filesystem statistics
-
 February 27, 2001:
 =================
 

README

@@ -1,20 +1,8 @@
+$Id$
+
 LATEST NEWS:
 ===========
 
 Please look also in the file 'NEWS' for latest news.
  
 Martin
-
-
-ChangeLogs:
-==========
-
-LibGTop has many ChangeLogs files. The following files are the the
-most important :
-
-- ChangeLog is the main ChangeLog.
-- sysdeps/<arch>/ChangeLog is the ChangeLog for arch specific changes.
-- sysdeps/common/ChangeLog is the ChangeLog for common changes (shared
-  implementation between archs).
-
-Benoît

RELNOTES-0.25

@@ -0,0 +1,146 @@
+RELEASE NOTES FOR LIBGTOP 0.25 STABLE
+=====================================
+
+OVERVIEW
+--------
+
+LibGTop is a library that read information about processes and the running
+systems. This information include:
+
+General System Information
+
+cpu		- CPU Usage
+mem		- Memory Usage
+swap		- Swap Usage (including paging activity)
+loadavg		- Load average (including nr_running, nr_tasks, last_pid)
+uptime		- Uptime and Idle time, can be calculated from CPU usage
+
+SYS V IPC Limits:
+
+shm_limits	- Shared Memory Limits
+msg_limits	- Message Queue Limits
+sem_limits	- Semaphore Set Limits
+
+Process List:
+
+proclist	- List of processes
+
+Process information:
+
+proc_state	- cmd, state, uid, gid
+proc_uid	- uid,euid,gid,egid,pid,ppid,pgrp
+		  session,tty,tpgid,priority,nice
+proc_mem	- size,vsize,resident,share,rss,rss_rlim
+proc_time	- start_time,rtime,utime,stime,cutime,cstime
+		  timeout,it_real_value,frequency
+proc_signal	- signal,blocked,sigignore,sigcatch
+proc_kernel	- k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt
+		  kstk_esp,kstk_eip,nwchan,wchan
+proc_segment	- text_rss,shlib_rss,data_rss,stack_rss,dirty_size
+		  start_code,end_code,start_stack
+
+Process maps:
+
+proc_map	- Process map (/proc/<pid>/maps under Linux)
+
+File system usage:
+
+mountlist	- List of currently mounted filesystems
+fsusage		- File system usage
+
+PORTABILITY:
+-----------
+
+LibGtop is designed to be as portable as possible. None of the functions
+and retrieved information should be specific to a specific operating
+system. So you only need to port the system dependent part of the library
+to a new system and all application programs can then use libgtop on this
+new system.
+
+CLIENT/SERVER MODEL:
+-------------------
+
+Some systems like DEC OSF/1 or BSD require special priviledges for the calling
+proces to fetch the required information (SUID root/SGID kmem). To solve this
+problem, I designed a client/server model which makes a call to a SUID/SGID
+server which fetches the required information whenever it is required. This
+server is only called for features that really require priviledges, otherwise
+the sysdeps code is called directory (every user can get the CPU usage on
+DEC OSF/1, but only root can get information about processes other than the
+current one).
+
+There is also some kind of daemon which can be used to fetch information from
+remote systems (still experimental). This daemon normally runs as nobody and
+calls the SUID/SGID itself when needed.
+
+GNOME APPLETS:
+--------------
+
+There are some applets and applications which already use LibGTop. They can
+be found in the `libgtop-apps' module in the GNOME CVS tree:
+
+* Applets:  cpuload, cpumemusage - they need LibGTop to get their information
+                                   on all systems other than Linux.
+
+* Applets:  diskusage - just uses the mountlist/fsusage features of LibGTop,
+                        the one in gnome-core also works on other systems.
+
+* Applets:  multiload - I enhanced the cpuload applet a little bit, it is
+                        now a multi applet and can display CPU, Memory and
+                        Swap usages.
+
+GTOP:
+----
+
+This cool GNOME app has been ported to use LibGTop. It can be found in
+`libgtop-apps/gtop' in the GNOME CVS tree.
+
+You can now use nearly the full functionality of GTop on FreeBSD !
+
+
+PLATTFORM SPECIFIC NOTES FOR LINUX:
+==================================
+
+Under Linux, LibGTop should work without problems and read everything
+from /proc.
+
+There is also an experimental kernel interface to read this information
+directly from the kernel with a system call - but this is still experimental
+and not well tested while I made this release.
+
+PLATTFORM SPECIFIC NOTES FOR FREEBSD:
+====================================
+
+LibGTop should now work under FreeBSD and give you the full functionality
+of GTop.
+
+There are a few caveats:
+
+* You need to manually make the `$(prefix)/bin/libgtop_server' SGID to kmem
+  after installation and mount the /proc filesystem of FreeBSD
+  (/proc/<pid>/mem is used withing kvm_uread ()).
+
+* To get the filenames of the process maps displayed in GTop, you need to
+  configure with the `--with-libgtop-inodedb' option (you need GDBM for this
+  to work).
+
+* You have then to create an inode database which is used to look up to
+  filenames. This is done using the `mkinodedb' program which comes along
+  with libgtop.
+
+  See the file src/inodedb/README for details:
+
+  The `mkinodedb' program which is build in this directory takes two
+  command line arguments: the full pathname of the database to be created
+  and the name of a configuration file consisting of directory and file names
+  each on a line by itself - see `/etc/ld.so.conf' for an example.
+
+  Putting a directory name in this file means all regular files found in this
+  directory are included in the database, but it will not recursively descend
+  into subdirectories (for instance, we want everythink in `/usr/lib' but not
+  every single file in `/usr/lib/sgml'). You can also use filenames to include
+  a single file.
+
+Have fun,
+
+Martin <martin@home-of-linux.org>

RELNOTES-1.0

@@ -0,0 +1,163 @@
+RELEASE NOTES FOR LIBGTOP 1.0 STABLE
+====================================
+
+OVERVIEW
+--------
+
+LibGTop is a library that read information about processes and the
+running systems. This information include:
+
+General System Information:
+
+cpu		- CPU Usage
+mem		- Memory Usage
+swap		- Swap Usage (including paging activity)
+loadavg		- Load average (including nr_running, nr_tasks, last_pid)
+uptime		- Uptime and Idle time, can be calculated from CPU usage
+
+SYS V IPC Limits:
+
+shm_limits	- Shared Memory Limits
+msg_limits	- Message Queue Limits
+sem_limits	- Semaphore Set Limits
+
+Network:
+
+netload		- Network load
+ppp		- PPP statistics
+
+Process List:
+
+proclist	- List of processes
+
+Process information:
+
+proc_state	- cmd, state, uid, gid
+proc_uid	- uid,euid,gid,egid,pid,ppid,pgrp
+		  session,tty,tpgid,priority,nice
+proc_mem	- size,vsize,resident,share,rss,rss_rlim
+proc_time	- start_time,rtime,utime,stime,cutime,cstime
+		  timeout,it_real_value,frequency
+proc_signal	- signal,blocked,sigignore,sigcatch
+proc_kernel	- k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt
+		  kstk_esp,kstk_eip,nwchan,wchan
+proc_segment	- text_rss,shlib_rss,data_rss,stack_rss,dirty_size
+		  start_code,end_code,start_stack
+
+Process maps:
+
+proc_args	- Command line arguments
+proc_map	- Process map (/proc/<pid>/maps under Linux)
+
+File system usage:
+
+mountlist	- List of currently mounted filesystems
+fsusage		- File system usage
+
+PORTABILITY:
+-----------
+
+LibGTop is designed to be as portable as possible. None of the
+functions and retrieved information should be specific to a specific
+operating system. So you only need to port the system dependent part
+of the library to a new system and all application programs can then
+use libgtop on this new system.
+
+CLIENT/SERVER MODEL:
+-------------------
+
+Some systems like DEC OSF/1 or BSD require special privileges for the
+calling process to fetch the required information (SUID root/SGID
+kmem). To solve this problem, I designed a client/server model which
+makes a call to a SUID/SGID server which fetches the required
+information whenever it is required. This server is only called for
+features that really require privileges, otherwise the sysdeps code
+is called directory (every user can get the CPU usage on DEC OSF/1,
+but only root can get information about processes other than the
+current one).
+
+There is also some kind of daemon which can be used to fetch
+information from remote systems (still experimental). This daemon
+normally runs as nobody and calls the SUID/SGID itself when needed.
+
+LIBGTOP AND GNOME:
+-----------------
+
+LibGTop is currently used in various places in the GNOME Project,
+for instance in some of the applets in gnome-core and - of cause -
+this ultra-cool application called GTop ...
+
+Although LibGTop is not specific to GNOME and under GPL license, I
+spent most my time during the last months to work in the GNOME project
+so this is the primary use for LibGTop (and currently the only one).
+
+However, you can also give its configure.in script the `--without-gnome'
+parameter and then use it fully without GNOME in your own applications.
+
+LIBGTOP AND GNOME - PART II:
+---------------------------
+
+LibGTop was tested with FreeBSD 3.0 but it should also work with
+FreeBSD 2.2.7, NetBSD and OpenBSD.
+
+Currently my primary aim is to help the GNOME people with our 1.0 release
+so I won't have much time to test it with any other system than Linux.
+
+However, I consider FreeBSD, NetBSD and OpenBSD as supported systems for
+LibGTop and whenever I get bug reports I will do my best to fix them as
+quickly as possible.
+
+PLATFORM SPECIFIC NOTES FOR LINUX:
+==================================
+
+Under Linux, LibGTop should work without problems and read everything
+from /proc.
+
+LibGTop 0.25 also had an experimental kernel interface to read this
+information directly from the kernel with a system call - but I have
+currently dropped support for this as I am too busy with GNOME
+development to keep current with kernel hacking.
+
+PLATFORM SPECIFIC NOTES FOR SOLARIS:
+====================================
+
+Since so many people were asking me about this:
+
+LibGTop currently does not have any support for Solaris, and it will
+never have until some volunteer writes the code for it. I can't do this
+myself since I do not have any machine to test it on.
+
+PLATFORM SPECIFIC NOTES FOR BSD:
+=================================
+
+There are a few caveats:
+
+* You need to manually make the `$(prefix)/bin/libgtop_server' SGID to
+  kmem after installation and mount the /proc file system of FreeBSD
+  (/proc/<pid>/mem is used within kvm_uread ()).
+
+* To get the filenames of the process maps displayed in GTop, you need
+  to configure with the `--with-libgtop-inodedb' option (you need GDBM
+  for this to work).
+
+  You have then to create an inode database which is used to look up
+  filenames. This is done using the `mkinodedb' program which comes
+  along with libgtop.
+
+  See the file src/inodedb/README for details:
+
+  The `mkinodedb' program which is build in this directory takes two
+  command line arguments: the full pathname of the database to be
+  created and the name of a configuration file consisting of directory
+  and file names each on a line by itself - see `/etc/ld.so.conf' for
+  an example.
+
+  Putting a directory name in this file means all regular files found
+  in this directory are included in the database, but it will not
+  recursively descend into subdirectories (for instance, we want
+  everything in `/usr/lib' but not every single file in `/usr/lib/sgml').
+  You can also use filenames to include a single file.
+
+Have fun,
+
+Martin <martin@home-of-linux.org>

RELNOTES-1.0.x

@@ -0,0 +1,172 @@
+RELEASE NOTES FOR LIBGTOP 1.0.7
+===============================
+
+OVERVIEW
+--------
+
+LibGTop is a library that read information about processes and the
+running systems. This information include:
+
+General System Information:
+
+cpu		- CPU Usage
+mem		- Memory Usage
+swap		- Swap Usage (including paging activity)
+loadavg		- Load average (including nr_running, nr_tasks, last_pid)
+uptime		- Uptime and Idle time, can be calculated from CPU usage
+
+SYS V IPC Limits:
+
+shm_limits	- Shared Memory Limits
+msg_limits	- Message Queue Limits
+sem_limits	- Semaphore Set Limits
+
+Network:
+
+netload		- Network load
+ppp		- PPP statistics
+
+Process List:
+
+proclist	- List of processes
+
+Process information:
+
+proc_state	- cmd, state, uid, gid
+proc_uid	- uid,euid,gid,egid,pid,ppid,pgrp
+		  session,tty,tpgid,priority,nice
+proc_mem	- size,vsize,resident,share,rss,rss_rlim
+proc_time	- start_time,rtime,utime,stime,cutime,cstime
+		  timeout,it_real_value,frequency
+proc_signal	- signal,blocked,sigignore,sigcatch
+proc_kernel	- k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt
+		  kstk_esp,kstk_eip,nwchan,wchan
+proc_segment	- text_rss,shlib_rss,data_rss,stack_rss,dirty_size
+		  start_code,end_code,start_stack
+
+Process maps:
+
+proc_args	- Command line arguments
+proc_map	- Process map (/proc/<pid>/maps under Linux)
+
+File system usage:
+
+mountlist	- List of currently mounted filesystems
+fsusage		- File system usage
+
+PORTABILITY:
+-----------
+
+LibGTop is designed to be as portable as possible. None of the
+functions and retrieved information should be specific to a specific
+operating system. So you only need to port the system dependent part
+of the library to a new system and all application programs can then
+use libgtop on this new system.
+
+CLIENT/SERVER MODEL:
+-------------------
+
+Some systems like DEC OSF/1 or BSD require special privileges for the
+calling process to fetch the required information (SUID root/SGID
+kmem). To solve this problem, I designed a client/server model which
+makes a call to a SUID/SGID server which fetches the required
+information whenever it is required. This server is only called for
+features that really require privileges, otherwise the sysdeps code
+is called directory (every user can get the CPU usage on DEC OSF/1,
+but only root can get information about processes other than the
+current one).
+
+There is also some kind of daemon which can be used to fetch
+information from remote systems (still experimental). This daemon
+normally runs as nobody and calls the SUID/SGID itself when needed.
+
+LIBGTOP AND GNOME:
+-----------------
+
+Although LibGTop is part of the GNOME desktop environment, its main
+interface is totally independent from any particular desktop environment,
+so you can also use it as a standalone library in any piece of GPLed
+software which makes it also a valuable part of the GNU project.
+
+LibGTop is currently used in various places in the GNOME Project,
+for instance in some of the applets in gnome-core and - of cause -
+this ultra-cool application called GTop ...
+
+However, you need to give the configure.in script the `--without-gnome'
+parameter when you want to use LibGTop without GNOME (this is because,
+if you want to use it with GNOME, you need to compile it after the main
+GNOME libraries and I wanted to avoid getting unnecessary bug reports
+about this).
+
+LIBGTOP AND GNOME - PART II:
+---------------------------
+
+LibGTop was tested with FreeBSD 3.0 but it should also work with
+FreeBSD 2.2.7, NetBSD and OpenBSD.
+
+Unfortunately, I don't have the power and disk space to install all
+possible operating systems out there on my machine and test things myself,
+so I depend on people telling me whether it works and sending me bug
+reports and patches if not.
+
+However, I consider FreeBSD, NetBSD and OpenBSD as supported systems for
+LibGTop and whenever I get bug reports I will do my best to fix them as
+quickly as possible.
+
+PLATFORM SPECIFIC NOTES FOR LINUX:
+==================================
+
+[I am speaking of the Linux kernel here.]
+
+Under Linux, LibGTop should work without problems and read everything
+from /proc.
+
+LibGTop 0.25 also had an experimental kernel interface to read this
+information directly from the kernel with a system call - but I have
+currently dropped support for this as I am too busy with GNOME
+development to keep current with kernel hacking.
+
+PLATFORM SPECIFIC NOTES FOR SOLARIS:
+====================================
+
+The development branch of LibGTop (the 1.1.x series) has a first version
+of the Solaris port which works at least on Solaris 7.
+
+If you are on a Solaris system and want to give it a try, just fetch the
+latest 1.1.x tarball from ftp://ftp.home-of-linux.org/pub/libgtop/1.1/
+and try it out.
+
+PLATFORM SPECIFIC NOTES FOR BSD:
+=================================
+
+There are a few caveats:
+
+* You need to manually make the `$(prefix)/bin/libgtop_server' SGID to
+  kmem after installation and mount the /proc file system of FreeBSD
+  (/proc/<pid>/mem is used within kvm_uread ()).
+
+* To get the filenames of the process maps displayed in GTop, you need
+  to configure with the `--with-libgtop-inodedb' option (you need GDBM
+  for this to work).
+
+  You have then to create an inode database which is used to look up
+  filenames. This is done using the `mkinodedb' program which comes
+  along with libgtop.
+
+  See the file src/inodedb/README for details:
+
+  The `mkinodedb' program which is build in this directory takes two
+  command line arguments: the full pathname of the database to be
+  created and the name of a configuration file consisting of directory
+  and file names each on a line by itself - see `/etc/ld.so.conf' for
+  an example.
+
+  Putting a directory name in this file means all regular files found
+  in this directory are included in the database, but it will not
+  recursively descend into subdirectories (for instance, we want
+  everything in `/usr/lib' but not every single file in `/usr/lib/sgml').
+  You can also use filenames to include a single file.
+
+Have fun,
+
+Martin <martin@home-of-linux.org>

acconfig.h

@@ -18,7 +18,6 @@
 
 #undef ENABLE_NLS
 #undef HAVE_CATGETS
-#undef GETTEXT_PACKAGE
 #undef HAVE_GETTEXT
 #undef HAVE_LC_MESSAGES
 #undef HAVE_STPCPY
@@ -126,11 +125,12 @@
 #undef HAVE_GUILE
 
 #undef ssize_t
-#undef guint64
+#undef u_int64_t
 #undef int64_t
 
 #undef HAVE_GLIBTOP_MACHINE_H
 
+#undef GLIBTOP_NAMES
 #undef GLIBTOP_GUILE
 #undef GLIBTOP_GUILE_NAMES
 #undef GLIBTOP_EXAMPLES
@@ -138,6 +138,7 @@
 
 #undef NEED_LIBGTOP
 
+#undef HAVE_LINUX_TABLE
 #undef HAVE_LIBGTOP_SMP
 
 #undef HAVE_XAUTH

acinclude.m4

@@ -1,754 +0,0 @@
-dnl This is just copied m4s from need-declaration.m4 gnome-fileutils.m4
-dnl gnome-supprt-checks.m4 and a little from gnome-libgtop-check.m4
-dnl and finally libgtop-sysdeps.m4
-
-dnl
-dnl LIBGTOP_CHECK_TYPE
-dnl
-dnl Improved version of AC_CHECK_TYPE which takes into account
-dnl that we need to #include some other header files on some
-dnl systems to get some types.
-
-dnl AC_LIBGTOP_CHECK_TYPE(TYPE, DEFAULT)
-AC_DEFUN([AC_LIBGTOP_CHECK_TYPE],
-[AC_REQUIRE([AC_HEADER_STDC])dnl
-AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL(ac_cv_type_$1,
-[AC_EGREP_CPP(dnl
-changequote(<<,>>)dnl
-<<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl
-changequote([,]), [#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-
-/* For Tru64 */
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
-AC_MSG_RESULT($ac_cv_type_$1)
-if test $ac_cv_type_$1 = no; then
-  AC_DEFINE($1, $2)
-fi
-])
-
-dnl
-dnl GNOME_LIBGTOP_TYPES
-dnl
-dnl some typechecks for libgtop.
-dnl
-
-AC_DEFUN([GNOME_LIBGTOP_TYPES],
-[
-        AC_CHECK_HEADERS(sys/bitypes.h)
-])
-
-dnl See whether we need a declaration for a function.
-dnl GCC_NEED_DECLARATION(FUNCTION [, EXTRA-HEADER-FILES])
-AC_DEFUN([GCC_NEED_DECLARATION],
-[AC_MSG_CHECKING([whether $1 must be declared])
-AC_CACHE_VAL(gcc_cv_decl_needed_$1,
-[AC_TRY_COMPILE([
-#include <stdio.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-$2],
-[char *(*pfn) = (char *(*)) $1],
-eval "gcc_cv_decl_needed_$1=no", eval "gcc_cv_decl_needed_$1=yes")])
-if eval "test \"`echo '$gcc_cv_decl_needed_'$1`\" = yes"; then
-  AC_MSG_RESULT(yes)
-  gcc_need_declarations="$gcc_need_declarations $1"
-  gcc_tr_decl=NEED_DECLARATION_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  AC_DEFINE_UNQUOTED($gcc_tr_decl)
-else
-  AC_MSG_RESULT(no)
-fi
-])dnl
-
-dnl Check multiple functions to see whether each needs a declaration.
-dnl GCC_NEED_DECLARATIONS(FUNCTION... [, EXTRA-HEADER-FILES])
-AC_DEFUN([GCC_NEED_DECLARATIONS],
-[for ac_func in $1
-do
-GCC_NEED_DECLARATION($ac_func, $2)
-done
-]
-)
-
-dnl
-dnl GNOME_FILEUTILS_CHECKS
-dnl
-dnl checks that are needed for the diskusage applet.
-dnl
-
-AC_DEFUN([GNOME_FILEUTILS_CHECKS],
-[
-AC_CHECK_HEADERS(fcntl.h sys/param.h sys/statfs.h sys/fstyp.h \
-mnttab.h mntent.h sys/statvfs.h sys/vfs.h sys/mount.h \
-sys/filsys.h sys/fs_types.h sys/fs/s5param.h)
-
-AC_CHECK_FUNCS(bcopy endgrent endpwent fchdir ftime ftruncate \
-getcwd getmntinfo gettimeofday isascii lchown \
-listmntent memcpy mkfifo strchr strerror strrchr vprintf)
-
-dnl Set some defaults when cross-compiling
-
-if test x$cross_compiling = xyes ; then
-        case "$host_os" in
-        linux*)
-          fu_cv_sys_mounted_getmntent1=yes
-          fu_cv_sys_stat_statfs2_bsize=yes
-          ;;
-        sunos*)
-          fu_cv_sys_stat_statfs4=yes
-          ;;
-        freebsd*)
-          fu_cv_sys_stat_statfs2_bsize=yes
-          ;;
-        osf*)
-          fu_cv_sys_stat_statfs3_osf1=yes
-          ;;
-        esac
-fi
-
-# Determine how to get the list of mounted filesystems.
-list_mounted_fs=
-
-# If the getmntent function is available but not in the standard library,
-# make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX).
-AC_FUNC_GETMNTENT
-
-# This test must precede the ones for getmntent because Unicos-9 is
-# reported to have the getmntent function, but its support is incompatible
-# with other getmntent implementations.
-
-# NOTE: Normally, I wouldn't use a check for system type as I've done for
-# `CRAY' below since that goes against the whole autoconf philosophy.  But
-# I think there is too great a chance that some non-Cray system has a
-# function named listmntent to risk the false positive.
-
-if test -z "$list_mounted_fs"; then
-# Cray UNICOS 9
-AC_MSG_CHECKING([for listmntent of Cray/Unicos-9])
-AC_CACHE_VAL(fu_cv_sys_mounted_cray_listmntent,
-[fu_cv_sys_mounted_cray_listmntent=no
-AC_EGREP_CPP(yes,
-[#ifdef _CRAY
-yes
-#endif
-], [test $ac_cv_func_listmntent = yes \
-&& fu_cv_sys_mounted_cray_listmntent=yes]
-)
-]
-)
-AC_MSG_RESULT($fu_cv_sys_mounted_cray_listmntent)
-if test $fu_cv_sys_mounted_cray_listmntent = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_LISTMNTENT)
-fi
-fi
-
-if test $ac_cv_func_getmntent = yes; then
-
-# This system has the getmntent function.
-# Determine whether it's the one-argument variant or the two-argument one.
-
-if test -z "$list_mounted_fs"; then
-# 4.3BSD, SunOS, HP-UX, Dynix, Irix
-AC_MSG_CHECKING([for one-argument getmntent function])
-AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1,
-[test $ac_cv_header_mntent_h = yes \
-&& fu_cv_sys_mounted_getmntent1=yes \
-|| fu_cv_sys_mounted_getmntent1=no])
-AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1)
-if test $fu_cv_sys_mounted_getmntent1 = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTENT1)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-# SVR4
-AC_MSG_CHECKING([for two-argument getmntent function])
-AC_CACHE_VAL(fu_cv_sys_mounted_getmntent2,
-[AC_EGREP_HEADER(getmntent, sys/mnttab.h,
-fu_cv_sys_mounted_getmntent2=yes,
-fu_cv_sys_mounted_getmntent2=no)])
-AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2)
-if test $fu_cv_sys_mounted_getmntent2 = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTENT2)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
-fi
-
-fi
-
-if test -z "$list_mounted_fs"; then
-# DEC Alpha running OSF/1.
-AC_MSG_CHECKING([for getfsstat function])
-AC_CACHE_VAL(fu_cv_sys_mounted_getsstat,
-[AC_TRY_LINK([
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <sys/fs_types.h>],
-[struct statfs *stats;
-int numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ],
-fu_cv_sys_mounted_getsstat=yes,
-fu_cv_sys_mounted_getsstat=no)])
-AC_MSG_RESULT($fu_cv_sys_mounted_getsstat)
-if test $fu_cv_sys_mounted_getsstat = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETFSSTAT)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-# AIX.
-AC_MSG_CHECKING([for mntctl function and struct vmount])
-AC_CACHE_VAL(fu_cv_sys_mounted_vmount,
-[AC_TRY_CPP([#include <fshelp.h>],
-fu_cv_sys_mounted_vmount=yes,
-fu_cv_sys_mounted_vmount=no)])
-AC_MSG_RESULT($fu_cv_sys_mounted_vmount)
-if test $fu_cv_sys_mounted_vmount = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_VMOUNT)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-# SVR3
-AC_MSG_CHECKING([for FIXME existence of three headers])
-AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp,
-[AC_TRY_CPP([
-#include <sys/statfs.h>
-#include <sys/fstyp.h>
-#include <mnttab.h>],
-fu_cv_sys_mounted_fread_fstyp=yes,
-fu_cv_sys_mounted_fread_fstyp=no)])
-AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp)
-if test $fu_cv_sys_mounted_fread_fstyp = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_FREAD_FSTYP)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-# 4.4BSD and DEC OSF/1.
-AC_MSG_CHECKING([for getmntinfo function])
-AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo,
-[
-ok=
-if test $ac_cv_func_getmntinfo = yes; then
-AC_EGREP_HEADER(f_type;, sys/mount.h,
-ok=yes)
-fi
-test -n "$ok" \
-&& fu_cv_sys_mounted_getmntinfo=yes \
-|| fu_cv_sys_mounted_getmntinfo=no
-])
-AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo)
-if test $fu_cv_sys_mounted_getmntinfo = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTINFO)
-fi
-fi
-
-# FIXME: add a test for netbsd-1.1 here
-
-if test -z "$list_mounted_fs"; then
-# Ultrix
-AC_MSG_CHECKING([for getmnt function])
-AC_CACHE_VAL(fu_cv_sys_mounted_getmnt,
-[AC_TRY_CPP([
-#include <sys/fs_types.h>
-#include <sys/mount.h>],
-fu_cv_sys_mounted_getmnt=yes,
-fu_cv_sys_mounted_getmnt=no)])
-AC_MSG_RESULT($fu_cv_sys_mounted_getmnt)
-if test $fu_cv_sys_mounted_getmnt = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNT)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-# SVR2
-AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab])
-AC_CACHE_VAL(fu_cv_sys_mounted_fread,
-[AC_TRY_CPP([#include <mnttab.h>],
-fu_cv_sys_mounted_fread=yes,
-fu_cv_sys_mounted_fread=no)])
-AC_MSG_RESULT($fu_cv_sys_mounted_fread)
-if test $fu_cv_sys_mounted_fread = yes; then
-list_mounted_fs=found
-AC_DEFINE(MOUNTED_FREAD)
-fi
-fi
-
-if test -z "$list_mounted_fs"; then
-AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
-# FIXME -- no need to abort building the whole package
-# Cannot build mountlist.c or anything that needs its functions
-fi
-
-AC_CHECKING(how to get filesystem space usage)
-space=no
-
-# Perform only the link test since it seems there are no variants of the
-# statvfs function.  This check is more than just AC_CHECK_FUNCS(statvfs)
-# because that got a false positive on SCO OSR5.  Adding the declaration
-# of a `struct statvfs' causes this test to fail (as it should) on such
-# systems.  That system is reported to work fine with STAT_STATFS4 which
-# is what it gets when this test fails.
-if test $space = no; then
-# SVR4
-AC_CACHE_CHECK([statvfs function (SVR4)], fu_cv_sys_stat_statvfs,
-[AC_TRY_LINK([#include <sys/types.h>
-#include <sys/statvfs.h>],
-[struct statvfs fsd; statvfs (0, &fsd);],
-fu_cv_sys_stat_statvfs=yes,
-fu_cv_sys_stat_statvfs=no)])
-if test $fu_cv_sys_stat_statvfs = yes; then
-space=yes
-AC_DEFINE(STAT_STATVFS)
-fi
-fi
-
-if test $space = no; then
-# DEC Alpha running OSF/1
-AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)])
-AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1,
-[AC_TRY_RUN([
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-int main ()
-{
-struct statfs fsd;
-fsd.f_fsize = 0;
-return (statfs (".", &fsd, sizeof (struct statfs)));
-}],
-fu_cv_sys_stat_statfs3_osf1=yes,
-fu_cv_sys_stat_statfs3_osf1=no,
-fu_cv_sys_stat_statfs3_osf1=no)])
-AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
-if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
-space=yes
-AC_DEFINE(STAT_STATFS3_OSF1)
-fi
-fi
-
-if test $space = no; then
-# AIX
-AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl
-member (AIX, 4.3BSD)])
-AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize,
-[AC_TRY_RUN([
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_VFS_H
-#include <sys/vfs.h>
-#endif
-int main ()
-{
-struct statfs fsd;
-fsd.f_bsize = 0;
-return (statfs (".", &fsd));
-}],
-fu_cv_sys_stat_statfs2_bsize=yes,
-fu_cv_sys_stat_statfs2_bsize=no,
-fu_cv_sys_stat_statfs2_bsize=no)])
-AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
-if test $fu_cv_sys_stat_statfs2_bsize = yes; then
-space=yes
-AC_DEFINE(STAT_STATFS2_BSIZE)
-fi
-fi
-
-if test $space = no; then
-# SVR3
-AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)])
-AC_CACHE_VAL(fu_cv_sys_stat_statfs4,
-[AC_TRY_RUN([#include <sys/types.h>
-#include <sys/statfs.h>
-int main ()
-{
-struct statfs fsd;
-return (statfs (".", &fsd, sizeof fsd, 0));
-}],
-fu_cv_sys_stat_statfs4=yes,
-fu_cv_sys_stat_statfs4=no,
-fu_cv_sys_stat_statfs4=no)])
-AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
-if test $fu_cv_sys_stat_statfs4 = yes; then
-space=yes
-AC_DEFINE(STAT_STATFS4)
-fi
-fi
-
-if test $space = no; then
-# 4.4BSD and NetBSD
-AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl
-member (4.4BSD and NetBSD)])
-AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize,
-[AC_TRY_RUN([#include <sys/types.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-int main ()
-{
-struct statfs fsd;
-fsd.f_fsize = 0;
-return (statfs (".", &fsd));
-}],
-fu_cv_sys_stat_statfs2_fsize=yes,
-fu_cv_sys_stat_statfs2_fsize=no,
-fu_cv_sys_stat_statfs2_fsize=no)])
-AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
-if test $fu_cv_sys_stat_statfs2_fsize = yes; then
-space=yes
-AC_DEFINE(STAT_STATFS2_FSIZE)
-fi
-fi
-
-if test $space = no; then
-# Ultrix
-AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)])
-AC_CACHE_VAL(fu_cv_sys_stat_fs_data,
-[AC_TRY_RUN([#include <sys/types.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_FS_TYPES_H
-#include <sys/fs_types.h>
-#endif
-int main ()
-{
-struct fs_data fsd;
-/* Ultrix's statfs returns 1 for success,
-0 for not mounted, -1 for failure.  */
-return (statfs (".", &fsd) != 1);
-}],
-fu_cv_sys_stat_fs_data=yes,
-fu_cv_sys_stat_fs_data=no,
-fu_cv_sys_stat_fs_data=no)])
-AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
-if test $fu_cv_sys_stat_fs_data = yes; then
-space=yes
-AC_DEFINE(STAT_STATFS2_FS_DATA)
-fi
-fi
-
-if test $space = no; then
-# SVR2
-AC_TRY_CPP([#include <sys/filsys.h>],
-AC_DEFINE(STAT_READ_FILSYS) space=yes)
-fi
-
-if test -n "$list_mounted_fs" && test $space != no; then
-DF_PROG="df"
-# AC_LIBOBJ(fsusage)
-# AC_LIBOBJ(mountlist)
-fi
-
-# Check for SunOS statfs brokenness wrt partitions 2GB and larger.
-# If <sys/vfs.h> exists and struct statfs has a member named f_spare,
-# enable the work-around code in fsusage.c.
-AC_MSG_CHECKING([for statfs that truncates block counts])
-AC_CACHE_VAL(fu_cv_sys_truncating_statfs,
-[AC_TRY_COMPILE([
-#if !defined(sun) && !defined(__sun)
-choke -- this is a workaround for a Sun-specific problem
-#endif
-#include <sys/types.h>
-#include <sys/vfs.h>],
-[struct statfs t; long c = *(t.f_spare);],
-fu_cv_sys_truncating_statfs=yes,
-fu_cv_sys_truncating_statfs=no,
-)])
-if test $fu_cv_sys_truncating_statfs = yes; then
-AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS)
-fi
-AC_MSG_RESULT($fu_cv_sys_truncating_statfs)
-
-AC_CHECKING(for AFS)
-test -d /afs && AC_DEFINE(AFS)
-])
-
-
-dnl This file is intended for use both internally in libgtop and in every program
-dnl that wants to use it.
-dnl
-dnl It defines the following variables:
-dnl
-dnl * 'libgtop_sysdeps_dir'    - sysdeps dir for libgtop.
-dnl * 'libgtop_use_machine_h'  - some of system dependend parts of libgtop provide
-dnl                              their own header file. In this case we need to
-dnl                              define 'HAVE_GLIBTOP_MACHINE_H'.
-dnl * 'libgtop_need_server'    - is the server really needed? Defines 'NEED_LIBGTOP'
-dnl                              if true; defines conditional 'NEED_LIBGTOP'.
-
-AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
-	AC_REQUIRE([AC_CANONICAL_HOST])
-
-	AC_SUBST(libgtop_sysdeps_dir)
-	AC_SUBST(libgtop_use_machine_h)
-	AC_SUBST(libgtop_need_server)
-
-	AC_ARG_WITH(libgtop-examples,
-	[  --with-libgtop-examples Build the libgtop examples (default=no)],[
-	build_examples="$withval"], [build_examples=no])
-
-	AM_CONDITIONAL(EXAMPLES, test x"$build_examples" = xyes)
-
-	AC_ARG_ENABLE(hacker-mode,
-	[  --enable-hacker-mode    Enable building of unstable sysdeps],
-	[hacker_mode="$enableval"], [hacker_mode=no])
-
-	AM_CONDITIONAL(HACKER_MODE, test x"$hacker_mode" = xyes)
-
-	if test x$hacker_mode = xyes ; then
-	  LIBGTOP_HACKER_TESTS
-	fi
-
-	AC_ARG_WITH(libgtop-smp,
-	[  --with-libgtop-smp      Enable SMP support (default-auto)],[
-	libgtop_smp="$withval"],[libgtop_smp=auto])
-
-	if test $libgtop_smp = auto ; then
-	  AC_MSG_CHECKING(whether to enable SMP support)
-	  case "$host_os" in
-	  linux*)
-	    libgtop_smp=yes
-	    ;;
-	  aix*)
-	    libgtop_smp=yes
-	    ;;
-	  *)
-	    libgtop_smp=no
-	    ;;
-	  esac
-	  AC_MSG_RESULT($libgtop_smp)
-	fi
-
-	if test $libgtop_smp = yes ; then
-	  AC_DEFINE(HAVE_LIBGTOP_SMP)
-	fi
-
-	AM_CONDITIONAL(LIBGTOP_SMP, test $libgtop_smp = yes)
-
-	AC_MSG_CHECKING(for libgtop sysdeps directory)
-
-	case "$host_os" in
-	linux*)
-	  libgtop_sysdeps_dir=linux
-	  libgtop_use_machine_h=no
-	  libgtop_have_sysinfo=yes
-	  libgtop_need_server=no
-	  ;;
-	freebsd*|netbsd*|openbsd*|bsdi*)
-	  libgtop_sysdeps_dir=freebsd
-	  libgtop_use_machine_h=yes
-	  libgtop_need_server=yes
-	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
-	  ;;
-	solaris*)
-	  libgtop_sysdeps_dir=solaris
-	  libgtop_use_machine_h=yes
-	  libgtop_need_server=yes
-	  libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
-	  ;;
-        aix*)
-	  libgtop_sysdeps_dir=aix
-	  libgtop_use_machine_h=yes
-	  libgtop_need_server=yes
-	  libgtop_have_sysinfo=yes
-	  libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
-          ;;
-	*)
-	  if test x$hacker_mode = xyes ; then
-	    case "$host_os" in
-	    sunos4*)
-	      #Please note that this port is obsolete and not working at
-	      #all. It is only useful for people who want to fix it ... :-)
-	      libgtop_sysdeps_dir=sun4
-	      libgtop_use_machine_h=yes
-	      libgtop_need_server=yes
-	      ;;
-	    osf*)
-	      libgtop_sysdeps_dir=osf1
-	      libgtop_use_machine_h=yes
-	      libgtop_need_server=yes
-	      ;;
-	    *)
-	      libgtop_sysdeps_dir=stub
-	      libgtop_use_machine_h=no
-	      libgtop_need_server=no
-	      ;;
-	    esac
-	  else
-	    libgtop_sysdeps_dir=stub
-	    libgtop_use_machine_h=no
-	    libgtop_need_server=no
-	  fi
-	  ;;
-	esac
-
-	test -z "$libgtop_postinstall" && libgtop_postinstall=:
-
-	AC_MSG_RESULT($libgtop_sysdeps_dir)
-
-	AC_SUBST(libgtop_sysdeps_dir)
-	AC_SUBST(libgtop_postinstall)
-	AC_SUBST(libgtop_have_sysinfo)
-
-	case "$host_os" in
-	*bsd*)
-	  AC_CHECK_HEADERS(net/if_var.h)
-	  AC_MSG_CHECKING([for I4B])
-	  AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
-#include <net/if_types.h>
-
-#ifdef HAVE_NET_IF_VAR_H
-#include <net/if_var.h>
-#endif
-
-#include <net/netisr.h>
-#include <net/route.h>
-
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include <net/if_sppp.h>
-#else
-#include <i4b/sppp/if_sppp.h>
-#endif
-],[
-	size_t size = sizeof (struct sppp);
-], have_i4b=yes, have_i4b=no)
-	  AC_MSG_RESULT($have_i4b)
-	  if test x$have_i4b = xyes; then
-	    AC_DEFINE(HAVE_I4B)
-	    AC_MSG_CHECKING([for I4B accounting])
-	    AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
-#include <net/if_types.h>
-
-#ifdef HAVE_NET_IF_VAR_H
-#include <net/if_var.h>
-#endif
-
-#include <net/netisr.h>
-#include <net/route.h>
-
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include <net/if_sppp.h>
-#else
-#include <i4b/sppp/if_sppp.h>
-#endif
-
-#include <machine/i4b_acct.h>
-],[
-	size_t size = sizeof (struct i4bisppp_softc);
-], have_i4b_acct=yes, have_i4b_acct=no)
-	    AC_MSG_RESULT($have_i4b_acct)
-	    if test x$have_i4b_acct = xyes ; then
-	      AC_DEFINE(HAVE_I4B_ACCT)
-	    else
-	      AC_WARN([
-*** I4B accounting disabled - you won't get any PPP statistics.
-*** Read "misc/i4b_acct.txt" in the LibGTop source directory
-*** to see how to enable it.])
-	    fi
-	  fi
-	  ;;
-	linux*)
-	  os_major_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
-	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-	  os_minor_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
-	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-	  os_micro_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
-	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-	  os_version_expr="$os_major_version 65536 * $os_minor_version 256 * + $os_micro_version + p q"
-
-	  AC_CHECK_HEADERS(linux/version.h, have_linux_version_h=yes,
-	    have_linux_version_h=no)
-
-	  if test x$have_linux_version_h = xyes ; then
-	    version_code=`cat /usr/include/linux/version.h | \
-	      grep \#define | grep LINUX_VERSION_CODE`
-	    os_version_code=`echo $version_code | \
-	      sed 's/^.*LINUX_VERSION_CODE[[ \t]]*\([[0-9]]*\).*$/\1/'`
-	  else
-	    os_version_code=`echo "$os_version_expr" | dc`
-	  fi
-
-	  AC_MSG_CHECKING(for Linux kernel version code)
-	  AC_DEFINE_UNQUOTED(GLIBTOP_LINUX_VERSION_CODE, $os_version_code)
-	  AC_MSG_RESULT($os_version_code)
-	  ;;
-	solaris*)
-	  os_major_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\1/'`
-	  os_minor_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\2/'`
-	  os_micro_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\3/'`
-	  test -z "$os_micro_version" && os_micro_version=0
-	  os_version_expr="$os_major_version 100 * $os_minor_version 10 * + $os_micro_version + p q"
-	  os_version_code=`echo "$os_version_expr" | dc`
-
-	  AC_MSG_CHECKING(for Solaris release code)
-	  AC_DEFINE_UNQUOTED(GLIBTOP_SOLARIS_RELEASE, $os_version_code)
-	  AC_MSG_RESULT($os_version_code)
-	  ;;
-	esac
-
-	AC_MSG_CHECKING(for machine.h in libgtop sysdeps dir)
-	AC_MSG_RESULT($libgtop_use_machine_h)
-
-	AC_MSG_CHECKING(whether we need libgtop)
-	AC_MSG_RESULT($libgtop_need_server)
-
-	if test x$libgtop_need_server = xyes ; then
-	  AC_DEFINE(NEED_LIBGTOP)
-	fi
-
-	if test x$libgtop_use_machine_h = xyes ; then
-	  AC_DEFINE(HAVE_GLIBTOP_MACHINE_H)
-	fi
-
-	AM_CONDITIONAL(NEED_LIBGTOP, test x$libgtop_need_server = xyes)
-])
-
-  

autogen.sh

@@ -14,8 +14,4 @@ PKG_NAME="Gnome Top Library"
     exit 1
 }
 
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
-    exit 1
-}
-USE_GNOME2_MACROS=1 . gnome-autogen.sh
+. $srcdir/macros/autogen.sh

configure.in

@@ -6,33 +6,24 @@ AC_INIT(copyright.txt)
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
 
-LIBGTOP_MAJOR_VERSION=2
-LIBGTOP_MINOR_VERSION=12
-LIBGTOP_MICRO_VERSION=2
-LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
-AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
+dnl This is required at several places
+AC_CHECK_PROG(ac_dc_found, dc, yes, no)
+if test x$ac_dc_found != xyes ; then
+AC_MSG_ERROR([
+*** The "dc" utility was not found on your system.
+***
+*** When using RedHat Linux, you need to install the "bc" package.
+***
+*** It is now part of the "bc" package, so you should look at
+*** ftp://ftp.gnu.org/pub/gnu/bc/ if you want to compile it yourself.
+***
+*** Other systems and distributions may also have it in their "bc" package,
+*** so if there's no "dc" one, please look for "bc".
+***])
+fi
 
-dnl  increment if the interface has additions, changes, removals.
-LIBGTOP_CURRENT=6
-
-dnl  increment any time the source changes; set to
-dnl  0 if you increment CURRENT
-LIBGTOP_REVISION=0
-
-dnl  increment if any interfaces have been added; set to 0
-dnl  if any interfaces have been removed. removal has
-dnl  precedence over adding, so set to 0 if both happened.
-LIBGTOP_AGE=1
-
-# you can set this to `-snap' for instance to create
-# a `libgtop-1.x.y-snap.tar.gz' tarball.
-LIBGTOP_VERSION_SUFFIX=
-
-# Increase each time you change the client/server protocol.
-LIBGTOP_SERVER_VERSION=5
-
-# Version code calculation
-LIBGTOP_VERSION_CODE=`expr $LIBGTOP_MAJOR_VERSION \* 1000000 + $LIBGTOP_MINOR_VERSION \* 1000 + $LIBGTOP_MICRO_VERSION`
+. $srcdir/LIBGTOP-VERSION
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 
 AC_SUBST(LIBGTOP_MAJOR_VERSION)
 AC_SUBST(LIBGTOP_MINOR_VERSION)
@@ -46,22 +37,22 @@ AC_SUBST(LIBGTOP_VERSION_SUFFIX)
 
 # libtool versioning
 LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
-LT_CURRENT=$LIBGTOP_CURRENT
-LT_REVISION=$LIBGTOP_REVISION
-LT_AGE=$LIBGTOP_AGE
-LT_VERSION_INFO="-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}"
+LT_CURRENT=`expr $LIBGTOP_MICRO_VERSION - $LIBGTOP_INTERFACE_AGE`
+LT_REVISION=$LIBGTOP_INTERFACE_AGE
+LT_AGE=`expr $LIBGTOP_BINARY_AGE - $LIBGTOP_INTERFACE_AGE`
+LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
 AC_SUBST(LT_VERSION_INFO)
 AC_SUBST(LT_RELEASE)
 AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I ."
+AM_ACLOCAL_INCLUDE(. macros)
 
 AC_ISC_POSIX
 AC_PROG_CC
 AC_STDC_HEADERS
-dnl AC_ARG_PROGRAM
+AC_ARG_PROGRAM
 
 dnl We need this at some places.
 libgtop_top_builddir=`pwd`
@@ -80,8 +71,10 @@ AC_CHECK_TOOL(CC,gcc)
 AC_CHECK_TOOL(RANLIB,ranlib)
 AC_CHECK_TOOL(AS,as)
 AC_CHECK_TOOL(AR,ar)
+AC_CHECK_TOOL(NM,nm)
 
-export CC CXX RANLIB LD AS AR
+NM=`which $NM`
+export CC CXX RANLIB LD AS AR NM
 
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -91,11 +84,44 @@ export cross_compiling
 
 AM_PROG_LIBTOOL
 
+dnl Let the user enable compiler warnings
+GNOME_COMPILE_WARNINGS
+
+GNOME_INIT_HOOK(gnome_found=yes)
+
+if test "x$gnome_found" != xyes; then
+  if test "x$want_gnome" != xno ; then
+    AC_MSG_ERROR([
+*** GNOME was not found on this system. ***
+
+*** If you want to use LibGTop without GNOME, you need
+*** to give configure the --without-gnome parameter.
+])
+  else
+    AC_DEFINE(WITHOUT_GNOME)
+  fi
+  GNOME_SUPPORT_CHECKS
+else
+  if test "x$want_gnome" != xno ; then
+    AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
+  else
+    GNOME_SUPPORT_CHECKS
+  fi
+fi
+
 AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
 
 GNOME_LIBGTOP_SYSDEPS
 GNOME_LIBGTOP_TYPES
 
+AC_ARG_WITH(libgtop-guile,
+[  --with-libgtop-guile    Build the libgtop guile interface (default=no)],
+[build_guile="$withval"], [build_guile=yes])
+
+if test x$build_guile != xno ; then
+  GNOME_CHECK_GUILE
+fi
+
 AC_ARG_WITH(libgtop-inodedb,
 [  --with-libgtop-inodedb  Build the inodedb stuff (default=no)],
 [build_inodedb="$withval"], [build_inodedb=no])
@@ -112,25 +138,52 @@ if test x$build_inodedb = xyes ; then
   AC_DEFINE(GLIBTOP_INODEDB)
 fi
 
-GLIB_REQUIRED=2.6.0
+AC_DEFINE(GLIBTOP_NAMES)
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-AC_CHECK_HEADER(popt.h,[POPT=yes],[POPT=no])
-AC_MSG_CHECKING(for popt.h)
-if test x$POPT = xyes ; then
-   AC_MSG_RESULT(yes)
+if test x$ac_cv_guile_found = xyes ; then
+  AC_DEFINE(GLIBTOP_GUILE)
+  AC_DEFINE(GLIBTOP_GUILE_NAMES)
+  libgtop_guile_found=yes
+  guile_examples='third'
+  guile_static_examples='third_static'
+  guile_subdirs='guile'
 else
-   AC_MSG_ERROR([libgtop requires the popt development libraries])
+  libgtop_guile_found=no
+  guile_examples=
+  guile_static_examples=
+  guile_subdirs=
 fi
 
-AC_CHECK_HEADER(ifaddrs.h, [HAVE_IFADDRS_H=yes], [HAVE_IFADDRS_H=no])
-if test x$HAVE_IFADDRS_H = xyes ; then
-	AC_DEFINE(HAVE_IFADDRS_H, 1, [defined if you have ifaddrs.h])
+if test x$libgtop_smp = xyes ; then
+  smp_examples='smp'
+  smp_static_examples='smp_static'
+else
+  smp_examples=
+  smp_static_examples=
 fi
 
+if test "x$enable_static" != xno; then
+  static_targets="first_static second_static mountlist_static procmap_static netload_static sysdeps_static timings_static $guile_static_examples $smp_static_examples"
+else
+  static_targets=""
+fi
+
+AM_CONDITIONAL(ENABLE_STATIC, test x$enable_static = xyes)
+AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes)
+
+AC_SUBST(static_targets)
+AC_SUBST(smp_examples)
+AC_SUBST(guile_examples)
+AC_SUBST(guile_subdirs)
+
+AM_PROG_LIBTOOL
+
+AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop))
+
+dnl You need to uncomment the following line if you want to use
+dnl libGTop without Gnome.
+dnl GNOME_SUPPORT_CHECKS
+
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
@@ -163,60 +216,45 @@ AC_CHECK_FUNCS(dlerror,,)
 LIBS="$oLIBS"
 AC_SUBST(DL_LIB)
 
-dnl Linux
-AC_CHECK_HEADER(linux/isdn.h,[HAVE_ISDN_H=yes],[HAVE_ISDN_H=no])
-if test x$HAVE_ISDN_H = xyes ; then
-	AC_DEFINE(HAVE_ISDN_H, 1, [defined if you have linux/isdn.h])
-fi
-
-dnl AIX
-AH_TEMPLATE(HAVE_VMGETINFO, [Define to 1 if you have the 'vmgetinfo' function in libperfstat])
-AC_CHECK_LIB(perfstat, vmgetinfo, AC_DEFINE(HAVE_VMGETINFO))
-
 dnl Solaris
-case "$host_os" in
-     solaris*)
-     AC_CHECK_LIB(kstat, kstat_open)
-     AC_CHECK_FUNCS(getloadavg swapctl)
-     AC_CHECK_HEADERS(procfs.h sys/procfs.h, break)
+AC_CHECK_LIB(kstat, kstat_open)
+AC_CHECK_FUNCS(getloadavg swapctl)
+AC_CHECK_HEADERS(procfs.h sys/procfs.h, break)
 
-
-    dnl Some versions of Solaris require -lelf for -lkvm
-    AC_CHECK_LIB(kvm, kvm_open,[
-      LIBS="-lkvm $LIBS"
-    ],[AC_MSG_CHECKING(for kvm_open in -lkvm with -lelf)
-       AC_CACHE_VAL(ac_cv_lib_kvm_with_elf,
-       [ac_save_LIBS="$LIBS"
-        LIBS="-lkvm -lelf $LIBS"
-        AC_TRY_LINK([char kvm_open();], [kvm_open()],
-                    ac_cv_lib_kvm_with_elf=yes, ac_cv_lib_kvm_with_elf=no)
-        LIBS="$ac_save_LIBS"
-       ])
-       if test "$ac_cv_lib_kvm_with_elf" = "yes"; then
-         AC_MSG_RESULT(yes)
-         LIBS="-lkvm -lelf $LIBS"
-       else
-         AC_MSG_RESULT(no)
-       fi
-    ])
-     ;;
-esac
+dnl Some versions of Solaris require -lelf for -lkvm
+AC_CHECK_LIB(kvm, kvm_open,[
+  LIBS="-lkvm $LIBS"
+],[AC_MSG_CHECKING(for kvm_open in -lkvm with -lelf)
+   AC_CACHE_VAL(ac_cv_lib_kvm_with_elf,
+   [ac_save_LIBS="$LIBS"
+    LIBS="-lkvm -lelf $LIBS"
+    AC_TRY_LINK([char kvm_open();], [kvm_open()],
+                ac_cv_lib_kvm_with_elf=yes, ac_cv_lib_kvm_with_elf=no)
+    LIBS="$ac_save_LIBS"
+   ])
+   if test "$ac_cv_lib_kvm_with_elf" = "yes"; then
+     AC_MSG_RESULT(yes)
+     LIBS="-lkvm -lelf $LIBS"
+   else
+     AC_MSG_RESULT(no)
+   fi
+])
 
 dnl For DEC OSF1
 AC_CHECK_LIB(mach, vm_statistics)
 
-dnl For some broken libc5 systems (Debian 1.3)
-saved_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS -D_GNU_SOURCE"
+dnl For some broken libc5 systems (Debian 1.3)                                                           
+saved_CFLAGS=$CFLAGS                                                                                     
+CFLAGS="$CFLAGS -D_GNU_SOURCE"                                                                           
 GCC_NEED_DECLARATION(program_invocation_name, [                           
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-])
-
-CFLAGS=$saved_CFLAGS
-
+#include <errno.h>                                                                                       
+#include <stdio.h>                                                                                       
+#include <stdlib.h>                                                                                      
+#include <string.h>                                                                                      
+])                                                                                                       
+CFLAGS=$saved_CFLAGS                                                                                     
+                                                                                                         
+dnl Check for Internet sockets.
 AC_CHECK_FUNC(socket,
  [AC_CHECK_HEADER(netinet/in.h,
    [AC_CHECK_HEADER(arpa/inet.h, [
@@ -238,13 +276,9 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
 
-ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id it ja ko ku ky lt lv mi mk ml mn ms nb ne nl nn no or pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta tr uk vi xh zh_CN zh_TW"
-
-GETTEXT_PACKAGE=libgtop-2.0
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
-
-AM_GLIB_GNU_GETTEXT
+dnl ## all 'es_??' are only needed for format numbers different of 'es'
+ALL_LINGUAS="az da de el es es_DO es_GT es_HN es_MX es_PA es_PE es_SV fi fr gl ja ko nl no pl pt_BR sk sl sv"
+AM_GNOME_GETTEXT
 
 AC_PATH_XTRA
 
@@ -284,9 +318,27 @@ dnl Debugging
 AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],AC_DEFINE(LIBGTOP_ENABLE_DEBUG),)
 AC_ARG_ENABLE(fatal-warnings, [  --enable-fatal-warnings make all warnings fatal [debug=no]],AC_DEFINE(LIBGTOP_FATAL_WARNINGS),)
 
+if test "x$gnome_found" = xyes ; then
+  LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
+  SUPPORTINCS="$GNOME_INCLUDEDIR"
+else
+  LIBSUPPORT='$(top_builddir)/support/libgnomesupport.la'
+  SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support'
+fi
+
+dnl Some ugly hack; if '-lgnomesupport' is part of $GNOME_LIBS,
+dnl we include it here.
+case "$GNOME_LIBS" in
+	'*-lgnomesupport*' ) 
+	  LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
+          SUPPORTINCS="$GNOME_INCLUDEDIR" ;;
+esac
+AC_SUBST(LIBSUPPORT)
+AC_SUBST(SUPPORTINCS)
+
 dnl These definitions are expanded in make.
 LIBGTOP_LIBS='-L$(libdir)'
-LIBGTOP_INCS='-I$(includedir)/libgtop-2.0'
+LIBGTOP_INCS='-I$(includedir)'
 
 if test x$libgtop_use_machine_h = xyes ; then
   LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_GLIBTOP_MACHINE_H"
@@ -304,14 +356,25 @@ if test x$libgtop_have_sysinfo = xyes ; then
   LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SYSINFO"
 fi
 
-LIBGTOP_INCS="$LIBGTOP_INCS $GLIB_CFLAGS"
+LIBGTOP_INCS="$LIBGTOP_INCS $SUPPORTINCS $GLIB_CFLAGS"
 
+LIBGTOP_GUILE_LIBS="$LIBGTOP_LIBS"
+LIBGTOP_GUILE_INCS="$LIBGTOP_INCS"
 LIBGTOP_BINDIR='$(bindir)'
-LIBGTOP_SERVER='$(bindir)/libgtop_server2'
+LIBGTOP_SERVER='$(bindir)/libgtop_server'
 
 sysdeps_dir="$libgtop_sysdeps_dir"
 AC_SUBST(sysdeps_dir)
 
+if test x$ac_cv_guile_found = xyes ; then
+  LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile"
+  libgtop_guile_found=yes
+else
+  libgtop_guile_found=no
+fi
+
+AC_SUBST(libgtop_guile_found)
+
 if test -z "$LIBGTOP_EXTRA_LIBS" ; then
   LIBGTOP_EXTRA_LIBS="$libs_xauth"
 else
@@ -320,40 +383,54 @@ fi
 
 LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"
 
-LIBGTOP_LIBS="$LIBGTOP_LIBS"
+LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop -lgtop_sysdeps -lgtop_common"
+LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop -lgtop_sysdeps -lgtop_common"
+
+LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names"
+LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile_names -lgtop_names"
 
 LIBGTOP_LIBS="$LIBGTOP_LIBS" 
+LIBGTOP_NAMES_LIBS="$LIBGTOP_NAMES_LIBS"
+LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS"
+LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_NAMES_LIBS"
+
+LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS $GUILE_LIBS"
+LIBGTOP_GUILE_INCS="$LIBGTOP_GUILE_INCS $GUILE_INCS -DGLIBTOP_GUILE"
+
+LIBGTOP_NAMES_INCS="$LIBGTOP_INCS -DGLIBTOP_NAMES"
+LIBGTOP_GUILE_NAMES_INCS="$LIBGTOP_GUILE_INCS -DGLIBTOP_GUILE_NAMES"
+LIBGTOP_GUILE_NAMES_INCS="$LIBGTOP_GUILE_INCS -DGLIBTOP_NAMES"
 
 machine_incs="-I\$(top_srcdir)/sysdeps/$sysdeps_dir"
 
 AC_SUBST(machine_incs)
 
-if test "$GCC" = "yes" ; then
-        CFLAGS="\
-	-Winline \
-	-Wall \
-	-std=gnu89 \
-	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
-	-Wnested-externs -Wpointer-arith \
-	-Wcast-align -Wsign-compare \
-	-fno-strict-aliasing \
-	$CFLAGS"
+if test x$libgtop_guile_found = xyes ; then
+  guile_def="-DGLIBTOP_GUILE -DGLIBTOP_GUILE_NAMES $GUILE_INCS "
+else
+  guile_def=""
 fi
 
-INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $GLIB_CFLAGS $CFLAGS $X_CFLAGS "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'
+INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include -I\$(top_srcdir)/intl $SUPPORTINCS $GLIB_CFLAGS $CFLAGS $X_CFLAGS $guile_def "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'
 
 AC_SUBST(INCLUDES)
 
 AC_SUBST(LIBGTOP_EXTRA_LIBS)
-AC_SUBST(GLIB_LIBS)
+
 AC_SUBST(LIBGTOP_LIBS)
 AC_SUBST(LIBGTOP_INCS)
+AC_SUBST(LIBGTOP_NAMES_LIBS)
+AC_SUBST(LIBGTOP_NAMES_INCS)
+AC_SUBST(LIBGTOP_GUILE_LIBS)
+AC_SUBST(LIBGTOP_GUILE_INCS)
+AC_SUBST(LIBGTOP_GUILE_NAMES_LIBS)
+AC_SUBST(LIBGTOP_GUILE_NAMES_INCS)
 AC_SUBST(LIBGTOP_BINDIR)
 AC_SUBST(LIBGTOP_SERVER)
 
 if test x$libgtop_need_server = xyes ; then
-   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la"
-   server_programs='libgtop_server2'
+   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid.la"
+   server_programs='libgtop_server'
 else
    sysdeps_suid_lib=
    server_programs=
@@ -365,25 +442,28 @@ AC_OUTPUT([
 Makefile
 libgtop.spec
 po/Makefile.in
+intl/Makefile
 misc/Makefile
 include/Makefile
 include/glibtop/Makefile
 sysdeps/Makefile
 sysdeps/common/Makefile
+sysdeps/names/Makefile
+sysdeps/guile/Makefile
+sysdeps/guile/names/Makefile
 sysdeps/stub/Makefile
 sysdeps/stub_suid/Makefile
 sysdeps/sun4/Makefile
 sysdeps/osf1/Makefile
 sysdeps/linux/Makefile
+sysdeps/kernel/Makefile
 sysdeps/freebsd/Makefile
 sysdeps/solaris/Makefile
-sysdeps/aix/Makefile
 src/Makefile
 src/daemon/Makefile
 src/inodedb/Makefile
 lib/Makefile
 examples/Makefile
 doc/Makefile
-libgtop-2.0.pc
-libgtopconfig.h
-])
+support/Makefile
+macros/Makefile])

copyright.txt

@@ -1,9 +1,10 @@
+/* $Id$ */
+
 /* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 2.0.
+   This file is part of LibGTop 1.0.
 
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-   Contributed by Benoît Dejean <TazForEver@dlfp.org>, 2004.
-   
+
    LibGTop is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License,

debian/libgtop-dev.files.in

@@ -1,14 +1,17 @@
 @PREFIX@/lib/libgtop.a
 @PREFIX@/lib/libgtop_common.a
+@PREFIX@/lib/libgtop_names.a
 @PREFIX@/lib/libgtop_suid_common.a
 @PREFIX@/lib/libgtop_sysdeps.a
 @PREFIX@/lib/libgtop.la
 @PREFIX@/lib/libgtop_common.la
+@PREFIX@/lib/libgtop_names.la
 @PREFIX@/lib/libgtop_suid_common.la
 @PREFIX@/lib/libgtop_sysdeps.la
 @PREFIX@/lib/libgtopConf.sh
 @PREFIX@/lib/libgtop.so
 @PREFIX@/lib/libgtop_common.so
+@PREFIX@/lib/libgtop_names.so
 @PREFIX@/lib/libgtop_suid_common.so
 @PREFIX@/lib/libgtop_sysdeps.so
 @PREFIX@/lib/libgtop-features.def

debian/libgtop2.README.Debian

@@ -1,5 +0,0 @@
-
-The Debian package of libgtop, a GNOME library.
-
--- 
-Ian Lynagh <ian@lynagh.demon.co.uk>

debian/libgtop2.copyright

@@ -1,12 +0,0 @@
-
-libgtop is released under the GPL.
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in /usr/share/common-licenses/GPL
-
-Original authors: Martin Baulig <martin@home-of-linux.org>
-                  Drazen Kacar <dave@srce.hr>
-
-Originally Debianised by Jim Pick <jim@jimpick.com>
-Then re-Debianised in October 1998 by Martin Schulze
-<joey@finlandia.infodrom.north.de> before being taken over by Ian Lynagh
-<ian@lynagh.demon.co.uk> in November 1998.

debian/libgtop2.docs

@@ -1,7 +0,0 @@
-RELNOTES-0.25
-RELNOTES-1.0
-RELNOTES-1.1.x
-NEWS
-AUTHORS
-TODO
-debian/changelog

debian/libgtop2.files.in

@@ -1,2 +0,0 @@
-@PREFIX@/lib/libgtop*-1.1.so.*.*
-@PREFIX@/lib/libgtop*-1.1.so.*

doc/.cvsignore

@@ -1,11 +0,0 @@
-texinfo.tex
-*.info
-Makefile.in
-Makefile
-*.log *.toc *.dvi *.aux *.cp *.fn *.vr *.tp *.ky *.pg
-*.ps
-auto-macros.texi
-version.texi
-stamp-vti
-*.html *.pdf
-mdate-sh

doc/ChangeLog

@@ -1,79 +0,0 @@
-2005-01-03  Benoît Dejean  <TazForEver@dlfp.org>
-
-	* reference.texi: Updated.
-
-2004-12-04  Benoît Dejean  <tazforever@dlfp.org>
-
-	* reference.texi: Updated.
-
-2004-08-03  Benoît Dejean  <tazforever@dlfp.org>
-
-	* reference.texi: Updated.
-
-2004-07-07  Benoît Dejean  <tazforever@dlfp.org>
-
-	* reference.texi: updated.
-	Added glibtop_get_proc_argv.
-	Added glibtop_fsusage.block_size.
-
-2004-03-05  Bastien Nocera  <hadess@hadess.net>
-
-	* reference.texi: update for new API
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* reference.texi: s/u_int64_t/guint64/
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* Makefile.am: removed traces of guile, intllibs and libgnomesupport
-
-2002-03-12  James Henstridge  <james@daa.com.au>
-
-	* Makefile.am (MAKEINFO): using += seems to screw up the build
-	with newer automakes.  Set it explicitly (using @MAKEINFO@) seems
-	to be compatible with both.
-
-2001-11-26  Abel Cheung  <maddog@linux.org.hk>
-
-	* libgtop.texi, Makefile.am: Renamed to libgtop2.texi
-	* about.texi: Very minor update.
-
-1999-10-18  Martin Baulig  <martin@home-of-linux.org>
-
-	* about.texi: Added a note about LibGTop and GNOME.
-
-	* reference.texi (glibtop_proc_state): Fix description of the `state'
- 	field for LibGTop 1.0.x.
-
-1999-09-29  Martin Baulig  <martin@home-of-linux.org>
-
-	* Makefile.am (MAKEINFO): Add `-I @libgtop_top_builddir@/doc' here.
-
-1999-05-16  Martin Baulig  <martin@home-of-linux.org>
-
-	* main.texi: This is now the main file which will @include all
-	chapter files so we can use `texinfo-multiple-files-update'.
-
-	* reference.texi: Added all missing sections with a "not yet written"
-	notice.
-
-1999-05-16  Martin Baulig  <martin@home-of-linux.org>
-
-	* white-paper.texi: Initial version of the LibGTop White Paper.
-
-	* Makefile.am: Create `auto-macros.texi' from `auto-macros.texi.in'
- 	which will contain some `@set' commands for the LibGTop version etc.
-
-	* auto-macros.texi.in: New file. This is a template for
-	`auto-macros.texi' which will be automatically generated.
-
-1999-05-09  Martin Baulig  <martin@home-of-linux.org>
-
-	* about.texi: Split the `libgtop.texi' into one file pro chapter,
-	this is the "About LibGTop".
-
-	* reference.texi: The "LibGTop Reference Manual".
-
-	* libgtop.texi: Initial version of the new LibGTop Manual.
-

doc/Makefile.am

@@ -1,38 +0,0 @@
-info_TEXINFOS		= libgtop2.texi
-
-libgtop2_TEXINFOS	= libgtop2.texi about.texi reference.texi \
-			  auto-macros.texi version.texi main.texi \
-			  white-paper.texi
-
-MAKEINFO		= @MAKEINFO@ -I @libgtop_top_builddir@/doc
-
-EXTRA_DIST		= auto-macros.texi.in
-
-auto-macros.texi: auto-macros.texi.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's#\%LIBGTOP_LIBDIR\%#$(libdir)#g' \
-	  -e 's#\%LIBGTOP_INCLUDEDIR\%#$(includedir)/libgtop-2.0#g' \
-	  -e 's#\%LIBGTOP_DATADIR\%#$(datadir)#g' \
-	  -e 's#\%LIBGTOP_EXTRA_LIBS\%#$(LIBGTOP_EXTRA_LIBS)#g' \
-	  -e 's#\%LIBGTOP_LIBS\%#$(LIBGTOP_LIBS)#g' \
-	  -e 's#\%LIBGTOP_INCS\%#$(LIBGTOP_INCS)#g' \
-	  -e 's#\%LIBGTOP_BINDIR\%#$(LIBGTOP_BINDIR)#g' \
-	  -e 's#\%LIBGTOP_SERVER\%#$(LIBGTOP_SERVER)#g' \
-	  -e 's#\%LIBGTOP_MAJOR_VERSION\%#$(LIBGTOP_MAJOR_VERSION)#g' \
-	  -e 's#\%LIBGTOP_MINOR_VERSION\%#$(LIBGTOP_MINOR_VERSION)#g' \
-	  -e 's#\%LIBGTOP_MICRO_VERSION\%#$(LIBGTOP_MICRO_VERSION)#g' \
-	  -e 's#\%LIBGTOP_VERSION\%#$(LIBGTOP_VERSION)#g' \
-	  -e 's#\%LIBGTOP_VERSION_CODE\%#$(LIBGTOP_VERSION_CODE)#g' \
-	  -e 's#\%LIBGTOP_SERVER_VERSION\%#$(LIBGTOP_SERVER_VERSION)#g' \
-	  -e 's#\%libgtop_sysdeps_dir\%#$(libgtop_sysdeps_dir)#g' \
-	  -e 's#\%libgtop_need_server\%#$(libgtop_need_server)#g' \
-	  -e 's#\%libgtop_use_machine_h\%#$(libgtop_use_machine_h)#g' \
-	  -e 's#\%libgtop_want_examples\%#$(libgtop_want_examples)#g' \
-	      < $(srcdir)/auto-macros.texi.in > auto-macros.tmp
-	echo '@c Set this if this is LibGTop 1.1.x' >> auto-macros.tmp
-	if [ $(LIBGTOP_VERSION_CODE) -ge 1001000 ] ; then \
-	  echo '@set LIBGTOP-1-1' >> auto-macros.tmp ; \
-	else \
-	  echo '@clear LIBGTOP-1-1' >> auto-macros.tmp ; \
-	fi
-	mv auto-macros.tmp auto-macros.texi

doc/about.texi

@@ -33,10 +33,10 @@ latest release tarballs from
 @noindent
 or any of its mirror sites.
 
-The latest stable version of LibGTop is 1.0.12 which is also the one that comes
-together with GNOME 1.0. It belongs to @code{LIBGTOP_STABLE_1_0} branch in CVS.
-Actual development occurs in the @code{libgtop-GNOME-2-0-port} which is
-currently versioned 1.90.0.
+The latest stable version of LibGTop is 1.0.1 which is also the one that comes
+together with GNOME 1.0. In CVS, there is a @code{LIBGTOP_STABLE_1_0} branch
+which is rooted at the @code{LIBGTOP_1_0_1} tag while actual development occurs
+in the @code{HEAD} which currently has version 1.1.0.
 
 @node Supported Platforms, Mailing List, Availability, About
 @section Supported Platforms
@@ -47,7 +47,7 @@ The stable branch currently supports the following platforms:
 @item All versions of Linux
 
 LibGTop was tested under Linux 2.0.x and 2.2.x on the ix86 and the alpha, but
-it should also work without problems on SparcLinux or Linux 2.4.x.
+it should also work without problems on SparcLinux.
 
 Note: I'm speaking of the Linux kernel here, not the GNU/Linux operating system.
 
@@ -116,7 +116,6 @@ me a lot in the early beginning.
 @item Timur Bakeyev for the BSDI port.
 @item Drazen Kacar and the other people on the LibGTop development mailing
 list for the Solaris port.
-@item Kevin Vandersloot for the effort to port to GNOME 2.0.
 @item All people sending me patches, having good ideas, ...
 @item Everyone I have forgotten in this list ...
 @end itemize

doc/auto-macros.texi.in

@@ -1,12 +0,0 @@
-@c LibGTop major, minor and micro version.
-@set LIBGTOP_MAJOR_VERSION %LIBGTOP_MAJOR_VERSION%
-@set LIBGTOP_MINOR_VERSION %LIBGTOP_MINOR_VERSION%
-@set LIBGTOP_MICRO_VERSION %LIBGTOP_MICRO_VERSION%
-
-@c LibGTop version and numerical version code ("1.234.567" -> 1234567).
-@set LIBGTOP_VERSION "%LIBGTOP_VERSION%"
-@set LIBGTOP_VERSION_CODE %LIBGTOP_VERSION_CODE%
-
-@c LibGTop server version, increased each time the protocol changes.
-@set LIBGTOP_SERVER_VERSION %LIBGTOP_SERVER_VERSION%
-

doc/internals.texi

@@ -1,107 +0,0 @@
-@node LibGTop Internals, , Reference Manual, Top
-@chapter LibGTop Internals
-
-@menu
-* General Internals::           General Internals
-* Sysdeps Internals::           Sysdeps Internals
-@end menu
-
-@node General Internals, Sysdeps Internals, LibGTop Internals, LibGTop Internals
-@section General Internals
-
-@menu
-* glibtop::                     The server structure
-@end menu
-
-@node glibtop,  , General Internals, General Internals
-@subsection The server structure - @code{glibtop}
-
-@example
-@cartouche
-typedef struct _glibtop         glibtop;
-
-struct _glibtop
-@{
-        unsigned flags;
-        unsigned method;
-        unsigned error_method;
-#ifdef HAVE_GLIBTOP_MACHINE_H
-        glibtop_machine machine;
-#endif
-        int input [2];
-        int output [2];
-        int socket;
-        int ncpu;
-        unsigned long os_version_code;
-        const char *name;
-        const char *server_command;
-        const char *server_host;
-        const char *server_user;
-        const char *server_rsh;
-        unsigned long features;
-        unsigned long server_port;
-        glibtop_sysdeps sysdeps;
-        glibtop_sysdeps required;
-        glibtop_sysdeps wanted;
-        pid_t pid;
-@};
-@end cartouche
-@end example
-
-@node Sysdeps Internals,  , General Internals, LibGTop Internals
-@section Sysdeps Internals
-
-@menu
-* glibtop_open_s::              Non-privileged initializations
-* glibtop_close_s::             Non-privileged cleanups
-@end menu
-
-@node glibtop_open_s, glibtop_close_s, Sysdeps Internals, Sysdeps Internals
-@subsection glibtop_open_s
-
-This function is used in the non-suid sysdeps library @samp{-lgtop_sysdeps} to
-initialize a server. It should do all initializations that do not need any
-privileges.
-
-@example
-@cartouche
-void
-glibtop_open_s (glibtop *server, const char *program_name,
-		const unsigned long features,
-		const unsigned flags);
-@end cartouche
-@end example
-
-@table @code
-@item server
-Pointer to the @code{glibtop} server structure.
-@item program_name
-Name of the calling program; the implementation will usually
-set @samp{server->name} to this so it'll be used as the program
-name in error messages.
-@end table
-
-Typically, this function will set @code{server->name}, @code{server->ncpu} and
-@code{server->os_version_code} and initialize any of the @code{server->machine}
-fields which do not need any privileges.
-
-It is normally implemented in @file{open.c} in the sysdeps directory.
-
-@node glibtop_close_s,  , glibtop_open_s, Sysdeps Internals
-@subsection glibtop_close_s
-
-This function is used in the non-suid sysdeps library @samp{-lgtop_sysdeps} to
-clean-up a server when it's no longer used.
-
-It must free all resources that were allocated in @code{glibtop_open_s}.
-
-@example
-@cartouche
-void
-glibtop_close_s (glibtop *server);
-@end cartouche
-@end example
-
-It is normally implemented in @file{close.c} in the sysdeps directory, but may
-be empty.
-

doc/libgtop2.texi

@@ -1,89 +0,0 @@
-\input texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename libgtop2.info
-@settitle LibGTop Reference Manual
-@setchapternewpage odd
-@c %**end of header
-
-@include auto-macros.texi
-@include version.texi
-
-@ifinfo
-This is the LibGTop Reference Manual version @value{VERSION}
-(last modified @value{UPDATED}).
-
-Copyright 1999 Free Software Foundation, Inc.
-     
-Permission is granted to make and distribute verbatim
-copies of this manual provided the copyright notice and
-this permission notice are preserved on all copies.
-     
-@ignore
-Permission is granted to process this file through TeX
-and print the results, provided the printed document
-carries a copying permission notice identical to this
-one except for the removal of this paragraph (this
-paragraph not being relevant to the printed manual).
-     
-@end ignore
-Permission is granted to copy and distribute modified
-versions of this manual under the conditions for
-verbatim copying, provided also that the sections
-entitled ``Copying'' and ``GNU General Public License''
-are included exactly as in the original, and provided
-that the entire resulting derived work is distributed
-under the terms of a permission notice identical to this
-one.
-     
-Permission is granted to copy and distribute
-translations of this manual into another language,
-under the above conditions for modified versions,
-except that this permission notice may be stated in a
-translation approved by the Free Software Foundation.
-
-@format
-@dircategory Libraries:
-@direntry
-* LibGTop2: (libgtop2).			Library to get system specific data
-					such as cpu and memory usage, active
-					processes
-@end direntry
-@end format
-
-@end ifinfo
-
-@titlepage
-@title LibGTop Reference Manual
-@subtitle Version @value{VERSION} - @value{UPDATED}
-@author Martin Baulig
-
-@page
-@vskip 0pt plus 1filll
-Copyright @copyright{} 1999 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim
-copies of this manual provided the copyright notice and
-this permission notice are preserved on all copies.
-     
-Permission is granted to copy and distribute modified
-versions of this manual under the conditions for
-verbatim copying, provided also that the sections
-entitled ``Copying'' and ``GNU General Public License''
-are included exactly as in the original, and provided
-that the entire resulting derived work is distributed
-under the terms of a permission notice identical to this
-one.
-     
-Permission is granted to copy and distribute
-translations of this manual into another language,
-under the above conditions for modified versions,
-except that this permission notice may be stated in a
-translation approved by the Free Software Foundation.
-@end titlepage
-
-@contents
-
-@include main.texi
-
-@bye
-

doc/reference.texi

@@ -50,25 +50,24 @@ typedef struct _glibtop_cpu     glibtop_cpu;
 
 struct _glibtop_cpu
 @{
-    guint64   flags,
+    u_int64_t   flags,
         total,
         user,
         nice,
         sys,
         idle,
-        iowait,
-        irq,
-        softirq,
         frequency,
         xcpu_total [GLIBTOP_NCPU],
         xcpu_user [GLIBTOP_NCPU],
         xcpu_nice [GLIBTOP_NCPU],
         xcpu_sys  [GLIBTOP_NCPU],
+@ifset LIBGTOP-1-1
         xcpu_idle [GLIBTOP_NCPU],
-        xcpu_iowait [GLIBTOP_NCPU],
-        xcpu_irq [GLIBTOP_NCPU],
-        xcpu_softirq [GLIBTOP_NCPU],
         xcpu_flags;
+@end ifset
+@ifclear LIBGTOP-1-1
+        xcpu_idle [GLIBTOP_NCPU];
+@end ifclear
 @};
 @end cartouche
 @end example
@@ -93,33 +92,25 @@ Number of clock ticks the system spent in system mode.
 @item idle
 Number of clock ticks the system spent in the idle task.
 
-@item iowait
-Number of clock ticks the system spent waiting for I/O to complete.
-
-@item irq
-Number of clock ticks the system spent servicing interrupts.
-
-@item softirq
-Number of clock ticks the system spent servicing softirqs.
-
 @item frequency
 Tick frequency (default is 100).
 
 @end table
 
 The @samp{xcpu_} values are for SMP systems - they are the same than
-@code{total}, @code{user}, @code{nice}, @code{sys}, @code{idle},
-@code{iowait}, @code{irq} and @code{softirq}
+@code{total}, @code{user}, @code{nice}, @code{sys} and @code{idle}
 except that they are arrays of @code{GLIBTOP_NCPU} (defined in
 @file{<glibtop/limits.h>}) elements and contain one value for each CPU
 in the system.
 
+@ifset LIBGTOP-1-1
 @table @code
 @item xcpu_flags
 This is interpreted as a bit-field: on systems like Solaris, not all CPUs
 need to be running all the time, so we set the corresponding bit for each
 CPU that is currently running.
 @end table
+@end ifset
 
 Please note that all of the cpu values are absolute values measured in
 certain units (to get seconds, divide them by @code{frequency}) since system
@@ -148,7 +139,7 @@ typedef struct _glibtop_mem     glibtop_mem;
 
 struct _glibtop_mem
 @{
-    guint64   flags,
+    u_int64_t   flags,
         total,
         used,
         free,
@@ -216,7 +207,7 @@ typedef struct _glibtop_swap    glibtop_swap;
 
 struct _glibtop_swap
 @{
-    guint64   flags,
+    u_int64_t   flags,
         total,
         used,
         free,
@@ -275,10 +266,10 @@ typedef struct _glibtop_uptime  glibtop_uptime;
 
 struct _glibtop_uptime
 @{
-    guint64 flags;
+    u_int64_t flags;
     double uptime,
         idletime;
-    guint64 boot_time;
+    u_int64_t boot_time;
 @};
 @end cartouche
 @end example
@@ -327,9 +318,9 @@ typedef struct _glibtop_loadavg glibtop_loadavg;
 
 struct _glibtop_loadavg
 @{
-    guint64 flags;
+    u_int64_t flags;
     double loadavg [3];
-    guint64 nr_running,
+    u_int64_t nr_running,
         nr_tasks,
         last_pid;
 @};
@@ -368,11 +359,11 @@ Library function @code{glibtop_get_proclist}:
 @cartouche
 unsigned *
 glibtop_get_proclist (glibtop_proclist *buf,
-                      gint64 which, gint64 arg);
+                      int64_t which, int64_t arg);
 
 unsigned *
 glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf,
-                        gint64 which, gint64 arg);
+                        int64_t which, int64_t arg);
 @end cartouche
 @end example
 
@@ -404,7 +395,7 @@ typedef struct _glibtop_proclist        glibtop_proclist;
 
 struct _glibtop_proclist
 @{
-    guint64   flags,
+    u_int64_t   flags,
         number,
         total,
         size;
@@ -473,8 +464,8 @@ Size of a single entry in the returned list
 (this equals @code{sizeof (unsigned)}).
 @end table
 
-The returned list is allocated using @code{g_malloc} and must be freed
-using @code{g_free} to avoid a memory leak.
+The returned list is allocated using @code{glibtop_malloc} and must be freed
+using @code{glibtop_free} to avoid a memory leak.
 
 @page
 @node glibtop_proc_state, glibtop_proc_uid, glibtop_proclist, System Dependent
@@ -501,7 +492,7 @@ typedef struct _glibtop_proc_state      glibtop_proc_state;
 
 struct _glibtop_proc_state
 @{
-    guint64 flags;
+    u_int64_t flags;
     char cmd[40];
 @ifset LIBGTOP-1-1
     unsigned state;
@@ -581,7 +572,6 @@ There are some constants for the @code{state} field:
 #define GLIBTOP_PROCESS_ZOMBIE                  8
 #define GLIBTOP_PROCESS_STOPPED                 16
 #define GLIBTOP_PROCESS_SWAPPING                32
-#define GLIBTOP_PROCESS_DEAD                    64
 @end cartouche
 @end example
 @end ifset
@@ -628,7 +618,7 @@ typedef struct _glibtop_proc_uid        glibtop_proc_uid;
 
 struct _glibtop_proc_uid
 @{
-    guint64 flags;
+    u_int64_t flags;
     int uid,
         euid,
         gid,
@@ -708,7 +698,7 @@ typedef struct _glibtop_proc_mem        glibtop_proc_mem;
 
 struct _glibtop_proc_mem
 @{
-    guint64   flags,
+    u_int64_t   flags,
         size,
         vsize,
         resident,
@@ -727,7 +717,7 @@ Number of pages of virtual memory.
 @item resident
 Number of residnet set (non-swapped) pages.
 @item share
-Number of pages of shared (mmap\'d) memory.
+Number of pages of shared (mmap'd) memory.
 @item rss
 Number of pages the process has in real memory, minus 3 for administrative
 purposes.
@@ -823,7 +813,7 @@ typedef struct _glibtop_proc_time       glibtop_proc_time;
 
 struct _glibtop_proc_time
 @{
-    guint64   flags,
+    u_int64_t   flags,
         start_time,
         rtime,
         utime,
@@ -840,7 +830,6 @@ struct _glibtop_proc_time
 @end cartouche
 @end example
 
-
 @table @code
 @item start_time
 Start time of process in seconds since the epoch
@@ -867,18 +856,6 @@ SMP user-mode CPU time accumulated by process
 SMP kernel-mode CPU time accumulated by process
 @end table
 
-
-Please note that under Linux, @code{start_time} value may be strange.
-Linux kernel defines @code{INITIAL_JIFFIES} which implies a time
-shift. Because @code{INITIAL_JIFFIES} is not user-space defined, we
-cannot use it to compute accurate @code{start_time}. On Linux2.6,
-@code{INITIAL_JIFFIES} is 300 so @code{start_time} is always 3s
-different from real start time of the given process. You may also get
-shift results if your system clock is not synchronised with your
-hardware clock. See @samp{man hwclock}.
-
-
-
 @page
 @node glibtop_proc_signal, glibtop_proc_kernel, glibtop_proc_time, System Dependent
 @subsection Process Signal information
@@ -904,7 +881,7 @@ typedef struct _glibtop_proc_signal     glibtop_proc_signal;
 
 struct _glibtop_proc_signal
 @{
-    guint64   flags,
+    u_int64_t   flags,
         signal [2],
         blocked [2],
         sigignore [2],
@@ -925,7 +902,7 @@ Mask of caught signals
 @end table
 
 All signal masks are interpreted as bit mask; it is an array of two
-@code{guint64}'s so we can save 128 signals there.
+@code{u_int64_t}'s so we can save 128 signals there.
 
 @page
 @node glibtop_proc_kernel, glibtop_proc_segment, glibtop_proc_signal, System Dependent
@@ -952,8 +929,8 @@ typedef struct _glibtop_proc_kernel     glibtop_proc_kernel;
 
 struct _glibtop_proc_kernel
 @{
-    guint64 flags;
-    guint64 k_flags,
+    u_int64_t flags;
+    u_int64_t k_flags,
         min_flt,
         maj_flt,
         cmin_flt,
@@ -1052,7 +1029,7 @@ typedef struct _glibtop_proc_segment    glibtop_proc_segment;
 
 struct _glibtop_proc_segment
 @{
-    guint64   flags,
+    u_int64_t   flags,
         text_rss,
         shlib_rss,
         data_rss,
@@ -1060,7 +1037,16 @@ struct _glibtop_proc_segment
         dirty_size,
         start_code,
         end_code,
-        start_stack;
+        start_data,
+        end_data,
+        start_brk,
+        end_brk,
+        start_stack,
+        start_mmap,
+        arg_start,
+        arg_end,
+        env_start,
+        env_end;
 @};
 @end cartouche
 @end example
@@ -1093,7 +1079,7 @@ Library function @code{glibtop_get_proc_args}:
 @example
 @cartouche
 char *
-glibtop_get_proc_args(glibtop_proc_args *buf, pid_t pid,
+glibtop_get_proc_args_l (glibtop_proc_args *buf, pid_t pid,
                          unsigned max_len);
 
 char *
@@ -1110,7 +1096,7 @@ typedef struct _glibtop_proc_args       glibtop_proc_args;
 
 struct _glibtop_proc_args
 @{
-    guint64   flags,
+    u_int64_t   flags,
         size;
 @};
 @end cartouche
@@ -1122,31 +1108,7 @@ Returns a string with all command line arguments of process @code{pid}
 The command line arguments in the returned string are separated by zero bytes;
 the lenght of this string is returned in the @code{size} field.
 
-Remember to @code{g_free} the returned string to avoid a memory leak.
-
-@strong{New functions}
-
-@example
-@cartouche
-char **
-glibtop_get_proc_argv(glibtop_proc_args *buf, pid_t pid,
-                         unsigned max_len);
-
-char **
-glibtop_get_proc_argv_l (glibtop *server, glibtop_proc_args *buf,
-                         pid_t pid, unsigned max_len);
-@end cartouche
-@end example
-
-Returns a NULL-terminated array of strings with all arguments of
-process @code{pid} (up to @code{max_len} characters, use zero to get
-all arguments). @code{glibtop_get_proc_argv()} and
-@code{glibtop_get_proc_argv_l()} are wrappers to
-@code{glibtop_get_proc_args()} and @code{glibtop_get_proc_args_l()}
-that return process' arguments like the C @code{argv}.
-
-Remember to @code{g_strfreev} the returned array to avoid a memory
-leak.
+Remember to @code{glibtop_free} the returned string to avoid a memory leak.
 
 @page
 @node glibtop_proc_map, glibtop_netload, glibtop_proc_args, System Dependent
@@ -1173,7 +1135,7 @@ typedef struct _glibtop_proc_map        glibtop_proc_map;
 
 struct _glibtop_proc_map
 @{
-    guint64   flags,
+    u_int64_t   flags,
         number,
         total,
         size;
@@ -1182,7 +1144,7 @@ struct _glibtop_proc_map
 @end example
 
 Returns a @code{glibtop_map_entry *} list (which needs to be freed with
-@code{g_free}) of memory maps of process @code{pid}.
+@code{glibtop_free}) of memory maps of process @code{pid}.
 
 @table @code
 @item number
@@ -1202,7 +1164,7 @@ typedef struct _glibtop_map_entry       glibtop_map_entry;
 
 struct _glibtop_map_entry
 @{
-    guint64 flags, start, end, offset, perm, inode, device;
+    u_int64_t flags, start, end, offset, perm, inode, device;
     char filename [GLIBTOP_MAP_FILENAME_LEN+1];
 @};
 @end cartouche
@@ -1213,13 +1175,13 @@ fields are valid:
 
 @example
 @cartouche
-#define GLIBTOP_MAP_ENTRY_START         0
-#define GLIBTOP_MAP_ENTRY_END           1
-#define GLIBTOP_MAP_ENTRY_OFFSET        2
-#define GLIBTOP_MAP_ENTRY_PERM          3
-#define GLIBTOP_MAP_ENTRY_INODE         4
-#define GLIBTOP_MAP_ENTRY_DEVICE        5
-#define GLIBTOP_MAP_ENTRY_FILENAME      6
+#define GLIBTOP_MAP_ENTRY_START         1
+#define GLIBTOP_MAP_ENTRY_END           2
+#define GLIBTOP_MAP_ENTRY_OFFSET        3
+#define GLIBTOP_MAP_ENTRY_PERM          4
+#define GLIBTOP_MAP_ENTRY_INODE         5
+#define GLIBTOP_MAP_ENTRY_DEVICE        6
+#define GLIBTOP_MAP_ENTRY_FILENAME      7
 @end cartouche
 @end example
 
@@ -1260,7 +1222,7 @@ typedef struct _glibtop_netload glibtop_netload;
 
 struct _glibtop_netload
 @{
-    guint64   flags,
+    u_int64_t   flags,
         if_flags,
         mtu,
         subnet,
@@ -1367,7 +1329,7 @@ typedef struct _glibtop_ppp     glibtop_ppp;
 
 struct _glibtop_ppp
 @{
-    guint64   flags,
+    u_int64_t   flags,
         state,
         bytes_in,
         bytes_out;
@@ -1447,7 +1409,7 @@ typedef struct _glibtop_mountlist       glibtop_mountlist;
 
 struct _glibtop_mountlist
 @{
-    guint64   flags,
+    u_int64_t   flags,
         number,
         total,
         size;
@@ -1456,7 +1418,7 @@ struct _glibtop_mountlist
 @end example
 
 Returns a @code{glibtop_mountentry *} list (which needs to be freed with
-@code{g_free}) of mounted filesystems.
+@code{glibtop_free}) of mounted filesystems.
 
 @table @code
 @item number
@@ -1476,7 +1438,7 @@ typedef struct _glibtop_mountentry      glibtop_mountentry;
 
 struct _glibtop_mountentry
 @{
-    guint64 dev;
+    u_int64_t dev;
     char devname [GLIBTOP_MOUNTENTRY_LEN+1];
     char mountdir [GLIBTOP_MOUNTENTRY_LEN+1];
     char type [GLIBTOP_MOUNTENTRY_LEN+1];
@@ -1526,15 +1488,12 @@ typedef struct _glibtop_fsusage         glibtop_fsusage;
 
 struct _glibtop_fsusage
 @{
-    guint64   flags,
+    u_int64_t   flags,
         blocks,
         bfree,
         bavail,
         files,
         ffree;
-    guint32   block_size;
-    guint64 read,
-        write;
 @};
 @end cartouche
 @end example
@@ -1550,14 +1509,10 @@ Free blocks available to ordinary users.
 Total file nodes.
 @item ffree
 Free file nodes.
-@item block_size
-Block size in bytes.
-@item read
-Total blocks read.
-@item write
-Total blocks written.
 @end table
 
+Blocks are usually 512 bytes.
+
 @page
 @node Library Functions,  , Common Functions, Reference Manual
 @section Library Functions
@@ -1684,7 +1639,7 @@ typedef struct _glibtop_sysdeps         glibtop_sysdeps;
 
 struct _glibtop_sysdeps
 @{
-    guint64 flags,
+    u_int64_t flags,
         features,
         pointer_size,
         cpu,

doc/white-paper.texi

@@ -1,90 +0,0 @@
-@node White Paper, Reference Manual, About, Top
-@chapter LibGTop White Paper
-
-@menu
-* Introduction::                Introduction
-* Overview::                    Overview
-@end menu
-
-@node Introduction, Overview, White Paper, White Paper
-@section Introduction
-
-Many modern UNIX systems like Solaris, BSD or Digitial Unix only allow
-priviledged processes to read information like CPU and Memory Usage or
-information about running processes.
-
-@itemize @bullet
-@item
-BSD, for instance, doesn't have any other way to get those data than reading
-directly from @file{/dev/kmem} and you need to be in the @code{kmem} group to
-be able to read this.
-
-@item
-Other systems, like Digital Unix, allow all users to get things like CPU and
-Memory statistics, but only root may read information about any process other
-than the current one (you may not even get information about your own processes
-if you're not root).
-
-@item
-Linux has a very nice @file{/proc} filesystem, but reading and parsing
-@file{/proc} is very slow and inefficient.
-
-@item
-Solaris is a bit better, but you still need to be in the @code{sys} group or
-even root to get some data.
-@end itemize
-
-Because of this system utilities like @code{ps}, @code{uptime} or @code{top}
-often are setgid kmem or setuid root. Usually, they're also very specific to
-the system they're written for and not easily portable to other systems without
-a lot of work.
-
-This, of cause, becomes a problem for graphical tools like @code{gtop} - making
-a GTK+ program setgid or even setuid would be a security hole as big as you can
-drive the entire X11 source code through. For the GNOME project, we also needed
-some kind of library which provides all the required information in a portable
-since there's more than just one single program that wants to use them - for
-instance @code{gtop} and the @code{multiload}, @code{cpumemusage} and
-@code{netload} panel applets.
-
-@node Overview,  , Introduction, White Paper
-@section Overview
-
-This section should give you a short overview on how LibGTop was developed, which
-things needed to be considered and how it works.
-
-@menu
-* Interface Design::            Things that need to be considered
-* Server Implementation::       The LibGTop "server"
-@end menu
-
-@node Interface Design, Server Implementation, Overview, Overview
-@subsection Interface Design
-
-At the very beginning, it was necessary to collect all the data the library part
-should provide and put them into some C structures. This was not that easiy as it
-might sound since LibGTop should be portable to any modern UNIX system with a common
-library part on all those systems, but the data that should be returned vary from
-system to system. For instance some systems support shared memory, but some others
-may not.
-
-The header files where we define these C structures (which are system-independent) are
-shared between client and server. This way we can call the system dependent code
-directly where we do not need any special privileges to do so.
-
-All of those structures contain a @code{flags} member which is interpreted as a bit
-mask and tells the caller of the library functions which of the fields in the returned
-structure are valid and which are not.
-
-@node Server Implementation,  , Interface Design, Overview
-@subsection Server Implementation
-
-The LibGTop @dfn{server} is a setgid/setuid binary which contains all the system
-dependent code which needs special privileges. It is only build if it's required
-on the current system (for instance, the Linux kernel provides all the required
-data via its @file{/proc} filesystem so we do not need the server at all) and it
-only contains the @dfn{features} which need privileges.
-
-Whenever we do not need any privileges to get all the data for some of the requested
-structures (here called @dfn{features}) the library calls the sysdeps code directly
-rather than using the server.

examples/.cvsignore

@@ -14,13 +14,3 @@ second_linux
 smp_static sysdeps_static netload_static procmap_static mountlist_static
 smp sysdeps netload procmap mountlist
 timings timings_static
-pprint
-pprint_static
-procargs
-procargs_static
-df
-df_static
-netlist
-netlist_static
-openfiles
-openfiles_static

examples/ChangeLog

@@ -1,130 +1,3 @@
-2005-08-02  Benoît Dejean  <TazForEver@dlfp.org>
-
-	* pprint.c: (pprint_get_cpu), (pprint_get_loadavg),
-	(pprint_get_mem), (pprint_get_msg_limits), (pprint_get_netlist),
-	(pprint_get_swap), (pprint_get_uptime), (pprint_get_proc_kernel),
-	(main):
-
-	Added pprint_get_proc_kernel(pid).
-	Fixed prototypes.
-
-2005-01-22  Benoît Dejean  <TazForEver@dlfp.org>
-
-	* openfiles.c: (show_open_files): Updated.
-
-2004-12-23  Benoît Dejean  <tazforever@dlfp.org>
-
-	* netload.c: (main):
-	* procmap.c: (main): s/glibtop_error/g_error/g
-
-2004-11-15  Benoît Dejean  <tazforever@dlfp.org>
-
-	* netload.c: (hwaddress_format_for_display), (main): Updated.
-
-2004-11-13  Benoît Dejean  <tazforever@dlfp.org>
-
-	* pprint.c: (pprint_get_fsusage), (pprint_get_mountlist),
-	(pprint_get_netload), (pprint_get_netlist), (main): Updated.
-
-2004-09-25  Benoît Dejean  <tazforever@dlfp.org>
-
-	* pprint.c: (main): Re-added pprint_get_msg_limits()
-
-i2004-09-25  Benoît Dejean  <tazforever@dlfp.org>
-
-	* df.c: (main):
-	* pprint.c: (main):
-	* procargs.c: (main): Added missing call to glibgtop_init() / glibtop_close()
-
-2004-09-24  Benoît Dejean  <tazforever@dlfp.org>
-
-	* .cvsignore:
-	* Makefile.am:
-	* ../configure.in
-	* df.c: (print_fsusage), (main): Added new example, just like 'df'.
-
-2004-09-22  Benoît Dejean  <tazforever@dlfp.org>
-
-	* pprint.c: (main): Disable pprint_get_msg_limits() because it can fail.
-
-2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
-
-	* pprint.c: (pprint_get_swap), (main): Updated.
-
-2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
-
-	* procargs.c: (show_args), (main): Updated.
-
-2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
-
-	* pprint.c: (pprint_get_mountlist), (pprint_get_netload),
-	(pprint_get_uptime), (main): Updated.
-
-2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
-
-	* pprint.c: (pprint_get_mountlist): Updated.
-
-2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
-
-	* procargs.c: (show_args), (main): Updated.
-
-2004-09-20  Benoît Dejean  <tazforever@dlfp.org>
-
-	* .cvsignore:
-	* Makefile.am:
-	* pprint.c: (pprint_get_cpu), (pprint_get_fsusage),
-	(pprint_get_loadavg), (pprint_get_mem), (pprint_get_mountlist),
-	(pprint_get_msg_limits), (main): Added new example : pretty prints
-	the result of glibtop_*. Work in progress.
-	
-	Now builds procargs.
-	
-	* ../configure.in: Added to static list.
-
-2004-07-07  Benoît Dejean  <tazforever@dlfp.org>
-
-	* procargs.c: Added glibtop_get_proc_argv demo.
-
-2003-12-27  Ole Laursen  <olau@hardworking.dk>
-
-	* mountlist.c: Updated to display block size too.
-
-2004-03-04  Bastien Nocera  <hadess@hadess.net>
-
-	* smp.c: use libgtop-i18n.h
-
-2003-10-21  Bastien Nocera  <hadess@hadess.net>
-
-	* Makefile.am:
-	* smp.c:
-	* sysdeps.c: (main): install only one library, libgtop-2.0
-	Fix build-time warnings due to the redefinition of guint64
-	Fix building smp.c and sysdeps.c
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* first.c:
-	* mountlist.c:
-	* netload.c:
-	* procmap.c:
-	* second.c:
-	* smp.c:
-	* sysdeps.c:
-	* third.c:
-	* timings.c: fixed compilation
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* Makefile.am: removed traces of guile, intllibs and libgnomesupport
-
-2001-01-14  Abel Cheung  <maddog@linux.org.hk>
-
-	* \*.c: bindtextdomain and textdomain uses GETTEXT_PACKAGE.
-
-	* Makefile.am, first.c, second.c, sysdeps.c: Make them at least
-	compile for now, by disabling chunks which should belong to
-	HEAD branch.
-
 1999-05-28  Martin Baulig  <martin@home-of-linux.org>
 
 	* first.c, second.c, sysdeps.c: Use LibGTop version conditionals
@@ -137,7 +10,7 @@ i2004-09-25  Benoît Dejean  <tazforever@dlfp.org>
 
 Fri Apr  9 00:14:52 1999 Timur Bakeyev  <timur@gnu.org>
 
-	* timings.c: Added timersub defenition, to make code compilable on
+	* timings.c: Added timersub defenition, to make code compilable on 
 	BSDI.
 
 1999-03-24  Martin Baulig  <martin@home-of-linux.org>
@@ -203,11 +76,11 @@ Fri Apr  9 00:14:52 1999 Timur Bakeyev  <timur@gnu.org>
 1998-06-12  Martin Baulig  <martin@home-of-linux.org>
 
 	* test.scm: New file.
-
+	
 1998-06-07  Martin Baulig  <martin@home-of-linux.org>
 
 	* Makefile.am (CFLAGS): Disable optimize.
-
+	
 	* first.c (PROFILE_COUNT): Number of times each function
 	should be called. Defaults to 1; to profile the code, you
 	can increase this when compiling.

examples/Makefile.am

@@ -6,45 +6,116 @@ INCLUDES		= @INCLUDES@
 
 DEFS			= @DEFS@
 
-noinst_PROGRAMS	= 	first second pprint procargs df netlist \
+# We install it in `libexec' since this will make it more easy
+# to put the examples into an extra RPM package.
+
+libgtopdir		= $(libexecdir)/libgtop
+
+libgtop_PROGRAMS	= first second\
 			  mountlist procmap netload sysdeps timings \
-			  openfiles smp
+			  @static_targets@ @guile_examples@ @smp_examples@
+
+EXTRA_PROGRAMS		= first_static second_static \
+			  mountlist_static procmap_static \
+			  third third_static smp smp_static \
+			  netload_static sysdeps_static \
+			  timings_static
 
 first_SOURCES		= first.c
-first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+first_LDADD		= $(top_builddir)/lib/libgtop.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+			  @LIBSUPPORT@ @INTLLIBS@
+
+first_static_SOURCES	= $(first_SOURCES)
+first_static_LDADD	= $(first_LDADD)
+first_static_LDFLAGS	= -static
 
 second_SOURCES		= second.c
-second_LDADD		= $(top_builddir)/lib/libgtop-2.0.la -lm
+second_LDADD		= $(top_builddir)/lib/libgtop.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+			  @LIBSUPPORT@ @INTLLIBS@
+
+second_static_SOURCES	= $(second_SOURCES)
+second_static_LDADD	= $(second_LDADD)
+second_static_LDFLAGS	= -static
 
 procmap_SOURCES		= procmap.c
-procmap_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+procmap_LDADD		= $(top_builddir)/lib/libgtop.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+			  @LIBSUPPORT@ @INTLLIBS@
+
+
+
+procmap_static_SOURCES	= $(procmap_SOURCES)
+procmap_static_LDADD	= $(procmap_LDADD)
+procmap_static_LDFLAGS	= -static
 
 netload_SOURCES		= netload.c
-netload_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+netload_LDADD		= $(top_builddir)/lib/libgtop.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+			  @LIBSUPPORT@ @INTLLIBS@
+
+netload_static_SOURCES	= $(netload_SOURCES)
+netload_static_LDADD	= $(netload_LDADD)
+netload_static_LDFLAGS	= -static
 
 sysdeps_SOURCES		= sysdeps.c
-sysdeps_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+sysdeps_LDADD		= $(top_builddir)/lib/libgtop.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+			  @LIBSUPPORT@ @INTLLIBS@
+
+sysdeps_static_SOURCES	= $(sysdeps_SOURCES)
+sysdeps_static_LDADD	= $(sysdeps_LDADD)
+sysdeps_static_LDFLAGS	= -static
+
+third_guile_names_LIBS	= $(top_builddir)/sysdeps/guile/names/libgtop_guile_names.la
+third_names_LIBS	= $(top_builddir)/sysdeps/names/libgtop_names.la
+
+third_SOURCES		= third.c
+third_LDADD		= $(top_builddir)/sysdeps/guile/libgtop_guile.la \
+			  $(third_guile_names_LIBS) $(third_names_LIBS) \
+			  $(top_builddir)/lib/libgtop.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+			  @GUILE_LIBS@ @LIBSUPPORT@ @INTLLIBS@
+
+third_static_SOURCES	= $(third_SOURCES)
+third_static_LDADD	= $(third_LDADD)
+third_static_LDFLAGS	= -static
 
 mountlist_SOURCES	= mountlist.c
-mountlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+mountlist_LDADD		= $(top_builddir)/lib/libgtop.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+			  @LIBSUPPORT@ @INTLLIBS@
+
+mountlist_static_SOURCES= $(mountlist_SOURCES)
+mountlist_static_LDADD	= $(mountlist_LDADD)
+mountlist_static_LDFLAGS= -static
+
 
 smp_SOURCES		= smp.c
-smp_LDADD		= $(top_builddir)/lib/libgtop-2.0.la -lm
+smp_LDADD		= $(top_builddir)/lib/libgtop.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+			  @LIBSUPPORT@ @INTLLIBS@
+
+smp_static_SOURCES	= $(smp_SOURCES)
+smp_static_LDADD	= $(smp_LDADD)
+smp_static_LDFLAGS	= -static
 
 timings_SOURCES		= timings.c
-timings_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+timings_LDADD		= $(top_builddir)/lib/libgtop.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+			  @LIBSUPPORT@ @INTLLIBS@
 
-pprint_SOURCES	        = pprint.c
-pprint_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+timings_static_SOURCES	= $(timings_SOURCES)
+timings_static_LDADD	= $(timings_LDADD)
+timings_static_LDFLAGS	= -static
 
-procargs_SOURCES	  = procargs.c
-procargs_LDADD		  = $(top_builddir)/lib/libgtop-2.0.la
-
-df_SOURCES	  = df.c
-df_LDADD		  = $(top_builddir)/lib/libgtop-2.0.la
-
-netlist_SOURCES		= netlist.c
-netlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
-
-openfiles_SOURCES	= openfiles.c
-openfiles_LDADD		= $(top_builddir)/lib/libgtop-2.0.la

examples/df.c

@@ -1,48 +0,0 @@
-#include <glibtop.h>
-
-#include <glibtop/fsusage.h>
-#include <glibtop/mountlist.h>
-
-#include <stdio.h>
-
-
-static void print_fsusage(const char *mountpoint)
-{
-  glibtop_fsusage buf;
-
-  glibtop_get_fsusage(&buf, mountpoint);
-
-  printf("%-20s %-10llu %-10llu %-10llu %.1f\n",
-	 mountpoint,
-	 buf.blocks * buf.block_size >> 20,
-	 (buf.blocks - buf.bavail) * buf.block_size >> 20,
-	 buf.bavail * buf.block_size >> 20,
-	 (buf.blocks - buf.bavail) * 100.0 / buf.blocks
-	 );
-}
-
-
-int main()
-{
-  glibtop_mountlist buf;
-  glibtop_mountentry *entries;
-  size_t i;
-
-  glibtop_init();
-
-  printf("%-20s %-10s %-10s %-10s %-10s\n",
-	 "Filesystem", "Size", "Used", "Avail", "Use%");
-
-  entries = glibtop_get_mountlist(&buf, FALSE);
-
-  for(i = 0; i < buf.number; ++i)
-    {
-      print_fsusage(entries[i].mountdir);
-    }
-
-  g_free(entries);
-
-  glibtop_close();
-
-  return 0;
-}

examples/first.c

@@ -22,12 +22,11 @@
 */
 
 #include <locale.h>
-#include <libintl.h>
-#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
+#include <glibtop/xmalloc.h>
 
 #include <glibtop/parameter.h>
 
@@ -53,9 +52,9 @@ main (int argc, char *argv [])
 	count = PROFILE_COUNT;
 
 	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
+	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
+	textdomain (PACKAGE);
+	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 
 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
@@ -117,9 +116,16 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_uptime (&data.uptime);
 
+#if LIBGTOP_VERSION_CODE > 1001000
+	printf ("Uptime       (0x%08lx): %f, %f, %lu\n",
+		(unsigned long) data.uptime.flags,
+		data.uptime.uptime, data.uptime.idletime,
+		(unsigned long) data.uptime.boot_time);
+#else
 	printf ("Uptime       (0x%08lx): %f, %f\n",
 		(unsigned long) data.uptime.flags,
 		data.uptime.uptime, data.uptime.idletime);
+#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_loadavg (&data.loadavg);
@@ -135,7 +141,7 @@ main (int argc, char *argv [])
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_shm_limits (&data.shm_limits);
-
+	
 	printf ("Shm Limits   (0x%08lx): %lu, %lu, %lu, %lu, %lu\n",
 		(unsigned long) data.shm_limits.flags,
 		(unsigned long) data.shm_limits.shmmax,
@@ -159,7 +165,7 @@ main (int argc, char *argv [])
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_sem_limits (&data.sem_limits);
-
+	
 	printf ("Sem Limits   (0x%08lx): "
 		"%lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu\n",
 		(unsigned long) data.sem_limits.flags,
@@ -217,7 +223,7 @@ main (int argc, char *argv [])
 		(unsigned long) sysdeps.ppp);
 
 	printf ("\n");
-
+	
 	ptr = glibtop_get_proclist (&data.proclist, 0, 0);
 
 	printf ("Proclist     (0x%08lx): %lu, %lu, %lu\n",
@@ -233,7 +239,7 @@ main (int argc, char *argv [])
 		printf ("\n");
 	}
 
-	g_free (ptr);
+	glibtop_free (ptr);
 
 	pid = getpid ();
 	ppid = getppid ();
@@ -243,15 +249,52 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_state (&data.proc_state, pid);
 
+#if LIBGTOP_VERSION_CODE > 1001000
+	printf ("Proc_State   PID  %5d (0x%08lx): '%s', %u - "
+		"%u, %u, %u, %u - %u, %u, %u\n", (int) pid,
+		(unsigned long) data.proc_state.flags,
+		data.proc_state.cmd, data.proc_state.state,
+		data.proc_state.uid, data.proc_state.gid,
+		data.proc_state.ruid, data.proc_state.rgid,
+		data.proc_state.has_cpu, data.proc_state.processor,
+		data.proc_state.last_processor);
+#else
 	printf ("Proc_State   PID  %5d (0x%08lx): '%s', %c, %lu, %lu\n",
 		(int) pid, (unsigned long) data.proc_state.flags,
 		data.proc_state.cmd, data.proc_state.state,
 		(unsigned long) data.proc_state.uid,
 		(unsigned long) data.proc_state.gid);
+#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_uid (&data.proc_uid, pid);
 
+#if LIBGTOP_VERSION_CODE > 1001000
+	printf ("Proc_Uid     PID  %5d (0x%08lx): "
+		"%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d - %d",
+		(int) pid, (unsigned long) data.proc_uid.flags,
+		data.proc_uid.uid, data.proc_uid.euid,
+		data.proc_uid.gid, data.proc_uid.egid,
+		data.proc_uid.suid, data.proc_uid.sgid,
+		data.proc_uid.fsuid, data.proc_uid.fsgid,
+		data.proc_uid.pid, data.proc_uid.ppid,
+		data.proc_uid.pgrp, data.proc_uid.session,
+		data.proc_uid.tty, data.proc_uid.tpgid,
+		data.proc_uid.priority, data.proc_uid.nice,
+		data.proc_uid.ngroups);
+
+	if (data.proc_uid.ngroups) {
+		for (i = 0; i < data.proc_uid.ngroups; i++) {
+			if (i)
+				printf (" %d", data.proc_uid.groups [i]);
+			else
+				printf (" (%d", data.proc_uid.groups [i]);
+		}
+		printf (")");
+	}
+
+	printf ("\n");
+#else
 	printf ("Proc_Uid     PID  %5d (0x%08lx): "
 		"%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) pid,
 		(unsigned long) data.proc_uid.flags,
@@ -261,6 +304,7 @@ main (int argc, char *argv [])
 		data.proc_uid.pgrp, data.proc_uid.session,
 		data.proc_uid.tty, data.proc_uid.tpgid,
 		data.proc_uid.priority, data.proc_uid.nice);
+#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_mem (&data.proc_mem, pid);
@@ -278,6 +322,30 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_segment (&data.proc_segment, pid);
 
+#if LIBGTOP_VERSION_CODE > 1001000
+	printf ("Proc_Segment PID  %5d (0x%08lx): "
+		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx "
+		"0x%lx 0x%lx 0x%lx 0x%lx 0x%lx "
+		"0x%lx 0x%lx 0x%lx 0x%lx\n", (int) pid,
+		(unsigned long) data.proc_segment.flags,
+		(unsigned long) data.proc_segment.text_rss,
+		(unsigned long) data.proc_segment.shlib_rss,
+		(unsigned long) data.proc_segment.data_rss,
+		(unsigned long) data.proc_segment.stack_rss,
+		(unsigned long) data.proc_segment.dirty_size,
+		(unsigned long) data.proc_segment.start_code,
+		(unsigned long) data.proc_segment.end_code,
+		(unsigned long) data.proc_segment.start_data,
+		(unsigned long) data.proc_segment.end_data,
+		(unsigned long) data.proc_segment.start_brk,
+		(unsigned long) data.proc_segment.end_brk,
+		(unsigned long) data.proc_segment.start_stack,
+		(unsigned long) data.proc_segment.start_mmap,
+		(unsigned long) data.proc_segment.arg_start,
+		(unsigned long) data.proc_segment.arg_end,
+		(unsigned long) data.proc_segment.env_start,
+		(unsigned long) data.proc_segment.env_end);
+#else
 	printf ("Proc_Segment PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_segment.flags,
@@ -289,6 +357,7 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_segment.start_code,
 		(unsigned long) data.proc_segment.end_code,
 		(unsigned long) data.proc_segment.start_stack);
+#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_time (&data.proc_time, pid);
@@ -308,7 +377,20 @@ main (int argc, char *argv [])
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_signal (&data.proc_signal, pid);
-
+	
+#if LIBGTOP_VERSION_CODE > 1001000
+	printf ("Proc_Signal  PID  %5d (0x%08lx): "
+		"%lx %lx %lx %lx %lx %lx %lx %lx\n", (int) pid,
+		(unsigned long) data.proc_signal.flags,
+		(unsigned long) data.proc_signal.signal [0],
+		(unsigned long) data.proc_signal.signal [1],
+		(unsigned long) data.proc_signal.blocked [0],
+		(unsigned long) data.proc_signal.blocked [1],
+		(unsigned long) data.proc_signal.sigignore [0],
+		(unsigned long) data.proc_signal.sigignore [1],
+		(unsigned long) data.proc_signal.sigcatch [0],
+		(unsigned long) data.proc_signal.sigcatch [1]);
+#else
 	printf ("Proc_Signal  PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_signal.flags,
@@ -316,6 +398,7 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_signal.blocked,
 		(unsigned long) data.proc_signal.sigignore,
 		(unsigned long) data.proc_signal.sigcatch);
+#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_kernel (&data.proc_kernel, pid);
@@ -347,22 +430,59 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_args.size,
 		args ? args : "");
 
-	g_free (args);
+	glibtop_free (args);
 
 	printf ("\n");
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_state (&data.proc_state, ppid);
 
+#if LIBGTOP_VERSION_CODE > 1001000
+	printf ("Proc_State   PPID %5d (0x%08lx): '%s', %u - "
+		"%u, %u, %u, %u - %u, %u, %u\n", (int) ppid,
+		(unsigned long) data.proc_state.flags,
+		data.proc_state.cmd, data.proc_state.state,
+		data.proc_state.uid, data.proc_state.gid,
+		data.proc_state.ruid, data.proc_state.rgid,
+		data.proc_state.has_cpu, data.proc_state.processor,
+		data.proc_state.last_processor);
+#else
 	printf ("Proc_State   PPID %5d (0x%08lx): '%s', %c, %lu, %lu\n",
 		(int) ppid, (unsigned long) data.proc_state.flags,
 		data.proc_state.cmd, data.proc_state.state,
 		(unsigned long) data.proc_state.uid,
 		(unsigned long) data.proc_state.gid);
+#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_uid (&data.proc_uid, ppid);
 
+#if LIBGTOP_VERSION_CODE > 1001000
+	printf ("Proc_Uid     PPID %5d (0x%08lx): "
+		"%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d - %d",
+		(int) ppid, (unsigned long) data.proc_uid.flags,
+		data.proc_uid.uid, data.proc_uid.euid,
+		data.proc_uid.gid, data.proc_uid.egid,
+		data.proc_uid.suid, data.proc_uid.sgid,
+		data.proc_uid.fsuid, data.proc_uid.fsgid,
+		data.proc_uid.pid, data.proc_uid.ppid,
+		data.proc_uid.pgrp, data.proc_uid.session,
+		data.proc_uid.tty, data.proc_uid.tpgid,
+		data.proc_uid.priority, data.proc_uid.nice,
+		data.proc_uid.ngroups);
+
+	if (data.proc_uid.ngroups) {
+		for (i = 0; i < data.proc_uid.ngroups; i++) {
+			if (i)
+				printf (" %d", data.proc_uid.groups [i]);
+			else
+				printf (" (%d", data.proc_uid.groups [i]);
+		}
+		printf (")");
+	}
+
+	printf ("\n");
+#else
 	printf ("Proc_Uid     PPID %5d (0x%08lx): "
 		"%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) ppid,
 		(unsigned long) data.proc_uid.flags,
@@ -372,6 +492,7 @@ main (int argc, char *argv [])
 		data.proc_uid.pgrp, data.proc_uid.session,
 		data.proc_uid.tty, data.proc_uid.tpgid,
 		data.proc_uid.priority, data.proc_uid.nice);
+#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_mem (&data.proc_mem, ppid);
@@ -389,6 +510,30 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_segment (&data.proc_segment, ppid);
 
+#if LIBGTOP_VERSION_CODE > 1001000
+	printf ("Proc_Segment PPID %5d (0x%08lx): "
+		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx "
+		"0x%lx 0x%lx 0x%lx 0x%lx 0x%lx "
+		"0x%lx 0x%lx 0x%lx 0x%lx\n", (int) ppid,
+		(unsigned long) data.proc_segment.flags,
+		(unsigned long) data.proc_segment.text_rss,
+		(unsigned long) data.proc_segment.shlib_rss,
+		(unsigned long) data.proc_segment.data_rss,
+		(unsigned long) data.proc_segment.stack_rss,
+		(unsigned long) data.proc_segment.dirty_size,
+		(unsigned long) data.proc_segment.start_code,
+		(unsigned long) data.proc_segment.end_code,
+		(unsigned long) data.proc_segment.start_data,
+		(unsigned long) data.proc_segment.end_data,
+		(unsigned long) data.proc_segment.start_brk,
+		(unsigned long) data.proc_segment.end_brk,
+		(unsigned long) data.proc_segment.start_stack,
+		(unsigned long) data.proc_segment.start_mmap,
+		(unsigned long) data.proc_segment.arg_start,
+		(unsigned long) data.proc_segment.arg_end,
+		(unsigned long) data.proc_segment.env_start,
+		(unsigned long) data.proc_segment.env_end);
+#else
 	printf ("Proc_Segment PPID %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu %lu %lu\n", (int) ppid,
 		(unsigned long) data.proc_segment.flags,
@@ -400,6 +545,7 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_segment.start_code,
 		(unsigned long) data.proc_segment.end_code,
 		(unsigned long) data.proc_segment.start_stack);
+#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_time (&data.proc_time, ppid);
@@ -420,12 +566,26 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_signal (&data.proc_signal, ppid);
 
+#if LIBGTOP_VERSION_CODE > 1001000
+	printf ("Proc_Signal  PPID %5d (0x%08lx): "
+		"%lx %lx %lx %lx %lx %lx %lx %lx\n",
+		(int) ppid, (unsigned long) data.proc_signal.flags,
+		(unsigned long) data.proc_signal.signal [0],
+		(unsigned long) data.proc_signal.signal [1],
+		(unsigned long) data.proc_signal.blocked [0],
+		(unsigned long) data.proc_signal.blocked [1],
+		(unsigned long) data.proc_signal.sigignore [0],
+		(unsigned long) data.proc_signal.sigignore [1],
+		(unsigned long) data.proc_signal.sigcatch [0],
+		(unsigned long) data.proc_signal.sigcatch [1]);
+#else
 	printf ("Proc_Signal  PPID %5d (0x%08lx): %lu %lu %lu %lu\n",
 		(int) ppid, (unsigned long) data.proc_signal.flags,
 		(unsigned long) data.proc_signal.signal,
 		(unsigned long) data.proc_signal.blocked,
 		(unsigned long) data.proc_signal.sigignore,
 		(unsigned long) data.proc_signal.sigcatch);
+#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_kernel (&data.proc_kernel, ppid);
@@ -457,22 +617,59 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_args.size,
 		args ? args : "");
 
-	g_free (args);
+	glibtop_free (args);
 
 	printf ("\n");
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_state (&data.proc_state, 1);
 
+#if LIBGTOP_VERSION_CODE > 1001000
+	printf ("Proc_State   INIT %5d (0x%08lx): '%s', %u - "
+		"%u, %u, %u, %u - %u, %u, %u\n", 1,
+		(unsigned long) data.proc_state.flags,
+		data.proc_state.cmd, data.proc_state.state,
+		data.proc_state.uid, data.proc_state.gid,
+		data.proc_state.ruid, data.proc_state.rgid,
+		data.proc_state.has_cpu, data.proc_state.processor,
+		data.proc_state.last_processor);
+#else
 	printf ("Proc_State   INIT %5d (0x%08lx): '%s', %c, %lu, %lu\n", 1,
 		(unsigned long) data.proc_state.flags,
 		data.proc_state.cmd, data.proc_state.state,
 		(unsigned long) data.proc_state.uid,
 		(unsigned long) data.proc_state.gid);
+#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_uid (&data.proc_uid, 1);
 
+#if LIBGTOP_VERSION_CODE > 1001000
+	printf ("Proc_Uid     INIT %5d (0x%08lx): "
+		"%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d - %d", 1,
+		(unsigned long) data.proc_uid.flags,
+		data.proc_uid.uid, data.proc_uid.euid,
+		data.proc_uid.gid, data.proc_uid.egid,
+		data.proc_uid.suid, data.proc_uid.sgid,
+		data.proc_uid.fsuid, data.proc_uid.fsgid,
+		data.proc_uid.pid, data.proc_uid.ppid,
+		data.proc_uid.pgrp, data.proc_uid.session,
+		data.proc_uid.tty, data.proc_uid.tpgid,
+		data.proc_uid.priority, data.proc_uid.nice,
+		data.proc_uid.ngroups);
+
+	if (data.proc_uid.ngroups) {
+		for (i = 0; i < data.proc_uid.ngroups; i++) {
+			if (i)
+				printf (" %d", data.proc_uid.groups [i]);
+			else
+				printf (" (%d", data.proc_uid.groups [i]);
+		}
+		printf (")");
+	}
+
+	printf ("\n");
+#else
 	printf ("Proc_Uid     INIT %5d (0x%08lx): "
 		"%d %d %d %d %d %d %d %d %d %d %d %d\n", 1,
 		(unsigned long) data.proc_uid.flags,
@@ -482,6 +679,7 @@ main (int argc, char *argv [])
 		data.proc_uid.pgrp, data.proc_uid.session,
 		data.proc_uid.tty, data.proc_uid.tpgid,
 		data.proc_uid.priority, data.proc_uid.nice);
+#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_mem (&data.proc_mem, 1);
@@ -499,6 +697,30 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_segment (&data.proc_segment, 1);
 
+#if LIBGTOP_VERSION_CODE > 1001000
+	printf ("Proc_Segment INIT %5d (0x%08lx): "
+		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx "
+		"0x%lx 0x%lx 0x%lx 0x%lx 0x%lx "
+		"0x%lx 0x%lx 0x%lx 0x%lx\n", 1,
+		(unsigned long) data.proc_segment.flags,
+		(unsigned long) data.proc_segment.text_rss,
+		(unsigned long) data.proc_segment.shlib_rss,
+		(unsigned long) data.proc_segment.data_rss,
+		(unsigned long) data.proc_segment.stack_rss,
+		(unsigned long) data.proc_segment.dirty_size,
+		(unsigned long) data.proc_segment.start_code,
+		(unsigned long) data.proc_segment.end_code,
+		(unsigned long) data.proc_segment.start_data,
+		(unsigned long) data.proc_segment.end_data,
+		(unsigned long) data.proc_segment.start_brk,
+		(unsigned long) data.proc_segment.end_brk,
+		(unsigned long) data.proc_segment.start_stack,
+		(unsigned long) data.proc_segment.start_mmap,
+		(unsigned long) data.proc_segment.arg_start,
+		(unsigned long) data.proc_segment.arg_end,
+		(unsigned long) data.proc_segment.env_start,
+		(unsigned long) data.proc_segment.env_end);
+#else
 	printf ("Proc_Segment INIT %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu %lu %lu\n", 1,
 		(unsigned long) data.proc_segment.flags,
@@ -510,6 +732,7 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_segment.start_code,
 		(unsigned long) data.proc_segment.end_code,
 		(unsigned long) data.proc_segment.start_stack);
+#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_time (&data.proc_time, 1);
@@ -530,6 +753,19 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_signal (&data.proc_signal, 1);
 
+#if LIBGTOP_VERSION_CODE > 1001000
+	printf ("Proc_Signal  INIT %5d (0x%08lx): "
+		"%lx %lx %lx %lx %lx %lx %lx %lx\n", 1,
+		(unsigned long) data.proc_signal.flags,
+		(unsigned long) data.proc_signal.signal [0],
+		(unsigned long) data.proc_signal.signal [1],
+		(unsigned long) data.proc_signal.blocked [0],
+		(unsigned long) data.proc_signal.blocked [1],
+		(unsigned long) data.proc_signal.sigignore [0],
+		(unsigned long) data.proc_signal.sigignore [1],
+		(unsigned long) data.proc_signal.sigcatch [0],
+		(unsigned long) data.proc_signal.sigcatch [1]);
+#else
 	printf ("Proc_Signal  INIT %5d (0x%08lx): "
 		"%lu %lu %lu %lu\n", 1,
 		(unsigned long) data.proc_signal.flags,
@@ -537,6 +773,7 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_signal.blocked,
 		(unsigned long) data.proc_signal.sigignore,
 		(unsigned long) data.proc_signal.sigcatch);
+#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_kernel (&data.proc_kernel, 1);
@@ -568,7 +805,7 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_args.size,
 		args ? args : "");
 
-	g_free (args);
+	glibtop_free (args);
 
 	glibtop_close ();
 

examples/mountlist.c

@@ -22,12 +22,11 @@
 */
 
 #include <locale.h>
-#include <libintl.h>
-#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
+#include <glibtop/xmalloc.h>
 
 #include <glibtop/parameter.h>
 
@@ -48,13 +47,13 @@ main (int argc, char *argv [])
 	char buffer [BUFSIZ];
 
 	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
+	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
+	textdomain (PACKAGE);
+	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 
 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
-
+	
 	printf ("Method = %d\n", method);
 
 	count = glibtop_get_parameter (GLIBTOP_PARAM_COMMAND, buffer, BUFSIZ);
@@ -74,7 +73,7 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++) {
 		mount_entries = glibtop_get_mountlist (&mount_list, 1);
 
-		g_free (mount_entries);
+		glibtop_free (mount_entries);
 	}
 
 	printf ("sbrk (0) = %p\n\n", sbrk (0));
@@ -90,21 +89,21 @@ main (int argc, char *argv [])
 			mount_entries [index].type,
 			mount_entries [index].devname);
 
-	printf ("\n\n%-16s %9s %9s %9s %9s %9s %9s\n",
-		"Mount", "Blocks", "Free", "Avail", "Files", "Free", "BlockSz");
+	printf ("\n\n%-23s %9s %9s %9s %9s %9s\n\n",
+		"", "Blocks", "Free", "Avail", "Files", "Free");
 
 	for (index = 0; index < mount_list.number; index++) {
 		glibtop_get_fsusage (&fsusage,
 				     mount_entries [index].mountdir);
 
-		printf ("%-16s %9Lu %9Lu %9Lu %9Lu %9Lu %9d\n",
+		printf ("Usage: %-16s %9Lu %9Lu %9Lu %9Lu %9Lu\n",
 			mount_entries [index].mountdir,
 			fsusage.blocks, fsusage.bfree,
 			fsusage.bavail, fsusage.files,
-			fsusage.ffree, fsusage.block_size);
+			fsusage.ffree);
 	}
 
-	g_free (mount_entries);
+	glibtop_free (mount_entries);
 
 	printf ("\nsbrk (0) = %p\n\n", sbrk (0));
 

examples/netlist.c

@@ -1,46 +0,0 @@
-/* Copyright (C) 2004 Benoît Dejean
-   This file is part of LibGTop 2.0.
-
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <stdio.h>
-
-#include <glibtop.h>
-#include <glibtop/netlist.h>
-
-
-int main(int argc, char *argv [])
-{
-	glibtop_netlist buf;
-	char **devices;
-	guint32 i;
-
-	glibtop_init();
-
-	devices = glibtop_get_netlist(&buf);
-
-	for(i = 0; i < buf.number; ++i)
-	{
-		printf("net device '%s'\n", devices[i]);
-	}
-
-	g_strfreev(devices);
-
-	glibtop_close();
-	return 0;
-}

examples/netload.c

@@ -22,12 +22,11 @@
 */
 
 #include <locale.h>
-#include <libintl.h>
-#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
+#include <glibtop/xmalloc.h>
 
 #include <glibtop/parameter.h>
 
@@ -40,24 +39,6 @@
 #define PROFILE_COUNT	1
 #endif
 
-
-static char* hwaddress_format_for_display(glibtop_netload *buf)
-{
-	unsigned i;
-	GString *repr = g_string_new("");
-	char *str;
-
-	for(i = 0; i < sizeof buf->hwaddress; ++i)
-		g_string_append_printf(repr, "%02X:",
-				       (unsigned) ((char*)buf->hwaddress)[i]);
-
-	repr->str [ repr->len - 1] = ' ';
-	str = g_string_free(repr, FALSE);
-	g_strstrip(str);
-	return str;
-}
-
-
 int
 main (int argc, char *argv [])
 {
@@ -65,16 +46,14 @@ main (int argc, char *argv [])
 	unsigned method, count, port;
 	struct in_addr addr, subnet;
 	char *address_string, *subnet_string;
-	char address6_string[INET6_ADDRSTRLEN], prefix6_string[INET6_ADDRSTRLEN];
-	char *hwaddress_string;
 	char buffer [BUFSIZ];
 
 	count = PROFILE_COUNT;
 
 	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
+	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
+	textdomain (PACKAGE);
+	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 
 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
@@ -96,63 +75,49 @@ main (int argc, char *argv [])
 	glibtop_init_r (&glibtop_global_server, 0, 0);
 
 	if (argc != 2)
-		g_error ("Usage: %s interface", argv [0]);
-
+		glibtop_error ("Usage: %s interface", argv [0]);
+	
 	glibtop_get_netload (&netload, argv [1]);
 
 	addr.s_addr = netload.address;
 	subnet.s_addr = netload.subnet;
 
-	address_string = g_strdup (inet_ntoa (addr));
-	subnet_string  = g_strdup (inet_ntoa (subnet));
+	address_string = glibtop_strdup (inet_ntoa (addr));
+	subnet_string  = glibtop_strdup (inet_ntoa (subnet));
 
-	inet_ntop (AF_INET6, netload.address6, address6_string, INET6_ADDRSTRLEN);
-	inet_ntop (AF_INET6, netload.prefix6,  prefix6_string,  INET6_ADDRSTRLEN);
+	printf ("Network Load (0x%08lx):\n\n"
+		"\tInterface Flags:\t0x%08lx\n"
+		"\tAddress:\t\t0x%08lx - %s\n"
+		"\tSubnet:\t\t\t0x%08lx - %s\n\n"
+		"\tMTU:\t\t\t%ld\n"
+		"\tCollisions:\t\t%ld\n\n"
+		"\tPackets In:\t\t%ld\n"
+		"\tPackets Out:\t\t%ld\n"
+		"\tPackets Total:\t\t%ld\n\n"
+		"\tBytes In:\t\t%ld\n"
+		"\tBytes Out:\t\t%ld\n"
+		"\tBytes Total:\t\t%ld\n\n"
+		"\tErrors In:\t\t%ld\n"
+		"\tErrors Out:\t\t%ld\n"
+		"\tErrors Total:\t\t%ld\n\n",
+		(unsigned long) netload.flags,
+		(unsigned long) netload.if_flags,
+		(unsigned long) netload.address, address_string,
+		(unsigned long) netload.subnet,  subnet_string,
+		(unsigned long) netload.mtu,
+		(unsigned long) netload.collisions,
+		(unsigned long) netload.packets_in,
+		(unsigned long) netload.packets_out,
+		(unsigned long) netload.packets_total,
+		(unsigned long) netload.bytes_in,
+		(unsigned long) netload.bytes_out,
+		(unsigned long) netload.bytes_total,
+		(unsigned long) netload.errors_in,
+		(unsigned long) netload.errors_out,
+		(unsigned long) netload.errors_total);
 
-	hwaddress_string = hwaddress_format_for_display(&netload);
-
-	printf ("Network Load (0x%016llx):\n\n"
-		"\tInterface Flags:\t0x%016llx\n"
-		"\tAddress:\t\t0x%08x - %s\n"
-		"\tSubnet:\t\t\t0x%08x - %s\n\n"
-		"\tMTU:\t\t\t%d\n"
-		"\tCollisions:\t\t%llu\n\n"
-		"\tPackets In:\t\t%llu\n"
-		"\tPackets Out:\t\t%llu\n"
-		"\tPackets Total:\t\t%llu\n\n"
-		"\tBytes In:\t\t%llu\n"
-		"\tBytes Out:\t\t%llu\n"
-		"\tBytes Total:\t\t%llu\n\n"
-		"\tErrors In:\t\t%llu\n"
-		"\tErrors Out:\t\t%llu\n"
-		"\tErrors Total:\t\t%llu\n\n"
-		"\tAddress6:\t\t%s\n"
-		"\tPrefix6:\t\t%s\n"
-		"\tScope6:\t\t\t%#03x\n\n"
-		"\tHarware Address:\t%s\n\n",
-		netload.flags,
-		netload.if_flags,
-		(guint32) netload.address, address_string,
-		(guint32) netload.subnet,  subnet_string,
-		netload.mtu,
-		netload.collisions,
-		netload.packets_in,
-		netload.packets_out,
-		netload.packets_total,
-		netload.bytes_in,
-		netload.bytes_out,
-		netload.bytes_total,
-		netload.errors_in,
-		netload.errors_out,
-		netload.errors_total,
-		address6_string,
-		prefix6_string,
-		(int) netload.scope6,
-		hwaddress_string);
-
-
-	g_free (address_string);
-	g_free (subnet_string);
+	glibtop_free (address_string);
+	glibtop_free (subnet_string);
 
 	glibtop_close ();
 

examples/openfiles.c

@@ -1,64 +0,0 @@
-#include <glibtop.h>
-#include <glibtop/procopenfiles.h>
-
-#include <stdlib.h>
-
-#include <unistd.h>
-
-static void show_open_files(pid_t pid)
-{
-  glibtop_proc_open_files buf;
-  glibtop_open_files_entry *files;
-  unsigned i;
-
-  files = glibtop_get_proc_open_files(&buf, pid);
-
-  printf("<%ld>\n", (long)pid);
-
-  for(i = 0; i < buf.number; ++i)
-  {
-	  printf("\tfd = %d\t", files[i].fd);
-
-	  switch(files[i].type)
-	  {
-	  case GLIBTOP_FILE_TYPE_FILE:
-		  printf("file \"%s\"\n", files[i].info.file.name);
-		  break;
-
-	  case GLIBTOP_FILE_TYPE_PIPE:
-		  printf("pipe\n");
-		  break;
-
-	  case GLIBTOP_FILE_TYPE_INETSOCKET:
-		  printf("socket %s:%d\n", files[i].info.sock.dest_host, files[i].info.sock.dest_port);
-		  break;
-
-	  case GLIBTOP_FILE_TYPE_LOCALSOCKET:
-		  printf("localsocket %s\n", files[i].info.localsock.name);
-		  break;
-	  }
-  }
-
-  putchar('\n');
-
-  g_free(files);
-}
-
-
-int main(int argc, char **argv)
-{
-  glibtop_init();
-
-  show_open_files(getpid());
-
-  while(*++argv)
-    {
-      pid_t pid = strtol(*argv, NULL, 10);
-      show_open_files(pid);
-    }
-
-  glibtop_close();
-
-  return 0;
-}
-

examples/pprint.c

@@ -1,301 +0,0 @@
-#include <glibtop.h>
-
-#include <glibtop/union.h>
-
-#include <unistd.h>
-
-#include <stdio.h>
-#include <stddef.h>
-
-
-#define buf_offsetof(MEMBER) ((ptrdiff_t)&(buf.MEMBER) - (ptrdiff_t)&buf)
-
-#define HEADER_PPRINT(FUNC) printf("### " #FUNC " ###\nsizeof *buf = %lu B\n", \
-(unsigned long) sizeof buf)
-
-#define PPRINT(DATA, FORMAT) printf("\t%4lu B %3lu " #DATA " = " FORMAT "\n", \
-(unsigned long) sizeof buf.DATA, (unsigned long) buf_offsetof(DATA), buf.DATA)
-
-#define PPRINT_ARRAY(ARRAY, SIZE, FORMAT) do { \
-size_t i; \
-printf("\t%4lu B %3lu " #ARRAY "[%lu] = { ", \
-(unsigned long) sizeof buf.ARRAY, (unsigned long) buf_offsetof(ARRAY),\
-(unsigned long) G_N_ELEMENTS(buf.ARRAY)); \
-for(i = 0; i < (SIZE - 1); ++i) printf(".%u = " FORMAT ", ", i, buf.ARRAY[i]); \
-printf(".%u = " FORMAT " }\n", SIZE - 1 , buf.ARRAY[SIZE - 1]); \
-} while(0)
-
-#define FOOTER_PPRINT() putchar('\n');
-
-
-
-static void pprint_get_cpu(void)
-{
-  glibtop_cpu buf;
-
-  glibtop_get_cpu(&buf);
-
-  HEADER_PPRINT(glibtop_get_cpu);
-  PPRINT(flags, "%#llx");
-  PPRINT(total, "%llu");
-  PPRINT(user, "%llu");
-  PPRINT(nice, "%llu");
-  PPRINT(sys, "%llu");
-  PPRINT(idle, "%llu");
-  PPRINT(iowait, "%llu");
-  PPRINT(irq, "%llu");
-  PPRINT(softirq, "%llu");
-  PPRINT(frequency, "%llu");
-  PPRINT_ARRAY(xcpu_total, GLIBTOP_NCPU, "%llu");
-  PPRINT_ARRAY(xcpu_user, GLIBTOP_NCPU, "%llu");
-  PPRINT_ARRAY(xcpu_nice, GLIBTOP_NCPU, "%llu");
-  PPRINT_ARRAY(xcpu_sys, GLIBTOP_NCPU, "%llu");
-  PPRINT_ARRAY(xcpu_idle, GLIBTOP_NCPU, "%llu");
-  PPRINT_ARRAY(xcpu_iowait, GLIBTOP_NCPU, "%llu");
-  PPRINT_ARRAY(xcpu_irq, GLIBTOP_NCPU, "%llu");
-  PPRINT_ARRAY(xcpu_softirq, GLIBTOP_NCPU, "%llu");
-  PPRINT(xcpu_flags, "%llx");
-  FOOTER_PPRINT();
-}
-
-
-
-static void pprint_get_fsusage(const char *mountpoint)
-{
-  glibtop_fsusage buf;
-
-  glibtop_get_fsusage(&buf, mountpoint);
-
-  HEADER_PPRINT(glibtop_get_fsusage);
-  printf("pprint_get_fsusage (mountpoint = \"%s\"\n", mountpoint);
-  PPRINT(flags, "%#llx");
-  PPRINT(blocks, "%llu");
-  PPRINT(bfree, "%llu");
-  PPRINT(bavail, "%llu");
-  PPRINT(files, "%llu");
-  PPRINT(ffree, "%llu");
-  PPRINT(block_size, "%u");
-  PPRINT(read, "%llu");
-  PPRINT(write, "%llu");
-  FOOTER_PPRINT();
-}
-
-
-
-static void pprint_get_loadavg(void)
-{
-  glibtop_loadavg buf;
-
-  glibtop_get_loadavg(&buf);
-
-  HEADER_PPRINT(glibtop_get_loadavg);
-  PPRINT(flags, "%#llx");
-  PPRINT_ARRAY(loadavg, 3, "%f");
-  PPRINT(nr_running, "%llu");
-  PPRINT(nr_tasks, "%llu");
-  PPRINT(last_pid, "%llu");
-  FOOTER_PPRINT();
-}
-
-
-
-static void pprint_get_mem(void)
-{
-  glibtop_mem buf;
-
-  glibtop_get_mem(&buf);
-
-  HEADER_PPRINT(glibtop_get_mem);
-  PPRINT(flags, "%#llx");
-  PPRINT(total, "%llu");
-  PPRINT(used, "%llu");
-  PPRINT(free, "%llu");
-  PPRINT(shared, "%llu");
-  PPRINT(buffer, "%llu");
-  PPRINT(cached, "%llu");
-  PPRINT(user, "%llu");
-  PPRINT(locked, "%llu");
-  FOOTER_PPRINT();
-}
-
-
-
-static void pprint_get_mountlist(gboolean allfs)
-{
-  glibtop_mountlist buf;
-  glibtop_mountentry *entries;
-  size_t i;
-
-  entries = glibtop_get_mountlist(&buf, allfs);
-
-  HEADER_PPRINT(glibtop_get_mountlist);
-  printf("glibtop_get_mountlist (allfs = %d)\n", allfs);
-  PPRINT(flags, "%#llx");
-  PPRINT(number, "%llu");
-  PPRINT(total, "%llu");
-  PPRINT(size, "%llu");
-
-  printf("\t%4llu B entries[%llu] = \n\t\t{\n", buf.total, buf.number);
-
-  for(i = 0; i < buf.number; ++i)
-    {
-      printf("\t\t .%lu = { .dev = %#llx,"
-	     " .devname = \"%s\","
-	     " .mountir = \"%s\","
-	     " .type = \"%s\" }\n",
-	     (unsigned long) i, entries[i].dev,
-	     entries[i].devname,
-	     entries[i].mountdir,
-	     entries[i].type);
-    }
-
-  printf("\t\t}\n");
-  FOOTER_PPRINT();
-
-  g_free(entries);
-}
-
-
-
-static void pprint_get_msg_limits(void)
-{
-  glibtop_msg_limits buf;
-
-  glibtop_get_msg_limits(&buf);
-
-  HEADER_PPRINT(glibtop_get_msg_limits);
-  PPRINT(flags, "%#llx");
-  PPRINT(msgpool, "%llu");
-  PPRINT(msgmap, "%llu");
-  PPRINT(msgmax, "%llu");
-  PPRINT(msgmnb, "%llu");
-  PPRINT(msgmni, "%llu");
-  PPRINT(msgssz, "%llu");
-  PPRINT(msgtql, "%llu");
-  FOOTER_PPRINT();
-}
-
-
-
-static void pprint_get_netload(const char *iface)
-{
-  glibtop_netload buf;
-
-  glibtop_get_netload(&buf, iface);
-
-  HEADER_PPRINT(glibtop_get_netload);
-  printf("glibtop_get_netload (iface = \"%s\")\n", iface);
-  PPRINT(flags, "%#llx");
-  FOOTER_PPRINT();
-}
-
-
-static void pprint_get_netlist(void)
-{
-  glibtop_netlist buf;
-  char **devices;
-  guint32 i;
-
-  devices = glibtop_get_netlist(&buf);
-
-  HEADER_PPRINT(glibtop_get_netlist);
-
-  for(i = 0; i < buf.number; ++i)
-  {
-	  printf("\t%s\n", devices[i]);
-  }
-
-  FOOTER_PPRINT();
-
-  g_strfreev(devices);
-}
-
-
-
-static void pprint_get_swap(void)
-{
-  glibtop_swap buf;
-
-  glibtop_get_swap(&buf);
-
-  HEADER_PPRINT(glibtop_get_swap);
-  PPRINT(flags, "%#llx");
-  PPRINT(total, "%llu");
-  PPRINT(used, "%llu");
-  PPRINT(free, "%llu");
-  PPRINT(pagein, "%llu");
-  PPRINT(pageout, "%llu");
-  FOOTER_PPRINT();
-}
-
-
-
-static void pprint_get_uptime(void)
-{
-  glibtop_uptime buf;
-
-  glibtop_get_uptime(&buf);
-
-  HEADER_PPRINT(glibtop_get_uptime);
-  PPRINT(flags, "%#llx");
-  PPRINT(uptime, "%f");
-  PPRINT(idletime, "%f");
-  PPRINT(boot_time, "%llu");
-  FOOTER_PPRINT();
-}
-
-
-
-
-static void pprint_get_proc_kernel(pid_t pid)
-{
-  glibtop_proc_kernel buf;
-
-  glibtop_get_proc_kernel(&buf, pid);
-
-  HEADER_PPRINT(glibtop_get_proc_kernel);
-  PPRINT(flags, "%#llx");
-  PPRINT(k_flags, "%llu");
-  PPRINT(min_flt, "%llu");
-  PPRINT(maj_flt, "%llu");
-  PPRINT(cmin_flt, "%llu");
-  PPRINT(cmaj_flt, "%llu");
-  FOOTER_PPRINT();
-}
-
-
-
-int main()
-{
-  glibtop_init();
-
-  pprint_get_cpu();
-
-  pprint_get_fsusage("/");
-
-  pprint_get_loadavg();
-
-  pprint_get_mem();
-
-  pprint_get_mountlist(TRUE);
-  pprint_get_mountlist(FALSE);
-
-  pprint_get_msg_limits();
-
-  pprint_get_swap();
-
-  pprint_get_netlist();
-
-  pprint_get_netload("eth0");
-  pprint_get_netload("ppp0");
-  pprint_get_netload("<unknown>");
-/* pprint_get_sysinfo(); */
-
-  pprint_get_uptime();
-
-  pprint_get_proc_kernel(getpid());
-
-  glibtop_close();
-
-  return 0;
-}

examples/procargs.c

@@ -1,47 +0,0 @@
-#include <glibtop.h>
-#include <glibtop/procargs.h>
-
-#include <stdlib.h>
-
-#include <unistd.h>
-
-static void show_args(pid_t pid, unsigned max_len)
-{
-  glibtop_proc_args buf;
-  char ** const pargv = glibtop_get_proc_argv(&buf, pid, max_len);
-
-  char **parg = pargv;
-
-  printf("<%ld>\t", (long)pid);
-
-  while(*parg)
-    {
-      printf("\"%s\" ", *parg);
-      parg++;
-    }
-
-  putchar('\n');
-
-  g_strfreev(pargv);
-}
-
-
-int main(int argc, char **argv)
-{
-  glibtop_init();
-
-  show_args(getpid(), 0);
-  show_args(getpid(), 15);
-
-  while(*++argv)
-    {
-      pid_t pid = strtol(*argv, NULL, 10);
-      show_args(pid, 0);
-      show_args(pid, 15);
-    }
-
-  glibtop_close();
-
-  return 0;
-}
-

examples/procmap.c

@@ -22,12 +22,11 @@
 */
 
 #include <locale.h>
-#include <libintl.h>
-#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
+#include <glibtop/xmalloc.h>
 
 #include <glibtop/parameter.h>
 
@@ -59,9 +58,9 @@ main (int argc, char *argv [])
 	count = PROFILE_COUNT;
 
 	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
+	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
+	textdomain (PACKAGE);
+	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 
 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
@@ -83,7 +82,7 @@ main (int argc, char *argv [])
 	glibtop_init_r (&glibtop_global_server, 0, 0);
 
 	if ((argc != 2) || (sscanf (argv [1], "%d", (int *) &pid) != 1))
-		g_error ("Usage: %s pid", argv [0]);
+		glibtop_error ("Usage: %s pid", argv [0]);
 
 #ifdef GLIBTOP_INODEDB
 	inodedb = glibtop_inodedb_open (0, 0);
@@ -97,7 +96,7 @@ main (int argc, char *argv [])
 		const char *filename = NULL;
 		unsigned device, device_major, device_minor;
 		char perm [5];
-
+		
 		if (maps [i].flags & (1L << GLIBTOP_MAP_ENTRY_FILENAME))
 			filename = maps [i].filename;
 
@@ -154,10 +153,10 @@ main (int argc, char *argv [])
 		}
 
 		if (filename && (filename != maps [i].filename))
-			g_free ((void*)filename);
+			glibtop_free (filename);
 	}
 
-	g_free (maps);
+	glibtop_free (maps);
 
 	glibtop_close ();
 

examples/second.c

@@ -22,13 +22,11 @@
 */
 
 #include <locale.h>
-#include <math.h>
-#include <stdio.h>
-#include <libintl.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
+#include <glibtop/xmalloc.h>
 
 #include <glibtop/union.h>
 #include <glibtop/sysdeps.h>
@@ -46,22 +44,59 @@ output (pid_t pid)
 	double b_total, b_utime, b_stime;
 	double s_total, s_utime, s_stime;
 	double my_utime, my_stime;
-	unsigned int ncpu;
+	int ncpu;
 #endif
 
 	printf ("\n");
-
+		
 	glibtop_get_proc_state (&data.proc_state, pid);
 
+#if LIBGTOP_VERSION_CODE > 1001000		
+	printf ("Proc_State   PID  %5d (0x%08lx): '%s', %u - "
+		"%u, %u, %u, %u - %u, %u, %u\n", (int) pid,
+		(unsigned long) data.proc_state.flags,
+		data.proc_state.cmd, data.proc_state.state,
+		data.proc_state.uid, data.proc_state.gid,
+		data.proc_state.ruid, data.proc_state.rgid,
+		data.proc_state.has_cpu, data.proc_state.processor,
+		data.proc_state.last_processor);
+#else
 	printf ("Proc_State   PID  %5d (0x%08lx): "
 		"'%s', %c, %lu, %lu\n", (int) pid,
 		(unsigned long) data.proc_state.flags,
 		data.proc_state.cmd, data.proc_state.state,
 		(unsigned long) data.proc_state.uid,
 		(unsigned long) data.proc_state.gid);
-
+#endif
+		
 	glibtop_get_proc_uid (&data.proc_uid, pid);
+	
+#if LIBGTOP_VERSION_CODE > 1001000	
+	printf ("Proc_Uid     PID  %5d (0x%08lx): "
+		"%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d - %d",
+		(int) pid, (unsigned long) data.proc_uid.flags,
+		data.proc_uid.uid, data.proc_uid.euid,
+		data.proc_uid.gid, data.proc_uid.egid,
+		data.proc_uid.suid, data.proc_uid.sgid,
+		data.proc_uid.fsuid, data.proc_uid.fsgid,
+		data.proc_uid.pid, data.proc_uid.ppid,
+		data.proc_uid.pgrp, data.proc_uid.session,
+		data.proc_uid.tty, data.proc_uid.tpgid,
+		data.proc_uid.priority, data.proc_uid.nice,
+		data.proc_uid.ngroups);
+		
+	if (data.proc_uid.ngroups) {
+		for (i = 0; i < data.proc_uid.ngroups; i++) {
+			if (i)
+				printf (" %d", data.proc_uid.groups [i]);
+			else
+				printf (" (%d", data.proc_uid.groups [i]);
+		}
+		printf (")");
+	}
 
+	printf ("\n");
+#else
 	printf ("Proc_Uid     PID  %5d (0x%08lx): "
 		"%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) pid,
 		(unsigned long) data.proc_uid.flags,
@@ -71,9 +106,10 @@ output (pid_t pid)
 		data.proc_uid.pgrp, data.proc_uid.session,
 		data.proc_uid.tty, data.proc_uid.tpgid,
 		data.proc_uid.priority, data.proc_uid.nice);
+#endif
 
 	glibtop_get_proc_mem (&data.proc_mem, pid);
-
+		
 	printf ("Proc_Mem     PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_mem.flags,
@@ -83,9 +119,33 @@ output (pid_t pid)
 		(unsigned long) data.proc_mem.share,
 		(unsigned long) data.proc_mem.rss,
 		(unsigned long) data.proc_mem.rss_rlim);
-
+		
 	glibtop_get_proc_segment (&data.proc_segment, pid);
 
+#if LIBGTOP_VERSION_CODE > 1001000
+	printf ("Proc_Segment PID  %5d (0x%08lx): "
+		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx "
+		"0x%lx 0x%lx 0x%lx 0x%lx 0x%lx "
+		"0x%lx 0x%lx 0x%lx 0x%lx\n", (int) pid,
+		(unsigned long) data.proc_segment.flags,
+		(unsigned long) data.proc_segment.text_rss,
+		(unsigned long) data.proc_segment.shlib_rss,
+		(unsigned long) data.proc_segment.data_rss,
+		(unsigned long) data.proc_segment.stack_rss,
+		(unsigned long) data.proc_segment.dirty_size,
+		(unsigned long) data.proc_segment.start_code,
+		(unsigned long) data.proc_segment.end_code,
+		(unsigned long) data.proc_segment.start_data,
+		(unsigned long) data.proc_segment.end_data,
+		(unsigned long) data.proc_segment.start_brk,
+		(unsigned long) data.proc_segment.end_brk,
+		(unsigned long) data.proc_segment.start_stack,
+		(unsigned long) data.proc_segment.start_mmap,
+		(unsigned long) data.proc_segment.arg_start,
+		(unsigned long) data.proc_segment.arg_end,
+		(unsigned long) data.proc_segment.env_start,
+		(unsigned long) data.proc_segment.env_end);
+#else
 	printf ("Proc_Segment PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_segment.flags,
@@ -97,9 +157,10 @@ output (pid_t pid)
 		(unsigned long) data.proc_segment.start_code,
 		(unsigned long) data.proc_segment.end_code,
 		(unsigned long) data.proc_segment.start_stack);
+#endif
 
 	glibtop_get_proc_time (&data.proc_time, pid);
-
+		
 	printf ("Proc_Time    PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_time.flags,
@@ -114,7 +175,20 @@ output (pid_t pid)
 		(unsigned long) data.proc_time.frequency);
 
 	glibtop_get_proc_signal (&data.proc_signal, pid);
-
+	
+#if LIBGTOP_VERSION_CODE > 1001000
+	printf ("Proc_Signal  PID  %5d (0x%08lx): "
+		"%lx %lx %lx %lx %lx %lx %lx %lx\n", (int) pid,
+		(unsigned long) data.proc_signal.flags,
+		(unsigned long) data.proc_signal.signal [0],
+		(unsigned long) data.proc_signal.signal [1],
+		(unsigned long) data.proc_signal.blocked [0],
+		(unsigned long) data.proc_signal.blocked [1],
+		(unsigned long) data.proc_signal.sigignore [0],
+		(unsigned long) data.proc_signal.sigignore [1],
+		(unsigned long) data.proc_signal.sigcatch [0],
+		(unsigned long) data.proc_signal.sigcatch [1]);
+#else
 	printf ("Proc_Signal  PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_signal.flags,
@@ -122,6 +196,7 @@ output (pid_t pid)
 		(unsigned long) data.proc_signal.blocked,
 		(unsigned long) data.proc_signal.sigignore,
 		(unsigned long) data.proc_signal.sigcatch);
+#endif
 
 	glibtop_get_proc_kernel (&data.proc_kernel, pid);
 
@@ -152,7 +227,7 @@ output (pid_t pid)
 		(unsigned long) data.proc_args.size,
 		args ? args : "");
 
-	g_free (args);
+	glibtop_free (args);
 
 	printf ("\n");
 
@@ -160,7 +235,7 @@ output (pid_t pid)
 	ncpu = glibtop_global_server->ncpu;
 
 	glibtop_get_proc_time (&data.proc_time, pid);
-
+		
 	total = (unsigned long) data.proc_time.utime +
 		(unsigned long) data.proc_time.stime;
 
@@ -240,9 +315,9 @@ main (int argc, char *argv [])
 	unsigned *ptr, pid, i;
 
 	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
+	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
+	textdomain (PACKAGE);
+	
 	glibtop_init ();
 
 	glibtop_get_sysdeps (&sysdeps);
@@ -288,11 +363,11 @@ main (int argc, char *argv [])
 	for (i = 0; i < proclist.number; i++) {
 
 		pid = ptr [i];
-
+		
 		output (pid);
 	}
 
-	g_free (ptr);
+	glibtop_free (ptr);
 
 	exit (0);
 }

examples/smp.c

@@ -21,15 +21,11 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
-
 #include <locale.h>
-#include <libintl.h>
-#include <math.h>
-#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/cpu.h>
+#include <glibtop/xmalloc.h>
 
 int
 main (int argc, char *argv [])
@@ -42,8 +38,10 @@ main (int argc, char *argv [])
 	char separator [BUFSIZ], buffer [BUFSIZ];
 	int ncpu, i;
 
-	glibtop_init();
-
+	setlocale (LC_ALL, "");
+	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
+	textdomain (PACKAGE);
+	
 	glibtop_get_cpu (&cpu);
 
 	ncpu = glibtop_global_server->ncpu ? glibtop_global_server->ncpu : 1;
@@ -67,16 +65,16 @@ main (int argc, char *argv [])
 	memset (separator, '-', 91);
 	separator [92] = '\0';
 
-	sprintf (buffer, "Ticks (%ld per second):", frequency);
+	sprintf (buffer, _("Ticks (%ld per second):"), frequency);
 
 	printf ("\n\n%-26s %12s %12s %12s %12s %12s\n%s\n", buffer,
-		"Total", "User", "Nice", "Sys", "Idle", separator);
+		_("Total"), _("User"), _("Nice"), _("Sys"), _("Idle"), separator);
 
-	printf ("CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n\n",
+	printf (_("CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n\n"),
 		(unsigned long) cpu.flags, total, user, nice, sys, idle);
 
 	for (i = 0; i < glibtop_global_server->ncpu; i++) {
-		printf ("CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n", i,
+		printf (_("CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"), i,
 			(unsigned long) cpu.flags,
 			(unsigned long) cpu.xcpu_total [i],
 			(unsigned long) cpu.xcpu_user  [i],
@@ -93,11 +91,11 @@ main (int argc, char *argv [])
 
 	printf ("%s\n\n\n", separator);
 
-	printf ("%-26s %12s %12s %12s %12s %12s\n%s\n", "Percent:",
-		"Total (%)", "User (%)", "Nice (%)", "Sys (%)",
-		"Idle (%)", separator);
-
-	printf ("CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n\n",
+	printf ("%-26s %12s %12s %12s %12s %12s\n%s\n", _("Percent:"),
+		_("Total (%)"), _("User (%)"), _("Nice (%)"), _("Sys (%)"),
+		_("Idle (%)"), separator);
+	
+	printf (_("CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n\n"),
 		(unsigned long) cpu.flags, (double) total * 100.0 / total,
 		(double) user  * 100.0 / total,
 		(double) nice  * 100.0 / total,
@@ -113,13 +111,13 @@ main (int argc, char *argv [])
 		p_sys   = ((double) cpu.xcpu_sys   [i]) * 100.0 / sys;
 		p_idle  = ((double) cpu.xcpu_idle  [i]) * 100.0 / idle;
 
-		printf ("CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n",
+		printf (_("CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"),
 			i, (unsigned long) cpu.flags, p_total, p_user, p_nice,
 			p_sys, p_idle);
 	}
 
 	printf ("%s\n%-26s %12.3f %12.3f %12.3f %12.3f %12.3f\n\n", separator,
-		"Spin:", s_total * 100.0 / total, s_user * 100.0 / user,
+		_("Spin:"), s_total * 100.0 / total, s_user * 100.0 / user,
 		s_nice * 100.0 / nice, s_sys * 100.0 / sys, s_idle * 100.0 / idle);
 
 	exit (0);

examples/sysdeps.c

@@ -22,13 +22,11 @@
 */
 
 #include <locale.h>
-#include <libintl.h>
-#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
-#include <glibtop/sysdeps.h>
+#include <glibtop/xmalloc.h>
 
 #include <glibtop/parameter.h>
 
@@ -46,9 +44,9 @@ main (int argc, char *argv [])
 	count = PROFILE_COUNT;
 
 	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
+	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
+	textdomain (PACKAGE);
+	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 
 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
@@ -71,10 +69,13 @@ main (int argc, char *argv [])
 
 	glibtop_get_sysdeps (&sysdeps);
 
-#define FEATURE_CHECK(f) ((sysdeps.features & (1L << GLIBTOP_SYSDEPS_##f)) ? 1 : 0)
+#define FEATURE_CHECK(f) ((sysdeps.features & (1L << GLIBTOP_SYSDEPS_##f##)) ? 1 : 0)
 
 	printf ("Sysdeps (0x%08lx):\n\n"
 		"\tfeatures:\t\t0x%08lx\n\n"
+#if LIBGTOP_VERSION_CODE > 1001000
+		"\tpointer_size:\t\t0x%08lx\n\n"
+#endif
 		"\tcpu:\t\t%d\t0x%08lx\n"
 		"\tmem:\t\t%d\t0x%08lx\n"
 		"\tswap:\t\t%d\t0x%08lx\n\n"
@@ -99,6 +100,9 @@ main (int argc, char *argv [])
 		"\tppp:\t\t%d\t0x%08lx\n\n",
 		(unsigned long) sysdeps.flags,
 		(unsigned long) sysdeps.features,
+#if LIBGTOP_VERSION_CODE > 1001000
+		(unsigned long) sysdeps.pointer_size,
+#endif
 		FEATURE_CHECK(CPU),
 		(unsigned long) sysdeps.cpu,
 		FEATURE_CHECK(MEM),

examples/third.c

@@ -0,0 +1,57 @@
+/* $Id$ */
+
+/* Copyright (C) 1998-99 Martin Baulig
+   This file is part of LibGTop 1.0.
+
+   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
+
+   LibGTop is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License,
+   or (at your option) any later version.
+
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+   for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with LibGTop; see the file COPYING. If not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#include <locale.h>
+
+#include <glibtop.h>
+     
+#include <glibtop/open.h>
+#include <glibtop/close.h>
+#include <glibtop/xmalloc.h>
+
+#include <glibtop/union.h>
+#include <glibtop/sysdeps.h>
+
+void main_prog(int argc, char *argv[]);
+
+int     
+main (int argc, char *argv[])
+{
+	setlocale (LC_ALL, "");
+	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
+	textdomain (PACKAGE);
+
+	gh_enter (argc, argv, main_prog);
+	exit (0);
+}
+
+void
+main_prog (int argc, char *argv[])
+{
+	glibtop_boot_guile ();
+#ifdef GLIBTOP_GUILE_NAMES
+	glibtop_boot_guile_names ();
+#endif
+
+	gh_repl (argc, argv);
+}

examples/timings.c

@@ -22,12 +22,11 @@
 */
 
 #include <locale.h>
-#include <stdio.h>
-#include <libintl.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
+#include <glibtop/xmalloc.h>
 
 #include <glibtop/parameter.h>
 
@@ -80,14 +79,14 @@ main (int argc, char *argv [])
 	count = PROFILE_COUNT;
 
 	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
+	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
+	textdomain (PACKAGE);
 
 	printf ("%-12s (%-10s): %7s - %9s - %9s\n",
 		"Feature", "Flags", "Count", "utime", "stime");
 	printf ("-------------------------------------------"
 		"---------------\n");
-
+	
 	glibtop_init_r (&glibtop_global_server, 0, 0);
 
 	getrusage (RUSAGE_SELF, &total_start);
@@ -188,7 +187,7 @@ main (int argc, char *argv [])
 
 	for (c = 0; c < PROFILE_COUNT_EXPENSIVE; c++) {
 		ptr = glibtop_get_proclist (&data.proclist, 0, 0);
-		g_free (ptr);
+		glibtop_free (ptr);
 	}
 
 	getrusage (RUSAGE_SELF, &rusage_end);
@@ -303,7 +302,7 @@ main (int argc, char *argv [])
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_signal (&data.proc_signal, pid);
-
+	
 	getrusage (RUSAGE_SELF, &rusage_end);
 
 	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
@@ -334,7 +333,7 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_kernel.flags, PROFILE_COUNT,
 		(long double) ELAPSED_UTIME / PROFILE_COUNT,
 		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
+	
 	getrusage (RUSAGE_SELF, &total_end);
 
 	libgtop_timersub (&total_end.ru_utime, &total_start.ru_utime,

features.def

@@ -1,4 +1,4 @@
-void|cpu|ulong(total,user,nice,sys,idle,iowait,irq,softirq,frequency,xcpu_total[4],xcpu_user[4],xcpu_nice[4],xcpu_sys[4],xcpu_idle[4],xcpu_iowait[4],xcpu_irq[4],xcpu_softirq[4])
+void|cpu|ulong(total,user,nice,sys,idle,frequency,xcpu_total[4],xcpu_user[4],xcpu_nice[4],xcpu_sys[4],xcpu_idle[4])
 void|mem|ulong(total,used,free,shared,buffer,cached,user,locked)
 void|swap|ulong(total,used,free,pagein,pageout)
 void|uptime|double(uptime,idletime)
@@ -16,10 +16,7 @@ void|proc_kernel|ulong(k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt,kstk_esp,kstk_e
 void|proc_segment|ulong(text_rss,shlib_rss,data_rss,stack_rss,dirty_size,start_code,end_code,start_stack)|pid_t(pid)
 char *|proc_args|ulong(size)|pid_t(pid):unsigned(max_len)
 glibtop_map_entry *|proc_map|ulong(number,size,total)|pid_t(pid)
-glibtop_open_files_entry *|proc_open_files|ulong(number)|pid_t(pid)
 glibtop_mountentry *|@mountlist|ulong(number,size,total)|int(all_fs)
 void|@fsusage|ulong(blocks,bfree,bavail,files,ffree)|string|mount_dir
 void|netload|ulong(if_flags,mtu,subnet,address,packets_in,packets_out,packets_total,bytes_in,bytes_out,bytes_total,errors_in,errors_out,errors_total,collisions)|string|interface
 void|ppp|ulong(state,bytes_in,bytes_out)|ushort(device)
-char **|netlist|unsigned(number)
-

glibtop.h

@@ -24,33 +24,10 @@
 #ifndef __GLIBTOP_H__
 #define __GLIBTOP_H__
 
-typedef struct _glibtop		glibtop;
-
-/**
- *  LIBGTOP_CHECK_VERSION
- *  @major: Major version number
- *  @minor: Minor version number
- *  @micro: Micro version number
- *
- *  Checks if the version given is compatable with this version of the
- *  library.  For example, LIBGTOP_CHECK_VERSION(1.2.3) would return TRUE
- *  if the version is 1.2.5, and FALSE if 1.1.0.  This can be used in
- *  build tests.
- *
- **/
-
-#include <libgtopconfig.h>
-
-#define LIBGTOP_CHECK_VERSION(major, minor, micro)    \
-(LIBGTOP_MAJOR_VERSION > (major) || \
-(LIBGTOP_MAJOR_VERSION == (major) && LIBGTOP_MINOR_VERSION > (minor)) || \
-(LIBGTOP_MAJOR_VERSION == (major) && LIBGTOP_MINOR_VERSION == (minor) && \
-LIBGTOP_MICRO_VERSION >= (micro)))
-
-
 #include <glibtop/global.h>
 
 #include <glibtop_server.h>
+#include <glibtop/types.h>
 
 #ifdef HAVE_GLIBTOP_MACHINE_H
 #include <glibtop_machine.h>
@@ -60,11 +37,10 @@ LIBGTOP_MICRO_VERSION >= (micro)))
 #define GLIBTOP_MOUNTENTRY_LEN	79
 #endif
 
+typedef struct _glibtop		glibtop;
 
 #include <glibtop/sysdeps.h>
 
-#include <glibtop/close.h>
-
 struct _glibtop
 {
 	unsigned flags;
@@ -94,8 +70,9 @@ extern glibtop *glibtop_global_server;
 
 extern const unsigned long glibtop_server_features;
 
-glibtop *
-glibtop_init (void);
+#define glibtop_init()	glibtop_init_r(&glibtop_global_server, 0, 0);
+
+#define glibtop_close()	glibtop_close_r(glibtop_global_server);
 
 glibtop *
 glibtop_init_r (glibtop **server_ptr,
@@ -107,4 +84,24 @@ glibtop_init_s (glibtop **server_ptr,
 		unsigned long features,
 		unsigned flags);
 
+#ifdef GLIBTOP_GUILE
+
+/* You need to link with -lgtop_guile to get this stuff here. */
+
+void glibtop_boot_guile (void);
+
+#endif
+
+#ifdef GLIBTOP_GUILE_NAMES
+
+/* You need to link with -lgtop_guile_names to get this stuff here. */
+
+void glibtop_boot_guile_names (void);
+
+#ifndef GLIBTOP_NAMES
+#define GLIBTOP_NAMES
+#endif
+
+#endif
+
 #endif

include/glibtop/Makefile.am

@@ -1,13 +1,10 @@
-glibtopdir		= $(includedir)/libgtop-2.0/glibtop
+glibtopdir		= $(includedir)/glibtop
 
 glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  sem_limits.h uptime.h command.h mem.h proclist.h \
 			  proctime.h shm_limits.h version.h cpu.h msg_limits.h \
-			  procmem.h procuid.h swap.h \
-			  procsegment.h sysdeps.h global.h \
-			  procsignal.h union.h gnuserv.h \
+			  procmem.h procuid.h swap.h write.h error.h open.h \
+			  procsegment.h read.h sysdeps.h xmalloc.h global.h \
+			  procsignal.h read_data.h union.h types.h gnuserv.h \
 			  parameter.h mountlist.h fsusage.h procmap.h signal.h \
-			  inodedb.h sysinfo.h ppp.h procargs.h netload.h \
-			  netlist.h procopenfiles.h open.h
-
-noinst_HEADERS		= error.h write.h read_data.h read.h init_hooks.h
+			  inodedb.h sysinfo.h ppp.h procargs.h netload.h

include/glibtop/call-vector.pl

@@ -1,116 +0,0 @@
-#!/usr/bin/perl
-
-require 'c_types.pl';
-
-die "Usage: $0 features.def call-vector.h.in" unless $#ARGV == 1;
-
-$[ = 1;			# set array base to 1
-$, = ' ';		# set output field separator
-$\ = "\n";		# set output record separator
-
-sub toupper {
-    local($_) = @_;
-    tr/a-z/A-Z/;
-    return $_;
-}
-
-sub tolower {
-    local($_) = @_;
-    tr/A-Z/a-z/;
-    return $_;
-}
-
-$func_decl_code = '';
-
-open FEATURESDEF, $ARGV[1] or
-  die "open ($ARGV[1]): $!";
-
-while (<FEATURESDEF>) {
-  chop;				# strip record separator
-  
-  if (/^[^\#]/) {
-    &parse_features_def ($_);
-  }
-}
-
-close FEATURESDEF;
-
-sub parse_features_def {
-  local($line) = @_;
-  @line_fields = split(/\|/, $line, 9999);
-  $retval = $line_fields[1];
-  $element_def = $line_fields[3];
-  $feature = $line_fields[2];
-  $param_def = $line_fields[4];
-
-  $orig = $feature;
-  $feature =~ s/^@//;
-  $space = $feature;
-  $space =~ s/./ /g;
-
-  if ($retval eq 'retval') {
-    $retval_param = '&retval';
-    $retval = 'int';
-  }
-  elsif ($retval !~ /^void$/) {
-    $retval_param = 'NULL';
-  }
-  else {
-    $retval_param = 'NULL';
-  }
- 
-  if ($retval =~ /^(array|pointer)\((.*)\)$/) {
-    $retval = ($2 eq 'string') ? 'char **' : "$2 *";
-  }
-
-  $param_decl = '';
-  $nr_params = (@params = split(/:/, $param_def, 9999));
-  for ($param = 1; $param <= $nr_params; $param++) {
-    $list = $params[$param];
-    $type = $params[$param];
-    $type =~ s/\(.*//;
-    $list =~ s/^.*\(//;
-    $list =~ s/\)$//;
-    $count = (@fields = split(/,/, $list, 9999));
-    for ($field = 1; $field <= $count; $field++) {
-      my $c_type = $typeinfo->{$type}->[1];
-
-      $param_decl = $param_decl . ', ';
-      $param_decl = $param_decl . $c_type;
-    }
-  }
-
-  if ($line_fields[3] eq '') {
-    $func_decl_code .= sprintf
-      (qq[\t%s (*%s) (glibtop_server *, glibtop_closure *%s);\n], $retval, $feature, $param_decl);
-  } elsif ($line_fields[3] eq 'array') {
-    $func_decl_code .= sprintf
-      (qq[\t%s (*%s) (glibtop_server *, glibtop_closure *, glibtop_array *%s);\n], $retval, $feature, $param_decl);
-  } elsif ($line_fields[3] =~ /^array/) {
-    $func_decl_code .= sprintf
-      (qq[\t%s (*%s) (glibtop_server *, glibtop_closure *, glibtop_array *, %s *%s);\n], $retval, $feature, 'glibtop_'.$feature, $param_decl);
-  } else {
-    $func_decl_code .= sprintf
-      (qq[\t%s (*%s) (glibtop_server *, glibtop_closure *, %s *%s);\n], $retval, $feature, 'glibtop_'.$feature, $param_decl);
-  }
-}
-
-chop $func_decl_code;
-
-$auto_gen_comment = sprintf
-  (qq[/*\n * This file is automatically generated.\n * Please modify `call-vector.pl' and `call-vector.h.in'.\n */]);
-
-open CALLVECTOR, $ARGV[2] or
-  die "open ($ARGV[2]): $!";
-
-while (<CALLVECTOR>) {
-  chop;
-
-  s/^\s*\@\@GLIBTOP_CALL_VECTOR\@\@\s*$/$func_decl_code/;
-
-  s/^\s*\@\@AUTOGEN_COMMENT\@\@\s*$/$auto_gen_comment/;
-} continue {
-  print $_;
-}
-
-close CALLVECTOR;

include/glibtop/close.h

@@ -26,15 +26,13 @@
 
 #include <glibtop.h>
 
-G_BEGIN_DECLS
-
-void glibtop_close (void);
+BEGIN_LIBGTOP_DECLS
 
 void glibtop_close_r (glibtop *server);
 
 void glibtop_close_s (glibtop *server);
 void glibtop_close_p (glibtop *server);
 
-G_END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/command.h

@@ -28,7 +28,7 @@
 #include <glibtop/sysdeps.h>
 #include <glibtop/union.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_CMND_QUIT		0
 #define GLIBTOP_CMND_SYSDEPS		1
@@ -57,10 +57,8 @@ G_BEGIN_DECLS
 #define GLIBTOP_CMND_FSUSAGE		21
 #define GLIBTOP_CMND_NETLOAD		22
 #define GLIBTOP_CMND_PPP		23
-#define GLIBTOP_CMND_NETLIST		24
-#define GLIBTOP_CMND_PROC_OPEN_FILES	25
 
-#define GLIBTOP_MAX_CMND		26
+#define GLIBTOP_MAX_CMND		24
 
 #define _GLIBTOP_PARAM_SIZE		16
 
@@ -71,8 +69,8 @@ typedef union  _glibtop_response_union	glibtop_response_union;
 
 struct _glibtop_command
 {
-	guint64	command;
-	guint64	size, data_size;
+	u_int64_t	command;
+	u_int64_t	size, data_size;
 	char		parameter [_GLIBTOP_PARAM_SIZE];
 };
 
@@ -84,8 +82,8 @@ union _glibtop_response_union
 
 struct _glibtop_response
 {
-	gint64 offset;
-	guint64 size, data_size;
+	int64_t offset;
+	u_int64_t size, data_size;
 	glibtop_response_union u;
 };
 
@@ -99,6 +97,6 @@ void *
 glibtop_call_s (glibtop *server, unsigned command, size_t send_size,
 		const void *send_buf, size_t recv_size, void *recv_buf);
 
-G_END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/cpu.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_CPU_TOTAL	0
 #define GLIBTOP_CPU_USER	1
@@ -41,16 +41,8 @@ G_BEGIN_DECLS
 #define GLIBTOP_XCPU_NICE	8
 #define GLIBTOP_XCPU_SYS	9
 #define GLIBTOP_XCPU_IDLE	10
-#define GLIBTOP_XCPU_FLAGS	11
 
-#define GLIBTOP_CPU_IOWAIT	12
-#define GLIBTOP_CPU_IRQ		13
-#define GLIBTOP_CPU_SOFTIRQ	14
-#define GLIBTOP_XCPU_IOWAIT	15
-#define GLIBTOP_XCPU_IRQ	16
-#define GLIBTOP_XCPU_SOFTIRQ	17
-
-#define GLIBTOP_MAX_CPU		18
+#define GLIBTOP_MAX_CPU		11
 
 /* Nobody should really be using more than 4 processors. */
 #define GLIBTOP_NCPU		4
@@ -59,28 +51,21 @@ typedef struct _glibtop_cpu	glibtop_cpu;
 
 struct _glibtop_cpu
 {
-	guint64	flags,
+	u_int64_t	flags,
 		total,				/* GLIBTOP_CPU_TOTAL		*/
 		user,				/* GLIBTOP_CPU_USER		*/
 		nice,				/* GLIBTOP_CPU_NICE		*/
 		sys,				/* GLIBTOP_CPU_SYS		*/
 		idle,				/* GLIBTOP_CPU_IDLE		*/
-		iowait,				/* GLIBTOP_CPU_IOWAIT		*/
-		irq,				/* GLIBTOP_CPU_IRQ		*/
-		softirq,			/* GLIBTOP_CPU_SOFTIRQ		*/
 		frequency,			/* GLIBTOP_CPU_FREQUENCY	*/
 		xcpu_total [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_TOTAL		*/
 		xcpu_user [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_USER		*/
 		xcpu_nice [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_NICE		*/
 		xcpu_sys  [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_SYS		*/
-		xcpu_idle [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_IDLE		*/
-		xcpu_iowait [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_IOWAIT		*/
-		xcpu_irq [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_IRQ		*/
-		xcpu_softirq  [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_SOFTIRQ		*/
-		xcpu_flags;	                /* GLIBTOP_XCPU_IDLE		*/
+		xcpu_idle [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_IDLE		*/
 };
 
-void glibtop_get_cpu(glibtop_cpu *buf);
+#define glibtop_get_cpu(cpu)	glibtop_get_cpu_l(glibtop_global_server, cpu)
 
 #if GLIBTOP_SUID_CPU
 #define glibtop_get_cpu_r	glibtop_get_cpu_p
@@ -98,7 +83,17 @@ void glibtop_init_cpu_s (glibtop *server);
 void glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf);
 #endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_cpu [];
+extern const unsigned glibtop_types_cpu [];
+extern const char *glibtop_labels_cpu [];
+extern const char *glibtop_descriptions_cpu [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/error.h

@@ -21,33 +21,116 @@
    Boston, MA 02111-1307, USA.
 */
 
-
-/*
- * This is private API
- */
-
 #ifndef __GLIBTOP_ERROR_H__
 #define __GLIBTOP_ERROR_H__
 
 #include <glibtop.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
-void glibtop_error_vr (glibtop *server, const char *format, va_list args) G_GNUC_INTERNAL G_GNUC_NORETURN;
-void glibtop_warn_vr (glibtop *server, const char *format, va_list args) G_GNUC_INTERNAL;
-void glibtop_error_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_INTERNAL G_GNUC_NORETURN;
-void glibtop_warn_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_INTERNAL;
+#ifndef G_GNUC_UNUSED
+#if	__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
+#define G_GNUC_UNUSED				\
+  __attribute__((unused))
+#else	/* !__GNUC__ */
+#define	G_GNUC_UNUSED
+#endif	/* !__GNUC__ */
+#endif /* defined G_GNUC_UNUSED */
 
-void glibtop_error_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
-void glibtop_warn_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
-void glibtop_error_io_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
-void glibtop_warn_io_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
+void glibtop_error_vr (glibtop *server, char *format, va_list args);
+void glibtop_warn_vr (glibtop *server, char *format, va_list args);
 
-void glibtop_error (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
-void glibtop_warn (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);
-void glibtop_error_io (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
-void glibtop_warn_io (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);
+void glibtop_error_io_vr (glibtop *server, char *format, int, va_list args);
+void glibtop_warn_io_vr (glibtop *server, char *format, int, va_list args);
 
-G_END_DECLS
+static void G_GNUC_UNUSED
+glibtop_error_r (glibtop *server, char *format, ...)
+{
+	va_list args;
+
+	va_start (args, format);
+	glibtop_error_vr (server, format, args);
+	va_end (args);
+}
+
+static void G_GNUC_UNUSED
+glibtop_warn_r (glibtop *server, char *format, ...)
+{
+	va_list args;
+
+	va_start (args, format);
+	glibtop_warn_vr (server, format, args);
+	va_end (args);
+}
+
+static void G_GNUC_UNUSED
+glibtop_error_io_r (glibtop *server, char *format, ...)
+{
+	va_list args;
+
+	va_start (args, format);
+	glibtop_error_io_vr (server, format, errno, args);
+	va_end (args);
+}
+
+static void G_GNUC_UNUSED
+glibtop_warn_io_r (glibtop *server, char *format, ...)
+{
+	va_list args;
+
+	va_start (args, format);
+	glibtop_warn_io_vr (server, format, errno, args);
+	va_end (args);
+}
+
+#ifdef  __GNUC__
+
+#define glibtop_error(p1, args...)	glibtop_error_r(glibtop_global_server , p1 , ## args)
+#define glibtop_warn(p1, args...)	glibtop_warn_r(glibtop_global_server , p1 , ## args)
+
+#define glibtop_error_io(p1, args...)	glibtop_error_io_r(glibtop_global_server , p1 , ## args)
+#define glibtop_warn_io(p1, args...)	glibtop_warn_io_r(glibtop_global_server , p1 , ## args)
+
+#else /* no __GNUC__ */
+
+static void
+glibtop_error (char *format, ...)
+{
+	va_list args;
+	va_start (args, format);
+	glibtop_error_vr (glibtop_global_server, format, args);
+	va_end (args);
+}
+
+static void
+glibtop_warn (char *format, ...)
+{
+	va_list args;
+	va_start (args, format);
+	glibtop_warn_vr (glibtop_global_server, format, args);
+	va_end (args);
+}
+
+static void
+glibtop_error_io (char *format, ...)
+{
+	va_list args;
+	va_start (args, format);
+	glibtop_error_io_vr (glibtop_global_server, format, errno, args);
+	va_end (args);
+}
+
+static void
+glibtop_warn_io (char *format, ...)
+{
+	va_list args;
+	va_start (args, format);
+	glibtop_warn_io_vr (glibtop_global_server, format, errno, args);
+	va_end (args);
+}
+
+#endif /* no __GNUC__ */
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/fsusage.h

@@ -1,6 +1,7 @@
 /* $Id$ */
 
 /* Copyright (C) 1998-99 Martin Baulig
+   This file is part of LibGTop 1.0.
 
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
@@ -26,41 +27,46 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_FSUSAGE_BLOCKS		0
 #define GLIBTOP_FSUSAGE_BFREE		1
 #define GLIBTOP_FSUSAGE_BAVAIL		2
 #define GLIBTOP_FSUSAGE_FILES		3
 #define GLIBTOP_FSUSAGE_FFREE		4
-#define GLIBTOP_FSUSAGE_BLOCK_SIZE	5
-#define GLIBTOP_FSUSAGE_READ           6
-#define GLIBTOP_FSUSAGE_WRITE          7
-#define GLIBTOP_MAX_FSUSAGE		8
 
+#define GLIBTOP_MAX_FSUSAGE		5
 
 typedef struct _glibtop_fsusage		glibtop_fsusage;
 
 struct _glibtop_fsusage
 {
-	guint64	flags,
-		blocks,		/* Total number of blocks. */
+	u_int64_t	flags,
+		blocks,		/* Total blocks. */
 		bfree,		/* Free blocks available to superuser. */
 		bavail,		/* Free blocks available to non-superuser. */
 		files,		/* Total file nodes. */
 		ffree;		/* Free file nodes. */
-	guint32	block_size;	/* Size of a block in bytes. */
-	guint64 read, write;    /* Total blocks read and written */
 };
 
-void glibtop_get_fsusage(glibtop_fsusage *buf, const char *mount_dir);
+#define glibtop_get_fsusage(fsusage,disk)	glibtop_get_fsusage_l(glibtop_global_server, fsusage, disk)
 
 #define glibtop_get_fsusage_r		glibtop_get_fsusage_s
 
 void glibtop_get_fsusage_l (glibtop *server, glibtop_fsusage *buf, const char *mount_dir);
 void glibtop_get_fsusage_s (glibtop *server, glibtop_fsusage *buf, const char *mount_dir);
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_fsusage [];
+extern const unsigned glibtop_types_fsusage [];
+extern const char *glibtop_labels_fsusage [];
+extern const char *glibtop_descriptions_fsusage [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/glibtop-server.h

@@ -1,70 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 2.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_SERVER_H__
-#define __GLIBTOP_SERVER_H__
-
-#include <glibtop/global.h>
-#include <glibtop/sysdeps.h>
-
-G_BEGIN_DECLS
-
-typedef struct _glibtop_server		glibtop_server;
-typedef struct _glibtop_server_info	glibtop_server_info;
-
-typedef struct _glibtop_closure		glibtop_closure;
-
-struct _glibtop_server_info
-{
-    int ncpu;			/* Number of CPUs, zero if single-processor */
-    unsigned long features;	/* Server is required for this features */
-    glibtop_sysdeps sysdeps;	/* Detailed feature list */
-    glibtop_sysdeps required;	/* Required feature list */
-    glibtop_sysdeps wanted;	/* We only want this features */
-};
-
-struct	_glibtop_server
-{
-    glibtop_server_info *info;
-
-    int refcount;
-    unsigned flags;
-    const char *name;
-
-    void *_priv;
-};
-
-glibtop_server *
-glibtop_server_new (void);
-
-void
-glibtop_server_ref (glibtop_server *server);
-
-void
-glibtop_server_unref (glibtop_server *server);
-
-G_END_DECLS
-
-#endif

include/glibtop/global.h

@@ -24,14 +24,43 @@
 #ifndef __GLIBTOP_GLOBAL_H__
 #define __GLIBTOP_GLOBAL_H__
 
-#include <glib.h>
-
 #ifdef _IN_LIBGTOP
 #include <config.h>
 #endif
 
+/*
+ * All declarations are enclosed in BEGIN_LIBGTOP_DECLS and
+ * END_LIBGTOP_DECLS so that C++ compilers don't mangle their names.
+ *
+ */
+   
+#undef BEGIN_LIBGTOP_DECLS
+#undef END_LIBGTOP_DECLS
+#ifdef __cplusplus
+# define BEGIN_LIBGTOP_DECLS extern "C" {
+# define END_LIBGTOP_DECLS }
+#else
+# define BEGIN_LIBGTOP_DECLS /* empty */
+# define END_LIBGTOP_DECLS /* empty */
+#endif
+
 #ifdef _IN_LIBGTOP
 
+/* Provide macros to feature the GCC function attribute.
+ */
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
+#define G_GNUC_NORETURN				\
+  __attribute__((noreturn))
+#define G_GNUC_CONST				\
+  __attribute__((const))
+#define G_GNUC_UNUSED				\
+  __attribute__((unused))
+#else	/* !__GNUC__ */
+#define G_GNUC_NORETURN
+#define G_GNUC_CONST
+#define	G_GNUC_UNUSED
+#endif	/* !__GNUC__ */
+
 #endif /* _IN_LIBGTOP */
 
 #if TIME_WITH_SYS_TIME
@@ -45,6 +74,27 @@
 # endif
 #endif
 
+#ifdef NEED_GNOMESUPPORT_H
+#include <gnomesupport.h>
+#endif
+
+#ifdef WITHOUT_GUILE
+#undef GLIBTOP_GUILE
+#undef GLIBTOP_GUILE_NAMES
+#endif
+
+#ifdef GLIBTOP_GUILE
+#include <guile/gh.h>
+#endif
+
+#ifdef _IN_LIBGTOP
+#if (defined HAVE_LIBINTL_H) || (defined HAVE_GETTEXT)
+#include <libintl.h>
+#else
+#include <libgettext.h>
+#endif
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -74,13 +124,18 @@
 
 #ifdef _IN_LIBGTOP
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
+
+#ifndef _
+#define _(String) dgettext (PACKAGE, String)
+#define N_(String) (String)
+#endif
 
 #ifndef HAVE_STRERROR
 char *strerror (int errno);
 #endif
 
-G_END_DECLS
+END_LIBGTOP_DECLS
 
 #endif /* _IN_LIBGTOP */
 

include/glibtop/gnuserv.h

@@ -9,15 +9,15 @@
 
  Copyright (C) 1989 Free Software Foundation, Inc.
 
- Author: Andy Norman (ange@hplb.hpl.hp.com), based on
+ Author: Andy Norman (ange@hplb.hpl.hp.com), based on 
          'etc/server.c' and 'etc/emacsclient.c' from the 18.52 GNU
          Emacs distribution.
 
  Please mail bugs and suggestions to the author at the above address.
 */
 
-/* HISTORY
- * 11-Nov-1990		bristor@simba
+/* HISTORY 
+ * 11-Nov-1990		bristor@simba	
  *    Added EOT stuff.
  */
 
@@ -42,6 +42,7 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
 /* gnuserv should not be compiled using SOCKS */
 #define DO_NOT_SOCKSIFY
 #include <glibtop.h>
+#include <glibtop/error.h>
 #undef read
 #undef write
 #undef open
@@ -75,7 +76,7 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
  */
 
 #if 0
-#define MCOOKIE_SCREEN "42980"   /* screen # to use as the gnuserv cookie */
+#define MCOOKIE_SCREEN "42980"   /* screen # to use as the gnuserv cookie */ 
 #endif
 #define MCOOKIE_NAME   "MAGIC-1" /* authentication protocol name */
 #define MCOOKIE_X_NAME "MIT-MAGIC-COOKIE-1"  /* as needed by X */
@@ -105,7 +106,7 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
  * since it limits the size of requests and responses. Don't make it bigger
  * than your system's max message size though (usually a couple of k) or else
  * msgsend will start failing. For sockets, using the system BUFSIZ is usually
- * what you want.
+ * what you want. 
  */
 
 #if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)

include/glibtop/init_hooks.h

@@ -1,11 +0,0 @@
-#ifndef H_LIBGTOP_INIT_HOOKS_1122955666
-#define H_LIBGTOP_INIT_HOOKS_1122955666
-
-#include <glibtop.h>
-
-typedef void (*glibtop_init_func_t)(glibtop *);
-
-extern const glibtop_init_func_t _glibtop_init_hook_s[];
-extern const glibtop_init_func_t _glibtop_init_hook_p[];
-
-#endif /* H_LIBGTOP_INIT_HOOKS_1122955666 */

include/glibtop/inodedb.h

@@ -31,7 +31,7 @@
 
 #define GLIBTOP_INODEDB_ALL		7
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 typedef struct _glibtop_inodedb		glibtop_inodedb;
 
@@ -39,7 +39,7 @@ typedef struct _glibtop_inodedb_key	glibtop_inodedb_key;
 
 struct _glibtop_inodedb_key
 {
-	guint64 device, inode;
+	u_int64_t device, inode;
 };
 
 struct _glibtop_inodedb
@@ -57,11 +57,11 @@ glibtop_inodedb_open_s (glibtop *server, unsigned databases, unsigned long cache
 const char *
 glibtop_inodedb_lookup_s (glibtop *server,
 			  glibtop_inodedb *inodedb,
-			  guint64 device, guint64 inode);
+			  u_int64_t device, u_int64_t inode);
 
 void
 glibtop_inodedb_close_s (glibtop *server, glibtop_inodedb *inodedb);
 
-G_END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/limits.h

@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_LIMITS_H__
-#define __GLIBTOP_LIMITS_H__
-
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-/* Nobody should really be using more than 64 processors. */
-#define GLIBTOP_NCPU		64
-
-/* Maximum number of process groups in glibtop_proc_uid. */
-#define GLIBTOP_MAX_GROUPS	32
-
-/* Maximum length of a mountpoint/device name in glibtop_mountlist. */
-#define GLIBTOP_MOUNTENTRY_LEN	79
-
-/* Maximum length of a network interface name. */
-#define GLIBTOP_INTERFACE_LEN	32
-
-/* Length of a network interface address in bytes. */
-#define GLIBTOP_IFADDR_LEN	16
-
-/* This is ((guint64)-1) */
-#define GLIBTOP_UNLIMITED	(~(guint64)0)
-
-/* Maximum length of a backend name. */
-#define GLIBTOP_BACKEND_NAME_LEN	40
-
-G_END_DECLS
-
-#endif

include/glibtop/loadavg.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_LOADAVG_LOADAVG		0
 #define GLIBTOP_LOADAVG_NR_RUNNING	1
@@ -40,14 +40,14 @@ typedef struct _glibtop_loadavg	glibtop_loadavg;
 
 struct _glibtop_loadavg
 {
-	guint64 flags;
+	u_int64_t flags;
 	double loadavg [3];		/* GLIBTOP_LOADAVG_LOADAVG	*/
-	guint64 nr_running,		/* GLIBTOP_LOADAVG_NR_RUNNING	*/
+	u_int64_t nr_running,		/* GLIBTOP_LOADAVG_NR_RUNNING	*/
 		nr_tasks,		/* GLIBTOP_LOADAVG_NR_TASKS	*/
 		last_pid;		/* GLIBTOP_LOADAVG_LAST_PID	*/
 };
 
-void glibtop_get_loadavg(glibtop_loadavg *buf);
+#define glibtop_get_loadavg(loadavg)	glibtop_get_loadavg_l(glibtop_global_server, loadavg)
 
 #if GLIBTOP_SUID_LOADAVG
 #define glibtop_get_loadavg_r		glibtop_get_loadavg_p
@@ -65,7 +65,17 @@ void glibtop_init_loadavg_s (glibtop *server);
 void glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf);
 #endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_loadavg [];
+extern const unsigned glibtop_types_loadavg [];
+extern const char *glibtop_labels_loadavg [];
+extern const char *glibtop_descriptions_loadavg [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/mem.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_MEM_TOTAL	0
 #define GLIBTOP_MEM_USED	1
@@ -44,7 +44,7 @@ typedef struct _glibtop_mem	glibtop_mem;
 
 struct _glibtop_mem
 {
-	guint64	flags,
+	u_int64_t	flags,
 		total,		/* GLIBTOP_MEM_TOTAL	*/
 		used,		/* GLIBTOP_MEM_USED	*/
 		free,		/* GLIBTOP_MEM_FREE	*/
@@ -55,7 +55,7 @@ struct _glibtop_mem
 		locked;		/* GLIBTOP_MEM_LOCKED	*/
 };
 
-void glibtop_get_mem(glibtop_mem *buf);
+#define glibtop_get_mem(mem)	glibtop_get_mem_l(glibtop_global_server, mem)
 
 #if GLIBTOP_SUID_MEM
 #define glibtop_get_mem_r		glibtop_get_mem_p
@@ -73,7 +73,17 @@ void glibtop_init_mem_s (glibtop *server);
 void glibtop_get_mem_s (glibtop *server, glibtop_mem *buf);
 #endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_mem [];
+extern const unsigned glibtop_types_mem [];
+extern const char *glibtop_labels_mem [];
+extern const char *glibtop_descriptions_mem [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/mountlist.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_MOUNTLIST_NUMBER	0
 #define GLIBTOP_MOUNTLIST_TOTAL		1
@@ -41,7 +41,7 @@ typedef struct _glibtop_mountlist	glibtop_mountlist;
 
 struct _glibtop_mountentry
 {
-	guint64 dev;
+	u_int64_t dev;
 	char devname [GLIBTOP_MOUNTENTRY_LEN+1];
 	char mountdir [GLIBTOP_MOUNTENTRY_LEN+1];
 	char type [GLIBTOP_MOUNTENTRY_LEN+1];
@@ -49,14 +49,13 @@ struct _glibtop_mountentry
 
 struct _glibtop_mountlist
 {
-	guint64	flags,
+	u_int64_t	flags,
 		number,			/* GLIBTOP_MOUNTLIST_NUMBER	*/
 		total,			/* GLIBTOP_MOUNTLIST_TOTAL	*/
 		size;			/* GLIBTOP_MOUNTLIST_SIZE	*/
 };
 
-glibtop_mountentry *
-glibtop_get_mountlist(glibtop_mountlist *buf, int all_fs);
+#define glibtop_get_mountlist(mountlist,all_fs)	glibtop_get_mountlist_l(glibtop_global_server, mountlist, all_fs)
 
 #define glibtop_get_mountlist_r		glibtop_get_mountlist_s
 
@@ -66,7 +65,17 @@ glibtop_get_mountlist_l (glibtop *server, glibtop_mountlist *buf, int all_fs);
 glibtop_mountentry *
 glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs);
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_mountlist [];
+extern const unsigned glibtop_types_mountlist [];
+extern const char *glibtop_labels_mountlist [];
+extern const char *glibtop_descriptions_mountlist [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/msg_limits.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_IPC_MSGPOOL	0
 #define GLIBTOP_IPC_MSGMAP	1
@@ -43,7 +43,7 @@ typedef struct _glibtop_msg_limits	glibtop_msg_limits;
 
 struct _glibtop_msg_limits
 {
-	guint64	flags,
+	u_int64_t	flags,
 		msgpool,	/* GLIBTOP_IPC_MSGPOOL	*/
 		msgmap,		/* GLIBTOP_IPC_MSGMAP	*/
 		msgmax,		/* GLIBTOP_IPC_MSGMAX	*/
@@ -53,7 +53,7 @@ struct _glibtop_msg_limits
 		msgtql;		/* GLIBTOP_IPC_MSGTQL	*/
 };
 
-void glibtop_get_msg_limits(glibtop_msg_limits *buf);
+#define glibtop_get_msg_limits(msg)	glibtop_get_msg_limits_l(glibtop_global_server, msg)
 
 #if GLIBTOP_SUID_MSG_LIMITS
 #define glibtop_get_msg_limits_r	glibtop_get_msg_limits_p
@@ -71,8 +71,18 @@ void glibtop_init_msg_limits_s (glibtop *server);
 void glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf);
 #endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_msg_limits [];
+extern const unsigned glibtop_types_msg_limits [];
+extern const char *glibtop_labels_msg_limits [];
+extern const char *glibtop_descriptions_msg_limits [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif
 

include/glibtop/netlist.h

@@ -1,61 +0,0 @@
-/* Copyright (C) 2004 Benoît Dejean
-   This file is part of LibGTop 2.0.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_NETLIST_H__
-#define __GLIBTOP_NETLIST_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_NETLIST_NUMBER		0
-
-#define GLIBTOP_MAX_NETLIST		1
-
-typedef struct _glibtop_netlist	glibtop_netlist;
-
-struct _glibtop_netlist
-{
-	guint64 flags;
-	guint32 number;
-};
-
-char** glibtop_get_netlist(glibtop_netlist *buf);
-
-#if GLIBTOP_SUID_NETLIST
-#define glibtop_get_netlist_r		glibtop_get_netlist_p
-#else
-#define glibtop_get_netlist_r		glibtop_get_netlist_s
-#endif
-
-char** glibtop_get_netlist_l (glibtop *server, glibtop_netlist *buf);
-
-#if GLIBTOP_SUID_NETLIST
-void glibtop_init_netlist_p (glibtop *server);
-char** glibtop_get_netlist_p (glibtop *server, glibtop_netlist *buf);
-#else
-void glibtop_init_netlist_s (glibtop *server);
-char** glibtop_get_netlist_s (glibtop *server, glibtop_netlist *buf);
-#endif
-
-
-G_END_DECLS
-
-#endif

include/glibtop/netload.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_NETLOAD_IF_FLAGS	0
 #define GLIBTOP_NETLOAD_MTU		1
@@ -43,12 +43,8 @@ G_BEGIN_DECLS
 #define GLIBTOP_NETLOAD_ERRORS_OUT	11
 #define GLIBTOP_NETLOAD_ERRORS_TOTAL	12
 #define GLIBTOP_NETLOAD_COLLISIONS	13
-#define GLIBTOP_NETLOAD_ADDRESS6	14
-#define GLIBTOP_NETLOAD_PREFIX6		15
-#define GLIBTOP_NETLOAD_SCOPE6		16
-#define GLIBTOP_NETLOAD_HWADDRESS	17
 
-#define GLIBTOP_MAX_NETLOAD		18
+#define GLIBTOP_MAX_NETLOAD		14
 
 typedef struct _glibtop_netload	glibtop_netload;
 
@@ -71,25 +67,14 @@ enum {
 	GLIBTOP_IF_FLAGS_MULTICAST
 };
 
-enum GLIBTOP_IF_IN6_SCOPE
-{
-	GLIBTOP_IF_IN6_SCOPE_UNKNOWN = 0,
-	GLIBTOP_IF_IN6_SCOPE_LINK    = 1,
-	GLIBTOP_IF_IN6_SCOPE_SITE    = 2,
-	GLIBTOP_IF_IN6_SCOPE_GLOBAL  = 4,
-	GLIBTOP_IF_IN6_SCOPE_HOST    = 8
-};
-
 struct _glibtop_netload
 {
-	guint64	flags,
-		if_flags;		/* GLIBTOP_NETLOAD_IF_FLAGS	*/
-
-	guint32	mtu,			/* GLIBTOP_NETLOAD_MTU		*/
+	u_int64_t	flags,
+		if_flags,		/* GLIBTOP_NETLOAD_IF_FLAGS	*/
+		mtu,			/* GLIBTOP_NETLOAD_MTU		*/
 		subnet,			/* GLIBTOP_NETLOAD_SUBNET	*/
-		address;		/* GLIBTOP_NETLOAD_ADDRESS	*/
-
-	guint64	packets_in,		/* GLIBTOP_NETLOAD_PACKETS_IN	*/
+		address,		/* GLIBTOP_NETLOAD_ADDRESS	*/
+		packets_in,		/* GLIBTOP_NETLOAD_PACKETS_IN	*/
 		packets_out,		/* GLIBTOP_NETLOAD_PACKETS_OUT	*/
 		packets_total,		/* GLIBTOP_NETLOAD_PACKETS_TOTAL*/
 		bytes_in,		/* GLIBTOP_NETLOAD_BYTES_IN	*/
@@ -99,15 +84,9 @@ struct _glibtop_netload
 		errors_out,		/* GLIBTOP_NETLOAD_ERRORS_OUT	*/
 		errors_total,		/* GLIBTOP_NETLOAD_ERRORS_TOTAL	*/
 		collisions;		/* GLIBTOP_NETLOAD_COLLISIONS	*/
-
-	guint8 address6[16];		/* GLIBTOP_NETLOAD_ADDRESS6     */
-	guint8 prefix6[16];		/* GLIBTOP_NETLOAD_PREXIF6      */
-	guint8 scope6;			/* GLIBTOP_NETLOAD_SCOPE6       */
-
-	guint8 hwaddress[8];		/* GLIBTOP_NETLOAD_HWADDRESS    */
 };
 
-void glibtop_get_netload(glibtop_netload *buf, const char *interface);
+#define glibtop_get_netload(netload,interface)	glibtop_get_netload_l(glibtop_global_server, netload, interface)
 
 #if GLIBTOP_SUID_NETLOAD
 #define glibtop_get_netload_r	glibtop_get_netload_p
@@ -125,7 +104,17 @@ void glibtop_init_netload_s (glibtop *server);
 void glibtop_get_netload_s (glibtop *server, glibtop_netload *buf, const char *interface);
 #endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_netload [];
+extern const unsigned glibtop_types_netload [];
+extern const char *glibtop_labels_netload [];
+extern const char *glibtop_descriptions_netload [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/open.h

@@ -23,8 +23,10 @@
 #define __GLIBTOP_OPEN_H__
 
 #include <glibtop.h>
+#include <glibtop/read.h>
+#include <glibtop/error.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define _GLIBTOP_INIT_STATE_INIT	0x10000
 #define _GLIBTOP_INIT_STATE_OPEN	0x20000
@@ -66,6 +68,6 @@ glibtop_open_s (glibtop *server, const char *program_name,
 		const unsigned long features, const unsigned flags);
 
 
-G_END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/parameter.h

@@ -23,8 +23,9 @@
 #define __GLIBTOP_PARAMETER_H__
 
 #include <glibtop.h>
+#include <glibtop/open.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PARAM_METHOD		1
 #define GLIBTOP_PARAM_FEATURES		2
@@ -45,6 +46,6 @@ void
 glibtop_set_parameter_l (glibtop *server, const unsigned parameter,
 			 const void *data_ptr, size_t data_size);
 
-G_END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/ppp.h

@@ -27,10 +27,10 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PPP_STATE	0
-#define GLIBTOP_PPP_BYTES_IN	1
+#define GLIBTOP_PPP_BYTES_IN	1	
 #define GLIBTOP_PPP_BYTES_OUT	2
 
 #define GLIBTOP_MAX_PPP		3
@@ -45,13 +45,13 @@ enum {
 
 struct _glibtop_ppp
 {
-	guint64	flags,
+	u_int64_t	flags,
 		state,			/* GLIBTOP_PPP_STATE		*/
 		bytes_in,		/* GLIBTOP_PPP_BYTES_IN		*/
 		bytes_out;		/* GLIBTOP_PPP_BYTES_OUT	*/
 };
 
-void glibtop_get_ppp(glibtop_ppp *buf, unsigned short device);
+#define glibtop_get_ppp(ppp,device)	glibtop_get_ppp_l(glibtop_global_server, ppp, device)
 
 #if GLIBTOP_SUID_PPP
 #define glibtop_get_ppp_r	glibtop_get_ppp_p
@@ -69,7 +69,17 @@ void glibtop_init_ppp_s (glibtop *server);
 void glibtop_get_ppp_s (glibtop *server, glibtop_ppp *buf, unsigned short device);
 #endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_ppp [];
+extern const unsigned glibtop_types_ppp [];
+extern const char *glibtop_labels_ppp [];
+extern const char *glibtop_descriptions_ppp [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/procargs.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROC_ARGS_SIZE		0
 
@@ -37,54 +37,47 @@ typedef struct _glibtop_proc_args	glibtop_proc_args;
 
 struct _glibtop_proc_args
 {
-	guint64	flags,
+	u_int64_t	flags,
 		size;			/* GLIBTOP_PROC_ARGS_SIZE	*/
 };
 
+#define glibtop_get_proc_args(proc_args,pid,max_len) glibtop_get_proc_args_l(glibtop_global_server, proc_args, pid, max_len)
+
+#if GLIBTOP_SUID_PROC_ARGS
+#define glibtop_get_proc_args_r		glibtop_get_proc_args_p
+#else
+#define glibtop_get_proc_args_r		glibtop_get_proc_args_s
+#endif
 
 char *
 glibtop_get_proc_args_l (glibtop *server, glibtop_proc_args *buf,
 			 pid_t pid, unsigned max_len);
 
-char *
-glibtop_get_proc_args (glibtop_proc_args *buf, pid_t pid, unsigned max_len);
-
 #if GLIBTOP_SUID_PROC_ARGS
+void glibtop_init_proc_args_p (glibtop *server);
 
-# define glibtop_get_proc_args_r		glibtop_get_proc_args_p
-
-  void glibtop_init_proc_args_p (glibtop *server);
-
-  char *
-  glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
-			   pid_t pid, unsigned max_len);
-
-
-#else /* !GLIBTOP_SUID_PROC_ARGS */
-
-# define glibtop_get_proc_args_r		glibtop_get_proc_args_s
-
-  void glibtop_init_proc_args_s (glibtop *server);
-
-  char *
-  glibtop_get_proc_args_s (glibtop *server, glibtop_proc_args *buf,
-			   pid_t pid, unsigned max_len);
-#endif /* GLIBTOP_SUID_PROC_ARGS */
-
-
-
-/*
- * NEW functions
- */
-
-char **
-glibtop_get_proc_argv_l (glibtop *server, glibtop_proc_args *buf,
+char *
+glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
 			 pid_t pid, unsigned max_len);
+#else
+void glibtop_init_proc_args_s (glibtop *server);
 
-char **
-glibtop_get_proc_argv (glibtop_proc_args *buf, pid_t pid, unsigned max_len);
+char *
+glibtop_get_proc_args_s (glibtop *server, glibtop_proc_args *buf,
+			 pid_t pid, unsigned max_len);
+#endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_proc_args [];
+extern const unsigned glibtop_types_proc_args [];
+extern const char *glibtop_labels_proc_args [];
+extern const char *glibtop_descriptions_proc_args [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/prockernel.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROC_KERNEL_K_FLAGS	0
 #define GLIBTOP_PROC_KERNEL_MIN_FLT	1
@@ -47,8 +47,8 @@ typedef struct _glibtop_proc_kernel	glibtop_proc_kernel;
 
 struct _glibtop_proc_kernel
 {
-	guint64 flags;
-	guint64 k_flags,	/* kernel flags for the process */
+	u_int64_t flags;
+	u_int64_t k_flags,	/* kernel flags for the process */
 		min_flt,	/* number of minor page faults since
 				 * process start */
 		maj_flt,	/* number of major page faults since
@@ -64,7 +64,7 @@ struct _glibtop_proc_kernel
 	char wchan [40];
 };
 
-void glibtop_get_proc_kernel(glibtop_proc_kernel *buf, pid_t pid);
+#define glibtop_get_proc_kernel(p1, p2)	glibtop_get_proc_kernel_l(glibtop_global_server, p1, p2)
 
 #if GLIBTOP_SUID_PROC_KERNEL
 #define glibtop_get_proc_kernel_r	glibtop_get_proc_kernel_p
@@ -82,7 +82,17 @@ void glibtop_init_proc_kernel_s (glibtop *server);
 void glibtop_get_proc_kernel_s (glibtop *server, glibtop_proc_kernel *buf, pid_t pid);
 #endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_proc_kernel [];
+extern const unsigned glibtop_types_proc_kernel [];
+extern const char *glibtop_labels_proc_kernel [];
+extern const char *glibtop_descriptions_proc_kernel [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/proclist.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROCLIST_NUMBER	0
 #define GLIBTOP_PROCLIST_TOTAL	1
@@ -56,14 +56,13 @@ typedef struct _glibtop_proclist	glibtop_proclist;
 
 struct _glibtop_proclist
 {
-	guint64	flags,
+	u_int64_t	flags,
 		number,			/* GLIBTOP_PROCLIST_NUMBER	*/
 		total,			/* GLIBTOP_PROCLIST_TOTAL	*/
 		size;			/* GLIBTOP_PROCLIST_SIZE	*/
 };
 
-unsigned *
-glibtop_get_proclist(glibtop_proclist *buf, gint64 which, gint64 arg);
+#define glibtop_get_proclist(proclist,which,arg) glibtop_get_proclist_l(glibtop_global_server, proclist, which, arg)
 
 #if GLIBTOP_SUID_PROCLIST
 #define glibtop_get_proclist_r		glibtop_get_proclist_p
@@ -73,23 +72,33 @@ glibtop_get_proclist(glibtop_proclist *buf, gint64 which, gint64 arg);
 
 unsigned *
 glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf,
-			gint64 which, gint64 arg);
+			int64_t which, int64_t arg);
 
 #if GLIBTOP_SUID_PROCLIST
 void glibtop_init_proclist_p (glibtop *server);
 
 unsigned *
 glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
-			gint64 which, gint64 arg);
+			int64_t which, int64_t arg);
 #else
 void glibtop_init_proclist_s (glibtop *server);
 
 unsigned *
 glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
-			gint64 which, gint64 arg);
+			int64_t which, int64_t arg);
 #endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_proclist [];
+extern const unsigned glibtop_types_proclist [];
+extern const char *glibtop_labels_proclist [];
+extern const char *glibtop_descriptions_proclist [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/procmap.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROC_MAP_NUMBER		0
 #define GLIBTOP_PROC_MAP_TOTAL		1
@@ -35,15 +35,15 @@ G_BEGIN_DECLS
 
 #define GLIBTOP_MAX_PROC_MAP		3
 
-#define GLIBTOP_MAP_ENTRY_START		0
-#define GLIBTOP_MAP_ENTRY_END		1
-#define GLIBTOP_MAP_ENTRY_OFFSET	2
-#define GLIBTOP_MAP_ENTRY_PERM		3
-#define GLIBTOP_MAP_ENTRY_INODE		4
-#define GLIBTOP_MAP_ENTRY_DEVICE	5
-#define GLIBTOP_MAP_ENTRY_FILENAME	6
+#define GLIBTOP_MAP_ENTRY_START		1
+#define GLIBTOP_MAP_ENTRY_END		2
+#define GLIBTOP_MAP_ENTRY_OFFSET	3
+#define GLIBTOP_MAP_ENTRY_PERM		4
+#define GLIBTOP_MAP_ENTRY_INODE		5
+#define GLIBTOP_MAP_ENTRY_DEVICE	6
+#define GLIBTOP_MAP_ENTRY_FILENAME	7
 
-#define GLIBTOP_MAX_MAP_ENTRY		7
+#define GLIBTOP_MAX_MAP_ENTRY		8
 
 #define GLIBTOP_MAP_FILENAME_LEN	215
 
@@ -59,20 +59,19 @@ typedef struct _glibtop_proc_map	glibtop_proc_map;
 
 struct _glibtop_map_entry
 {
-	guint64 flags, start, end, offset, perm, inode, device;
+	u_int64_t flags, start, end, offset, perm, inode, device;
 	char filename [GLIBTOP_MAP_FILENAME_LEN+1];
 };
 
 struct _glibtop_proc_map
 {
-	guint64	flags,
+	u_int64_t	flags,
 		number,			/* GLIBTOP_PROC_MAP_NUMBER	*/
 		total,			/* GLIBTOP_PROC_MAP_TOTAL	*/
 		size;			/* GLIBTOP_PROC_MAP_SIZE	*/
 };
-glibtop_map_entry *
-glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid);
 
+#define glibtop_get_proc_map(proc_map,pid) glibtop_get_proc_map_l(glibtop_global_server, proc_map, pid)
 
 #if GLIBTOP_SUID_PROC_MAP
 #define glibtop_get_proc_map_r		glibtop_get_proc_map_p
@@ -95,7 +94,17 @@ glibtop_map_entry *
 glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf, pid_t pid);
 #endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_proc_map [];
+extern const unsigned glibtop_types_proc_map [];
+extern const char *glibtop_labels_proc_map [];
+extern const char *glibtop_descriptions_proc_map [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/procmem.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROC_MEM_SIZE		0
 #define GLIBTOP_PROC_MEM_VSIZE		1
@@ -44,7 +44,7 @@ typedef struct _glibtop_proc_mem	glibtop_proc_mem;
 
 struct _glibtop_proc_mem
 {
-	guint64	flags,
+	u_int64_t	flags,
 		size,		/* total # of pages of memory */
 		vsize,		/* number of pages of virtual memory ... */
 		resident,	/* number of resident set
@@ -55,7 +55,7 @@ struct _glibtop_proc_mem
 				 * of the process; usually 2,147,483,647 */
 };
 
-void glibtop_get_proc_mem(glibtop_proc_mem *buf, pid_t pid);
+#define glibtop_get_proc_mem(p1, p2)	glibtop_get_proc_mem_l(glibtop_global_server, p1, p2)
 
 #if GLIBTOP_SUID_PROC_MEM
 #define glibtop_get_proc_mem_r		glibtop_get_proc_mem_p
@@ -73,7 +73,17 @@ void glibtop_init_proc_mem_s (glibtop *server);
 void glibtop_get_proc_mem_s (glibtop *server, glibtop_proc_mem *buf, pid_t pid);
 #endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_proc_mem [];
+extern const unsigned glibtop_types_proc_mem [];
+extern const char *glibtop_labels_proc_mem [];
+extern const char *glibtop_descriptions_proc_mem [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/procopenfiles.h

@@ -1,123 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   Copyright (C) 2004 Nicolás Lichtmaier
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   Modified by Nicolás Lichtmaier to give open process files.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_PROC_OPEN_FILES_H__
-#define __GLIBTOP_PROC_OPEN_FILES_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_PROC_OPEN_FILES_NUMBER		0
-#define GLIBTOP_PROC_OPEN_FILES_TOTAL		1
-#define GLIBTOP_PROC_OPEN_FILES_SIZE		2
-
-#define GLIBTOP_MAX_PROC_OPEN_FILES		3
-
-#define GLIBTOP_FILE_ENTRY_FD				0
-#define GLIBTOP_FILE_ENTRY_NAME				1
-#define GLIBTOP_FILE_ENTRY_TYPE				2
-#define GLIBTOP_FILE_ENTRY_INETSOCKET_DST_HOST		3
-#define GLIBTOP_FILE_ENTRY_INETSOCKET_DST_PORT		4
-
-#define GLIBTOP_MAX_OPEN_FILE_ENTRY		5
-
-#define GLIBTOP_OPEN_FILENAME_LEN	215
- /* ready for IPv6 */
-#define GLIBTOP_OPEN_DEST_HOST_LEN	46
-
-enum glibtop_file_type {
-	GLIBTOP_FILE_TYPE_FILE		= 1,
-	GLIBTOP_FILE_TYPE_PIPE		= 2,
-	GLIBTOP_FILE_TYPE_INETSOCKET	= 4,
-	GLIBTOP_FILE_TYPE_LOCALSOCKET	= 8
-};
-
-typedef struct _glibtop_open_files_entry glibtop_open_files_entry;
-
-typedef struct _glibtop_proc_open_files	glibtop_proc_open_files;
-
-struct _glibtop_open_files_entry
-{
-	int fd;
-	guint16 type; /* An "enum glibtop_file_type" value. */
-	union {
-		/* When type == GLIBTOP_FILE_TYPE_INETSOCKET */
-		struct {
-			char dest_host[GLIBTOP_OPEN_DEST_HOST_LEN+1];
-			int dest_port;
-		} sock;
-
-		/* When type == GLIBTOP_FILE_TYPE_FILE */
-		struct {
-			char name[GLIBTOP_OPEN_FILENAME_LEN+1];
-		} file;
-
-		/* When type == GLIBTOP_FILE_TYPE_LOCALSOCKET */
-		struct {
-			char name[GLIBTOP_OPEN_FILENAME_LEN+1];
-		} localsock;
-
-	} info;
-};
-
-struct _glibtop_proc_open_files
-{
-	guint64	flags,
-		number,			/* GLIBTOP_PROC_OPEN_FILES_NUMBER */
-		total,			/* GLIBTOP_PROC_OPEN_FILES_TOTAL  */
-		size;			/* GLIBTOP_PROC_OPEN_FILES_SIZE   */
-};
-
-glibtop_open_files_entry *
-glibtop_get_proc_open_files(glibtop_proc_open_files *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_FILE
-#define glibtop_get_proc_open_files_r		glibtop_get_proc_open_files_p
-#else
-#define glibtop_get_proc_open_files_r		glibtop_get_proc_open_files_s
-#endif
-
-glibtop_open_files_entry *
-glibtop_get_proc_open_files_l (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_FILE
-void glibtop_init_proc_open_files_p (glibtop *server);
-
-glibtop_open_files_entry *
-glibtop_get_proc_open_files_p (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
-#else
-void glibtop_init_proc_open_files_s (glibtop *server);
-
-glibtop_open_files_entry *
-glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
-#endif
-
-G_END_DECLS
-
-#endif

include/glibtop/procsegment.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROC_SEGMENT_TEXT_RSS		0
 #define GLIBTOP_PROC_SEGMENT_SHLIB_RSS		1
@@ -46,7 +46,7 @@ typedef struct _glibtop_proc_segment	glibtop_proc_segment;
 
 struct _glibtop_proc_segment
 {
-	guint64	flags,
+	u_int64_t	flags,
 		text_rss,	/* text resident set size */
 		shlib_rss,	/* shared-lib resident set size */
 		data_rss,	/* data resident set size */
@@ -58,7 +58,7 @@ struct _glibtop_proc_segment
 		start_stack;	/* address of the bottom of stack segment */
 };
 
-void glibtop_get_proc_segment(glibtop_proc_segment *buf, pid_t pid);
+#define glibtop_get_proc_segment(p1, p2)	glibtop_get_proc_segment_l(glibtop_global_server, p1, p2)
 
 #if GLIBTOP_SUID_PROC_SEGMENT
 #define glibtop_get_proc_segment_r	glibtop_get_proc_segment_p
@@ -76,7 +76,17 @@ void glibtop_init_proc_segment_s (glibtop *server);
 void glibtop_get_proc_segment_s (glibtop *server, glibtop_proc_segment *buf, pid_t pid);
 #endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_proc_segment [];
+extern const unsigned glibtop_types_proc_segment [];
+extern const char *glibtop_labels_proc_segment [];
+extern const char *glibtop_descriptions_proc_segment [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/procsignal.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROC_SIGNAL_SIGNAL	0
 #define GLIBTOP_PROC_SIGNAL_BLOCKED	1
@@ -42,14 +42,14 @@ typedef struct _glibtop_proc_signal	glibtop_proc_signal;
 
 struct _glibtop_proc_signal
 {
-	guint64	flags,
+	u_int64_t	flags,
 		signal [2],		/* mask of pending signals */
 		blocked [2],		/* mask of blocked signals */
 		sigignore [2],		/* mask of ignored signals */
 		sigcatch [2];		/* mask of caught  signals */
 };
 
-void glibtop_get_proc_signal(glibtop_proc_signal *buf, pid_t pid);
+#define glibtop_get_proc_signal(p1, p2)	glibtop_get_proc_signal_l(glibtop_global_server, p1, p2)
 
 #if GLIBTOP_SUID_PROC_SIGNAL
 #define glibtop_get_proc_signal_r	glibtop_get_proc_signal_p
@@ -67,7 +67,17 @@ void glibtop_init_proc_signal_s (glibtop *server);
 void glibtop_get_proc_signal_s (glibtop *server, glibtop_proc_signal *buf, pid_t pid);
 #endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_proc_signal [];
+extern const unsigned glibtop_types_proc_signal [];
+extern const char *glibtop_labels_proc_signal [];
+extern const char *glibtop_descriptions_proc_signal [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/procstate.h

@@ -27,27 +27,14 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROC_STATE_CMD		0
 #define GLIBTOP_PROC_STATE_STATE	1
 #define GLIBTOP_PROC_STATE_UID		2
 #define GLIBTOP_PROC_STATE_GID		3
-#define GLIBTOP_PROC_STATE_RUID     4
-#define GLIBTOP_PROC_STATE_RGID     5
-#define GLIBTOP_PROC_STATE_HAS_CPU  6
-#define GLIBTOP_PROC_STATE_PROCESSOR 7
-#define GLIBTOP_PROC_STATE_LAST_PROCESSOR 8
 
-#define GLIBTOP_MAX_PROC_STATE		9
-
-#define GLIBTOP_PROCESS_RUNNING                 1
-#define GLIBTOP_PROCESS_INTERRUPTIBLE           2
-#define GLIBTOP_PROCESS_UNINTERRUPTIBLE         4
-#define GLIBTOP_PROCESS_ZOMBIE                  8
-#define GLIBTOP_PROCESS_STOPPED                 16
-#define GLIBTOP_PROCESS_SWAPPING                32
-#define GLIBTOP_PROCESS_DEAD                    64
+#define GLIBTOP_MAX_PROC_STATE		4
 
 typedef struct _glibtop_proc_state	glibtop_proc_state;
 
@@ -55,10 +42,10 @@ typedef struct _glibtop_proc_state	glibtop_proc_state;
 
 struct _glibtop_proc_state
 {
-	guint64 flags;
-	char cmd[40];		/* basename of executable file in
+	u_int64_t flags;
+	char cmd[40],		/* basename of executable file in 
 				 * call to exec(2) */
-	unsigned state;		/* single-char code for process state
+		state;		/* single-char code for process state
 				 * (S=sleeping) */
 	/* NOTE: when porting the library, TRY HARD to implement the
 	 *       following two fields. */
@@ -66,15 +53,10 @@ struct _glibtop_proc_state
 	 *                   only to set the flags value for those two
 	 *                   fields if their values are corrent ! */
 	int uid,		/* UID of process */
-		gid,		/* GID of process */
-        ruid,
-        rgid;
-    int has_cpu,
-        processor,
-        last_processor;
+		gid;		/* GID of process */
 };
 
-void glibtop_get_proc_state(glibtop_proc_state *buf, pid_t pid);
+#define glibtop_get_proc_state(p1, p2)	glibtop_get_proc_state_l(glibtop_global_server, p1, p2)
 
 #if GLIBTOP_SUID_PROC_STATE
 #define glibtop_get_proc_state_r	glibtop_get_proc_state_p
@@ -91,8 +73,18 @@ void glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf, pid_t p
 void glibtop_init_proc_state_s (glibtop *server);
 void glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf, pid_t pid);
 #endif
+     
+#ifdef GLIBTOP_NAMES
 
+/* You need to link with -lgtop_names to get this stuff here. */
 
-G_END_DECLS
+extern const char *glibtop_names_proc_state [];
+extern const unsigned glibtop_types_proc_state [];
+extern const char *glibtop_labels_proc_state [];
+extern const char *glibtop_descriptions_proc_state [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/proctime.h

@@ -28,7 +28,7 @@
 #include <glibtop/cpu.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROC_TIME_START_TIME	0
 #define GLIBTOP_PROC_TIME_RTIME		1
@@ -50,15 +50,15 @@ typedef struct _glibtop_proc_time	glibtop_proc_time;
 
 struct _glibtop_proc_time
 {
-	guint64	flags,
-		start_time,	/* start time of process --
+	u_int64_t	flags,
+		start_time,	/* start time of process -- 
 				 * seconds since 1-1-70 */
 		rtime,		/* real time accumulated by process */
 		utime,		/* user-mode CPU time accumulated by process */
 		stime,		/* kernel-mode CPU time accumulated by process */
-		cutime,		/* cumulative utime of process and
+		cutime,		/* cumulative utime of process and 
 				 * reaped children */
-		cstime,		/* cumulative stime of process and
+		cstime,		/* cumulative stime of process and 
 				 * reaped children */
 		timeout,	/* The time (in jiffies) of the process's
 				 * next timeout */
@@ -70,8 +70,7 @@ struct _glibtop_proc_time
 		xcpu_stime [GLIBTOP_NCPU];	/* SMP machines. */
 };
 
-
-void glibtop_get_proc_time(glibtop_proc_time *buf, pid_t pid);
+#define glibtop_get_proc_time(p1, p2)	glibtop_get_proc_time_l(glibtop_global_server, p1, p2)
 
 #if GLIBTOP_SUID_PROC_TIME
 #define glibtop_get_proc_time_r	glibtop_get_proc_time_p
@@ -89,7 +88,17 @@ void glibtop_init_proc_time_s (glibtop *server);
 void glibtop_get_proc_time_s (glibtop *server, glibtop_proc_time *buf, pid_t pid);
 #endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_proc_time [];
+extern const unsigned glibtop_types_proc_time [];
+extern const char *glibtop_labels_proc_time [];
+extern const char *glibtop_descriptions_proc_time [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/procuid.h

@@ -27,46 +27,34 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROC_UID_UID		0
 #define GLIBTOP_PROC_UID_EUID		1
 #define GLIBTOP_PROC_UID_GID		2
 #define GLIBTOP_PROC_UID_EGID		3
-#define GLIBTOP_PROC_UID_SUID		4
-#define GLIBTOP_PROC_UID_SGID		5
-#define GLIBTOP_PROC_UID_FSUID		6
-#define GLIBTOP_PROC_UID_FSGID		7
-#define GLIBTOP_PROC_UID_PID		8
-#define GLIBTOP_PROC_UID_PPID		9
-#define GLIBTOP_PROC_UID_PGRP		10
-#define GLIBTOP_PROC_UID_SESSION	11
-#define GLIBTOP_PROC_UID_TTY		12
-#define GLIBTOP_PROC_UID_TPGID		13
-#define GLIBTOP_PROC_UID_PRIORITY	14
-#define GLIBTOP_PROC_UID_NICE		15
-#define GLIBTOP_PROC_UID_NGROUPS    16
-#define GLIBTOP_PROC_UID_GROUPS     17
+#define GLIBTOP_PROC_UID_PID		4
+#define GLIBTOP_PROC_UID_PPID		5
+#define GLIBTOP_PROC_UID_PGRP		6
+#define GLIBTOP_PROC_UID_SESSION	7
+#define GLIBTOP_PROC_UID_TTY		8
+#define GLIBTOP_PROC_UID_TPGID		9
+#define GLIBTOP_PROC_UID_PRIORITY	10
+#define GLIBTOP_PROC_UID_NICE		11
 
-#define GLIBTOP_MAX_PROC_UID		18
+#define GLIBTOP_MAX_PROC_UID		12
 
 typedef struct _glibtop_proc_uid	glibtop_proc_uid;
 
-#define GLIBTOP_MAX_GROUPS          64
-
 /* User, Group, Terminal and session */
 
 struct _glibtop_proc_uid
 {
-	guint64 flags;
-	gint32 uid,		/* user id */
+	u_int64_t flags;
+	int uid,		/* user id */
 		euid,		/* effective user id */
 		gid,		/* group id */
 		egid,		/* effective group id */
-        suid,       /* set user id */
-        sgid,       /* set group id */
-        fsuid,      /* ??? user id */
-        fsgid,      /* ??? group id */
 		pid,		/* process id */
 		ppid,		/* pid of parent process */
 		pgrp,		/* process group id */
@@ -74,13 +62,10 @@ struct _glibtop_proc_uid
 		tty,		/* full device number of controlling terminal */
 		tpgid,		/* terminal process group id */
 		priority,	/* kernel scheduling priority */
-		nice,		/* standard unix nice level of process */
-		ngroups,
-        groups [GLIBTOP_MAX_GROUPS];
-
+		nice;		/* standard unix nice level of process */
 };
 
-void glibtop_get_proc_uid(glibtop_proc_uid *buf, pid_t pid);
+#define glibtop_get_proc_uid(p1, p2)	glibtop_get_proc_uid_l(glibtop_global_server, p1, p2)
 
 #if GLIBTOP_SUID_PROC_UID
 #define glibtop_get_proc_uid_r		glibtop_get_proc_uid_p
@@ -98,7 +83,17 @@ void glibtop_init_proc_uid_s (glibtop *server);
 void glibtop_get_proc_uid_s (glibtop *server, glibtop_proc_uid *buf, pid_t pid);
 #endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_proc_uid [];
+extern const unsigned glibtop_types_proc_uid [];
+extern const char *glibtop_labels_proc_uid [];
+extern const char *glibtop_descriptions_proc_uid [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/read.h

@@ -25,14 +25,15 @@
 #define __GLIBTOP_READ_H__
 
 #include <glibtop.h>
+#include <glibtop/error.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define glibtop_read(p1, p2)	glibtop_read(glibtop_global_server, p1, p2)
 
 void glibtop_read_l (glibtop *server, size_t size, void *buf);
 void glibtop_read_s (glibtop *server, size_t size, void *buf);
 
-G_END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/read_data.h

@@ -25,14 +25,15 @@
 #define __GLIBTOP_READ_DATA_H__
 
 #include <glibtop.h>
+#include <glibtop/error.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define glibtop_read_data()	glibtop_read_data_r(glibtop_global_server)
 
 void *glibtop_read_data_l (glibtop *server);
 void *glibtop_read_data_s (glibtop *server);
 
-G_END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/sem_limits.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_IPC_SEMMAP	0
 #define GLIBTOP_IPC_SEMMNI	1
@@ -46,7 +46,7 @@ typedef struct _glibtop_sem_limits	glibtop_sem_limits;
 
 struct _glibtop_sem_limits
 {
-	guint64	flags,
+	u_int64_t	flags,
 		semmap,		/* GLIBTOP_IPC_SEMMAP	*/
 		semmni,		/* GLIBTOP_IPC_SEMMNI	*/
 		semmns,		/* GLIBTOP_IPC_SEMMNS	*/
@@ -59,7 +59,7 @@ struct _glibtop_sem_limits
 		semaem;		/* GLIBTOP_IPC_SEMAEM	*/
 };
 
-void glibtop_get_sem_limits(glibtop_sem_limits *buf);
+#define glibtop_get_sem_limits(sem)	glibtop_get_sem_limits_l(glibtop_global_server, sem)
 
 #if GLIBTOP_SUID_SEM_LIMITS
 #define glibtop_get_sem_limits_r	glibtop_get_sem_limits_p
@@ -77,7 +77,17 @@ void glibtop_init_sem_limits_s (glibtop *server);
 void glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf);
 #endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_sem_limits [];
+extern const unsigned glibtop_types_sem_limits [];
+extern const char *glibtop_labels_sem_limits [];
+extern const char *glibtop_descriptions_sem_limits [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/shm_limits.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_IPC_SHMMAX	0
 #define GLIBTOP_IPC_SHMMIN	1
@@ -41,7 +41,7 @@ typedef struct _glibtop_shm_limits	glibtop_shm_limits;
 
 struct _glibtop_shm_limits
 {
-	guint64	flags,
+	u_int64_t	flags,
 		shmmax,		/* GLIBTOP_IPC_SHMMAX	*/
 		shmmin,		/* GLIBTOP_IPC_SHMMIN	*/
 		shmmni,		/* GLIBTOP_IPC_SHMMNI	*/
@@ -49,7 +49,7 @@ struct _glibtop_shm_limits
 		shmall;		/* GLIBTOP_IPC_SHMALL	*/
 };
 
-void glibtop_get_shm_limits(glibtop_shm_limits *buf);
+#define glibtop_get_shm_limits(shm)	glibtop_get_shm_limits_l(glibtop_global_server, shm)
 
 #if GLIBTOP_SUID_SHM_LIMITS
 #define glibtop_get_shm_limits_r	glibtop_get_shm_limits_p
@@ -67,7 +67,17 @@ void glibtop_init_shm_limits_s (glibtop *server);
 void glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf);
 #endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_shm_limits [];
+extern const unsigned glibtop_types_shm_limits [];
+extern const char *glibtop_labels_shm_limits [];
+extern const char *glibtop_descriptions_shm_limits [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/signal.h

@@ -30,7 +30,7 @@
 #include <sys/signal.h>
 #endif
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 typedef struct _glibtop_signame	glibtop_signame;
 
@@ -42,6 +42,6 @@ struct _glibtop_signame
 
 extern const glibtop_signame glibtop_sys_siglist [];
 
-G_END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/swap.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_SWAP_TOTAL	0
 #define GLIBTOP_SWAP_USED	1
@@ -41,7 +41,7 @@ typedef struct _glibtop_swap	glibtop_swap;
 
 struct _glibtop_swap
 {
-	guint64	flags,
+	u_int64_t	flags,
 		total,		/* GLIBTOP_SWAP_TOTAL	*/
 		used,		/* GLIBTOP_SWAP_USED	*/
 		free,		/* GLIBTOP_SWAP_FREE	*/
@@ -49,8 +49,7 @@ struct _glibtop_swap
 		pageout;	/* GLIBTOP_SWAP_PAGEOUT	*/
 };
 
-void
-glibtop_get_swap(glibtop_swap *buf);
+#define glibtop_get_swap(swap)	glibtop_get_swap_l(glibtop_global_server, swap)
 
 #if GLIBTOP_SUID_SWAP
 #define glibtop_get_swap_r		glibtop_get_swap_p
@@ -68,7 +67,17 @@ void glibtop_init_swap_s (glibtop *server);
 void glibtop_get_swap_s (glibtop *server, glibtop_swap *buf);
 #endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_swap [];
+extern const unsigned glibtop_types_swap [];
+extern const char *glibtop_labels_swap [];
+extern const char *glibtop_descriptions_swap [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/sysdeps.h

@@ -26,7 +26,7 @@
 
 #include <glibtop.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_SYSDEPS_FEATURES	0
 #define GLIBTOP_SYSDEPS_CPU		1
@@ -51,18 +51,20 @@ G_BEGIN_DECLS
 #define GLIBTOP_SYSDEPS_FSUSAGE		20
 #define GLIBTOP_SYSDEPS_NETLOAD		21
 #define GLIBTOP_SYSDEPS_PPP		22
-#define GLIBTOP_SYSDEPS_NETLIST		23
-#define GLIBTOP_SYSDEPS_PROC_OPEN_FILES	24
 
-#define GLIBTOP_MAX_SYSDEPS		25
+#define GLIBTOP_MAX_SYSDEPS		23
 
 #define GLIBTOP_SYSDEPS_ALL		((1 << GLIBTOP_MAX_SYSDEPS) - 1)
 
+typedef void (*glibtop_init_func_t) (glibtop *);
+extern glibtop_init_func_t _glibtop_init_hook_s [];
+extern glibtop_init_func_t _glibtop_init_hook_p [];
+
 typedef struct _glibtop_sysdeps	glibtop_sysdeps;
 
 struct _glibtop_sysdeps
 {
-	guint64 flags,
+	u_int64_t flags,
 		features,		/* server features	*/
 		cpu,			/* glibtop_cpu		*/
 		mem,			/* glibtop_mem		*/
@@ -82,18 +84,27 @@ struct _glibtop_sysdeps
 		proc_segment,		/* glibtop_proc_segment	*/
 		proc_args,		/* glibtop_proc_args	*/
 		proc_map,		/* glibtop_proc_map	*/
-		proc_open_files,	/* glibtop_proc_open_files */
 		mountlist,		/* glibtop_mountlist	*/
 		fsusage,		/* glibtop_fsusage	*/
-		netlist,		/* glibtop_netlist	*/
 		netload,		/* glibtop_netload	*/
 		ppp;			/* glibtop_ppp		*/
 };
 
-void glibtop_get_sysdeps (glibtop_sysdeps *buf);
+#define glibtop_get_sysdeps(sysdeps)	glibtop_get_sysdeps_r(glibtop_global_server,sysdeps)
+
 void glibtop_get_sysdeps_r (glibtop *server, glibtop_sysdeps *buf);
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_sysdeps [];
+extern const unsigned glibtop_types_sysdeps [];
+extern const char *glibtop_labels_sysdeps [];
+extern const char *glibtop_descriptions_sysdeps [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/sysinfo.h

@@ -30,12 +30,11 @@
 
 #include <glib.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
-#define GLIBTOP_SYSINFO_NCPU		0
-#define GLIBTOP_SYSINFO_CPUINFO		1
+#define GLIBTOP_SYSINFO_CPUINFO		0
 
-#define GLIBTOP_MAX_SYSINFO		2
+#define GLIBTOP_MAX_SYSINFO		1
 
 typedef struct _glibtop_sysinfo	glibtop_sysinfo;
 
@@ -44,21 +43,22 @@ typedef struct _glibtop_entry	glibtop_entry;
 struct _glibtop_entry
 {
 	GPtrArray	*labels;
-	GHashTable	*values; /* key -> description */
-	GHashTable	*descriptions; /* unused */
+	GHashTable	*values;
+	GHashTable	*descriptions;
 };
 
 struct _glibtop_sysinfo
 {
-	guint64	flags, ncpu;
-	glibtop_entry cpuinfo [GLIBTOP_NCPU];
+	u_int64_t	flags, ncpu;
+	glibtop_entry	cpuinfo [GLIBTOP_NCPU];
 };
 
+#define glibtop_get_sysinfo()	glibtop_get_sysinfo_s(glibtop_global_server)
+
 #define glibtop_get_sysinfo_r	glibtop_get_sysinfo_s
 
-const glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server);
-const glibtop_sysinfo *glibtop_get_sysinfo (void);
+glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server);
 
-G_END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/types.h

@@ -1,9 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */
 
-@@AUTOGEN_COMMENT@@
-
 /* Copyright (C) 1998-99 Martin Baulig
    This file is part of LibGTop 1.0.
 
@@ -25,19 +21,18 @@
    Boston, MA 02111-1307, USA.
 */
 
-#ifndef __GLIBTOP_CALL_VECTOR_H__
-#define __GLIBTOP_CALL_VECTOR_H__
+#ifndef __GLIBTOP_TYPES_H__
+#define __GLIBTOP_TYPES_H__
 
-#include <glibtop.h>
-#include <glibtop/union.h>
+BEGIN_LIBGTOP_DECLS
 
-G_BEGIN_DECLS
+#define GLIBTOP_TYPE_LONG	1
+#define GLIBTOP_TYPE_ULONG	2
+#define GLIBTOP_TYPE_DOUBLE	3
+#define GLIBTOP_TYPE_INT	4
+#define GLIBTOP_TYPE_CHAR	5
+#define GLIBTOP_TYPE_STRING	6
 
-struct _glibtop_call_vector
-{
-    @@GLIBTOP_CALL_VECTOR@@
-};
-
-G_END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/union.h

@@ -43,16 +43,14 @@
 #include <glibtop/procsegment.h>
 #include <glibtop/procargs.h>
 #include <glibtop/procmap.h>
-#include <glibtop/procopenfiles.h>
 
 #include <glibtop/mountlist.h>
 #include <glibtop/fsusage.h>
 
 #include <glibtop/netload.h>
-#include <glibtop/netlist.h>
 #include <glibtop/ppp.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 typedef union _glibtop_union	glibtop_union;
 
@@ -78,12 +76,10 @@ union _glibtop_union
 	glibtop_proc_map	proc_map;
 	glibtop_mountlist	mountlist;
 	glibtop_fsusage		fsusage;
-	glibtop_netlist		netlist;
 	glibtop_netload		netload;
 	glibtop_ppp		ppp;
-	glibtop_proc_open_files proc_open_files;
 };
 
-G_END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/uptime.h

@@ -27,25 +27,23 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_UPTIME_UPTIME		0
 #define GLIBTOP_UPTIME_IDLETIME		1
-#define GLIBTOP_UPTIME_BOOT_TIME    2
 
-#define GLIBTOP_MAX_UPTIME		3
+#define GLIBTOP_MAX_UPTIME		2
 
 typedef struct _glibtop_uptime	glibtop_uptime;
 
 struct _glibtop_uptime
 {
-	guint64 flags;
+	u_int64_t flags;
 	double uptime,		/* GLIBTOP_UPTIME_UPTIME	*/
 		idletime;	/* GLIBTOP_UPTIME_IDLETIME	*/
-	guint64 boot_time;
 };
 
-void glibtop_get_uptime (glibtop_uptime *buf);
+#define glibtop_get_uptime(uptime)	glibtop_get_uptime_l(glibtop_global_server, uptime)
 
 #if GLIBTOP_SUID_UPTIME
 #define glibtop_get_uptime_r		glibtop_get_uptime_p
@@ -63,7 +61,17 @@ void glibtop_init_uptime_s (glibtop *server);
 void glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf);
 #endif
 
+#ifdef GLIBTOP_NAMES
 
-G_END_DECLS
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_uptime [];
+extern const unsigned glibtop_types_uptime [];
+extern const char *glibtop_labels_uptime [];
+extern const char *glibtop_descriptions_uptime [];
+
+#endif
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/version.h

@@ -23,10 +23,13 @@
 #define __GLIBTOP_VERSION_H__
 
 #include <glibtop.h>
+#include <glibtop/union.h>
+#include <glibtop/sysdeps.h>
+#include <glibtop/command.h>
 
 #define LIBGTOP_VERSION_STRING "Libgtop %s server version %s (%u,%u,%u,%u)."
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #if _IN_LIBGTOP
 
@@ -34,6 +37,6 @@ void glibtop_send_version (glibtop *server, int fd);
 
 #endif
 
-G_END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/write.h

@@ -25,14 +25,15 @@
 #define __GLIBTOP_WRITE_H__
 
 #include <glibtop.h>
+#include <glibtop/error.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define glibtop_write(p1, p2)	glibtop_write(glibtop_global_server, p1, p2)
 
 void glibtop_write_l (glibtop *server, size_t size, void *buf);
 void glibtop_write_s (glibtop *server, size_t size, void *buf);
 
-G_END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/xmalloc.h

@@ -0,0 +1,46 @@
+/* $Id$ */
+
+/* Copyright (C) 1998-99 Martin Baulig
+   This file is part of LibGTop 1.0.
+
+   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
+
+   LibGTop is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License,
+   or (at your option) any later version.
+
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+   for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with LibGTop; see the file COPYING. If not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#ifndef __GLIBTOP_XMALLOC_H__
+#define __GLIBTOP_XMALLOC_H__
+
+#include <glibtop.h>
+#include <glibtop/error.h>
+
+BEGIN_LIBGTOP_DECLS
+
+#define glibtop_malloc(p1)	glibtop_malloc_r(glibtop_global_server, p1)
+#define glibtop_calloc(p1, p2)	glibtop_calloc_r(glibtop_global_server, p1, p2)
+#define glibtop_realloc(p1, p2)	glibtop_realloc_r(glibtop_global_server, p1, p2)
+#define glibtop_strdup(p1)	glibtop_strdup_r(glibtop_global_server, p1)
+#define glibtop_free(p1)	glibtop_free_r(glibtop_global_server, p1)
+
+void *glibtop_malloc_r	(glibtop *server, size_t size);
+void *glibtop_calloc_r	(glibtop *server, size_t nmemb, size_t size);
+void *glibtop_realloc_r	(glibtop *server, void *ptr, size_t size);
+char *glibtop_strdup_r	(glibtop *server, const char *string);
+void glibtop_free_r	(glibtop *server, const void *ptr);
+
+END_LIBGTOP_DECLS
+
+#endif

kernel/ChangeLog

@@ -0,0 +1,14 @@
+1998-07-21  Martin Baulig  <martin@home-of-linux.org>
+
+	* table20: New directory for 2.0.xx kernels.
+
+	* table21: New directory for 2.1.xx kernels.
+
+	* *: Moved into `table20' and `table21'.
+
+1998-06-14  Martin Baulig  <baulig@taurus.uni-trier.de>
+
+	* README: Added README.
+
+	* kernel.patch: Patch for the Linux kernel to add the
+	new system call.

kernel/sysctl/.cvsignore

@@ -0,0 +1 @@
+*.flags

kernel/sysctl/Makefile

@@ -0,0 +1,22 @@
+#
+# Makefile for the LibGTop linux sysctl interface.
+#
+# Note! Dependencies are done automagically by 'make dep', which also
+# removes any old dependencies. DON'T put your own dependencies here
+# unless it's something special (ie not a .c file).
+#
+# Note 2! The CFLAGS definition is now in the main makefile...
+
+O_TARGET := kernel.o
+ifeq ($(CONFIG_LIBGTOP),y)
+O_OJBS   := main.o libgtop.o
+else
+O_OBJS   := main.o
+endif
+OX_OBJS  := libgtop_syms.o
+
+ifeq ($(CONFIG_LIBGTOP),m)
+M_OBJS   := libgtop.o
+endif
+
+include $(TOPDIR)/Rules.make