Released 2.10.0.

* NEWS:
       * configure.in: Released 2.10.0.

.cvsignore

@@ -33,3 +33,10 @@ libgtop.spec
 libgtop*.tar.gz
 *-debstamp
 libgtop*.pc
+autom4te.cache
+COPYING
+INSTALL
+install-sh
+missing
+mkinstalldirs
+libgtopconfig.h

AUTHORS

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

LIBGTOP-VERSION

@@ -1,28 +0,0 @@
-# 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=90
-LIBGTOP_MICRO_VERSION=0
-
-LIBGTOP_INTERFACE_AGE=0
-LIBGTOP_BINARY_AGE=0
-# 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,2 +1,3 @@
 Email: martin@home-of-linux.org
 Email: dave@srce.hr
+Benoît Dejean (tazforever@dlfp.org)

Makefile.am

@@ -1,93 +1,20 @@
-## Process this file with automake to produce Makefile.in.
 
-if EXAMPLES
+SUBDIRS = po misc include sysdeps lib src examples doc
-examples_SUBDIRS = examples
-else
-examples_SUBDIRS =
-endif
 
-if BUILD_GNOME_SUPPORT
+libgtopinclude_HEADERS = glibtop.h libgtopconfig.h
-support = support
-endif
-
-SUBDIRS = . po $(support) misc include sysdeps lib src \
-	  $(examples_SUBDIRS) doc
-
-libgtopinclude_HEADERS = glibtop.h
 libgtopincludedir = $(includedir)/libgtop-2.0
 
-EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in \
+EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \
-	LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 \
+	 features.def libgtopconfig.h.in \
-	RELNOTES-1.0 RELNOTES-1.0.x libgtop-sysdeps.m4 README \
+	libgtop-sysdeps.m4 README \
-	libgtop-mirror.sh libgtop-2.0.pc.in acinclude.m4
+	 libgtop-2.0.pc.in acinclude.m4
 
 dist-hook:
 	cp libgtop.spec $(distdir)
 
-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
-		  
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgtop-2.0.pc
 
-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)/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_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,3 +1,99 @@
+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:
 =================
 

RELNOTES-0.25

@@ -1,146 +0,0 @@
-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

@@ -1,163 +0,0 @@
-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

@@ -1,172 +0,0 @@
-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>

RELNOTES-1.1.x

@@ -1,50 +0,0 @@
-RELEASE NOTES FOR LIBGTOP 1.1.2
-===============================
-
-This is a snapshot release for Solaris users of October GNOME. It contains
-a first version of the Solaris port of LibGTop which works at least on
-Solaris 7.
-
-Please use LibGTop 1.0.x if you're not on a Solaris system
-(look at the README file for details).
-
-IMPORTANT CHANGES SINCE 1.0:
-----------------------------
-
-* All `glibtop_get_<feature>_* ()' and all `glibtop_init_<feature>_* ()'
-  functions now have an `int' return value and return 0 on success and -1
-  on failure.
-
-* glibtop_cpu: Added `xcpu_flags'
-
-* glibtop_proc_state: Changed `state' from char to unsigned and added
-    GLIBTOP_PROCESS_RUNNING, GLIBTOP_PROCESS_INTERRUPTIBLE,
-    GLIBTOP_PROCESS_UNINTERRUPTIBLE,  GLIBTOP_PROCESS_ZOMBIE,
-    GLIBTOP_PROCESS_STOPPED, GLIBTOP_PROCESS_SWAPPING constants for it.
-
-* `GLIBTOP_MOUNTENTRY_LEN' and `GLIBTOP_MAX_GROUPS' are now defined in
-  <glibtop/limits.h>
-
-* Removed the `GLIBTOP_SYSDEPS_FEATURES' and `GLIBTOP_SYSDEPS_POINTER_SIZE'
-  constants from <glibtop/sysdeps.h> and let numbering start at zero for
-  `GLIBTOP_SYSDEPS_CPU'.
-
-OTHER CHANGES SINCE 1.0:
------------------------
-
-* Use G_GNUC_UNUSED in <glibtop/error.h> to avoid compiler warnings.
-
-* The `libgtop-config' script now accepts `--cflags', `--libs' and
-  `--extra-libs' parameter.
-
-* The libraries are now called -lgtop-1.1 etc. so you can use 1.0.x and
-  1.1.x in parallel.
-
-CHANGES SINCE 1.0 MAINLY INTERESTING FOR DEVELOPERS:
----------------------------------------------------
-
-* We create a `glibtop-config.h' now which gets included from <glibtop.h>
-  when we're _IN_LIBGTOP. It contains things such as `u_int64_t' etc.
-
-October 1999
-Martin Baulig

acconfig.h

@@ -126,12 +126,11 @@
 #undef HAVE_GUILE
 
 #undef ssize_t
-#undef u_int64_t
+#undef guint64
 #undef int64_t
 
 #undef HAVE_GLIBTOP_MACHINE_H
 
-#undef GLIBTOP_NAMES
 #undef GLIBTOP_GUILE
 #undef GLIBTOP_GUILE_NAMES
 #undef GLIBTOP_EXAMPLES
@@ -139,7 +138,6 @@
 
 #undef NEED_LIBGTOP
 
-#undef HAVE_LINUX_TABLE
 #undef HAVE_LIBGTOP_SMP
 
 #undef HAVE_XAUTH

acinclude.m4

@@ -43,8 +43,6 @@ dnl
 AC_DEFUN([GNOME_LIBGTOP_TYPES],
 [
         AC_CHECK_HEADERS(sys/bitypes.h)
-        AC_LIBGTOP_CHECK_TYPE(u_int64_t, unsigned long long int)
-        AC_LIBGTOP_CHECK_TYPE(int64_t, signed long long int)
 ])
 
 dnl See whether we need a declaration for a function.
@@ -588,53 +586,6 @@ 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([LIBGTOP_HACKER_TESTS],[
-	AC_REQUIRE([AC_CANONICAL_HOST])
-
-	AC_ARG_WITH(linux-table,
-      [  --with-linux-table      Use the table () function from Martin Baulig],
-	[linux_table="$withval"],[linux_table=auto])
-	case "$host_os" in
-	linux*)
-	  if test $linux_table = yes ; then
-	    AC_CHECK_HEADER(linux/table.h, linux_table=yes, linux_table=no)
-	  elif test $linux_table = auto ; then
-	    AC_MSG_CHECKING(for table function in Linux Kernel)
-	    AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <unistd.h>
-#include <linux/unistd.h>
-#include <linux/table.h>
-
-#include <syscall.h>
-
-static inline _syscall3 (int, table, int, type, union table *, tbl, const void *, param);
-
-int
-main (void)
-{
-	union table tbl;
-	int ret;
-
-	ret = table (TABLE_VERSION, NULL, NULL);
-
-	if (ret == -1)
-		exit (-errno);
-
-	exit (ret < 1 ? ret : 0);
-}
-], linux_table=yes, linux_table=no, linux_table=no)
-	    AC_MSG_RESULT($linux_table)
-	  fi
-	  if test $linux_table = yes ; then
-	    AC_DEFINE(HAVE_LINUX_TABLE)
-	  fi
-	  ;;
-	esac
-])
-
 AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	AC_REQUIRE([AC_CANONICAL_HOST])
 
@@ -654,11 +605,9 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 
 	AM_CONDITIONAL(HACKER_MODE, test x"$hacker_mode" = xyes)
 
-	linux_table=auto
 	if test x$hacker_mode = xyes ; then
 	  LIBGTOP_HACKER_TESTS
 	fi
-	AM_CONDITIONAL(LINUX_TABLE, test $linux_table = yes)
 
 	AC_ARG_WITH(libgtop-smp,
 	[  --with-libgtop-smp      Enable SMP support (default-auto)],[
@@ -690,14 +639,9 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 
 	case "$host_os" in
 	linux*)
-	  if test x$linux_table = xyes ; then
-	    libgtop_sysdeps_dir=kernel
-	    libgtop_use_machine_h=no
-	  else
 	  libgtop_sysdeps_dir=linux
 	  libgtop_use_machine_h=no
 	  libgtop_have_sysinfo=yes
-	  fi
 	  libgtop_need_server=no
 	  ;;
 	freebsd*|netbsd*|openbsd*|bsdi*)

backends/common/ChangeLog

@@ -1,3 +1,11 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* backend-common.c: (_open_common): s/u_int64_t/guint64/
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* backend-common.h: fixed compilation
+
 2000-11-26  Martin Baulig  <martin@home-of-linux.org>
 
 	* glibtop-backend-private.h: Removed.

backends/common/backend-common.c

@@ -26,7 +26,7 @@
 #include <backend-common.h>
 
 static int
-_open_common (glibtop_server *, glibtop_backend *, u_int64_t, const char **);
+_open_common (glibtop_server *, glibtop_backend *, guint64, const char **);
 
 static int
 _close_common (glibtop_server *, glibtop_backend *, void *closure);
@@ -47,7 +47,7 @@ glibtop_backend_info LibGTopBackendInfo_Common = {
 
 static int
 _open_common (glibtop_server *server, glibtop_backend *backend,
-	      u_int64_t features, const char **backend_args)
+	      guint64 features, const char **backend_args)
 {
     return 0;
 }

backends/common/backend-common.h

@@ -30,7 +30,6 @@
 #include <glibtop/global.h>
 
 #include <glibtop/open.h>
-#include <glibtop/xmalloc.h>
 #include <glibtop/glibtop-backend.h>
 #include <glibtop/glibtop-backend-info.h>
 

backends/server/ChangeLog

@@ -1,3 +1,43 @@
+2004-08-22  Benoît Dejean  <tazforever@dlfp.org>
+
+	* server.c: (handle_slave_connection): Replaced //comment by /*C89*/. 
+
+2004-03-09  Bastien Nocera  <hadess@hadess.net>
+
+	* command.c: (glibtop_call_i):
+	* demarshal.pl:
+	* marshal.pl:
+	* read_data.c: (glibtop_read_data_i):
+	* server.c: (handle_slave_connection): fix g_malloc usage on non-Linux
+	platforms (patch by Benoît Dejean <bnet@ifrance.com>)
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* backend-server.c: (_open_server):
+	* backend-server.h:
+	* command.h.in: s/u_int64_t/guint64/
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* backend-server.h:
+	* command.h.in:
+	* demarshal.pl:
+	* server.h: fixed compilation
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* backend-server.c: (_open_server):
+	* command.c: (glibtop_call_i):
+	* demarshal.pl:
+	* marshal.pl:
+	* read_data.c: (glibtop_read_data_i):
+	* server.c: (main), (handle_slave_connection):
+	replace all the xmalloc crap by glib memory management functions
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* Makefile.am: removed traces of guile, intllibs and libgnomesupport
+
 2000-11-27  Martin Baulig  <martin@home-of-linux.org>
 
 	* backend-server.c (backend_server_quark): New global variable.

backends/server/Makefile.am

@@ -50,8 +50,7 @@ libgtop_server_SOURCES = \
 
 libgtop_server_LDADD = \
 	$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la \
-	$(top_builddir)/sysdeps/common/libgtop_suid_common.la \
+	$(top_builddir)/sysdeps/common/libgtop_suid_common.la
-	@LIBSUPPORT@
 
 if ENABLE_STATIC
 libgtop_server_LDFLAGS = -static

backends/server/backend-server.c

@@ -26,7 +26,7 @@
 #include <backend-server.h>
 
 static int
-_open_server (glibtop_server *, glibtop_backend *, u_int64_t, const char **);
+_open_server (glibtop_server *, glibtop_backend *, guint64, const char **);
 
 static int
 _close_server (glibtop_server *, glibtop_backend *, void *);
@@ -47,11 +47,11 @@ glibtop_backend_info LibGTopBackendInfo_Server = {
 
 static int
 _open_server (glibtop_server *server, glibtop_backend *backend,
-	      u_int64_t features, const char **backend_args)
+	      guint64 features, const char **backend_args)
 {
     backend_server_private *priv;
 
-    priv = glibtop_calloc_r (server, 1, sizeof (backend_server_private));
+    priv = g_malloc (sizeof (backend_server_private));
 
     glibtop_backend_set_closure_data (backend, priv);
 

backends/server/backend-server.h

@@ -30,7 +30,6 @@
 #include <glibtop/global.h>
 
 #include <glibtop/open.h>
-#include <glibtop/xmalloc.h>
 #include <glibtop/glibtop-backend.h>
 #include <glibtop/glibtop-backend-info.h>
 
@@ -38,7 +37,7 @@ typedef struct _backend_server_private backend_server_private;
 
 struct _backend_server_private
 {
-    u_int64_t flags;
+    guint64 flags;
     int input [2];		/* Pipe client <- server */
     int output [2];		/* Pipe client -> server */
     pid_t pid;			/* PID of the server */

backends/server/command.c

@@ -34,14 +34,8 @@ glibtop_call_i (glibtop_server *server, backend_server_private *priv,
 		size_t recv_size, void *recv_ptr,
 		int *retval_ptr)
 {
-    glibtop_command cmnd;
+    glibtop_command cmnd = {0};
-    glibtop_response resp;
+    glibtop_response resp = {0};
-#if 0
-    int retval;
-#endif
-
-    memset (&cmnd, 0, sizeof (glibtop_command));
-    memset (&resp, 0, sizeof (glibtop_response));
 
     cmnd.command = command;
 
@@ -89,7 +83,7 @@ glibtop_call_i (glibtop_server *server, backend_server_private *priv,
 	glibtop_read_i (priv, recv_size, recv_ptr);
 
     if (resp.data_size) {
-	void *ptr = glibtop_malloc_r (server, resp.data_size);
+	void *ptr = g_malloc (resp.data_size);
 
 	glibtop_read_i (priv, resp.data_size, ptr);
 

backends/server/command.h.in

@@ -31,7 +31,7 @@
 #include <glibtop.h>
 #include <glibtop/union.h>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
 
 @@GLIBTOP_COMMAND_CONSTANTS@@
 
@@ -42,8 +42,8 @@ typedef struct _glibtop_response	glibtop_response;
 
 struct _glibtop_command
 {
-    u_int64_t	command;
+    guint64	command;
-    u_int64_t	param_size, send_size, data_size;
+    guint64	param_size, send_size, data_size;
     char	parameter [_GLIBTOP_PARAM_SIZE];
 };
 
@@ -51,9 +51,9 @@ struct _glibtop_response
 {
     int retval;
     int glibtop_errno;
-    u_int64_t recv_size, data_size;
+    guint64 recv_size, data_size;
 };
 
-END_LIBGTOP_DECLS
+G_END_DECLS
 
 #endif

backends/server/demarshal.pl

@@ -26,7 +26,6 @@ print '';
 
 print '#include <glibtop.h>';
 print '#include <glibtop/open.h>';
-print '#include <glibtop/xmalloc.h>';
 print '';
 print '#include <glibtop/sysdeps.h>';
 print '#include <glibtop/union.h>';
@@ -247,7 +246,7 @@ sub output {
   if ($line_fields[3] eq '') {
     $size_code .= "\t_LIBGTOP_RECV_buf = NULL;\n";
   } else {
-    $size_code .= "\t_LIBGTOP_RECV_buf = glibtop_malloc_r (server, _LIBGTOP_RECV_len);\n";
+    $size_code .= "\t_LIBGTOP_RECV_buf = g_malloc (_LIBGTOP_RECV_len);\n";
   }
   $size_code .= "\t_LIBGTOP_RECV_ptr = _LIBGTOP_RECV_buf;\n\n";
 
@@ -299,7 +298,7 @@ sub output {
     $recv_buf_code .= "\n";
     $recv_buf_code .= "\t_LIBGTOP_TEMP_len += sizeof (off_t) + 1;\n";
     $recv_buf_code .= "\t_LIBGTOP_TEMP_len += array.number * sizeof (off_t);\n";
-    $recv_buf_code .= "\t_LIBGTOP_ARRAY_base = glibtop_malloc_r (server, _LIBGTOP_TEMP_len);";
+    $recv_buf_code .= "\t_LIBGTOP_ARRAY_base = g_malloc (_LIBGTOP_TEMP_len);";
     $recv_buf_code .= "\t_LIBGTOP_ARRAY_ptr = _LIBGTOP_ARRAY_base;\n";
     $recv_buf_code .= "\t_LIBGTOP_ARRAY_offset = array.number * sizeof (off_t);\n";
     $recv_buf_code .= "\t_LIBGTOP_ARRAY_offset += sizeof (off_t);\n";

backends/server/marshal.pl

@@ -181,7 +181,7 @@ sub output {
     $send_buf_code = "\t/* send buffer */\n";
     $send_buf_code .= "\t_LIBGTOP_SEND_buf = ";
     if ($need_temp_storage) {
-      $send_buf_code .= "glibtop_malloc_r (server, _LIBGTOP_SEND_len+1)";
+      $send_buf_code .= "g_malloc (_LIBGTOP_SEND_len+1)";
     } else {
       $send_buf_code .= '(void *) &'.$first_param_name;
     }
@@ -190,7 +190,7 @@ sub output {
     $send_buf_code .= "\t/* data buffer */\n";
     $send_buf_code .= "\t_LIBGTOP_DATA_buf = ";
     if ($need_temp_storage) {
-      $send_buf_code .= "glibtop_malloc_r (server, _LIBGTOP_DATA_len+1)";
+      $send_buf_code .= "g_malloc (_LIBGTOP_DATA_len+1)";
     } else {
       $send_buf_code .= 'NULL';
     }
@@ -216,8 +216,8 @@ sub output {
     $call_code .= sprintf ("\t\t\t%s%s);\n", $call_prefix_space, $retval_param);
 
     if ($need_temp_storage) {
-      $send_buf_free_code = "\tglibtop_free_r (server, _LIBGTOP_SEND_buf);\n";
+      $send_buf_free_code = "\tg_free (_LIBGTOP_SEND_buf);\n";
-      $send_buf_free_code .= "\tglibtop_free_r (server, _LIBGTOP_DATA_buf);\n";
+      $send_buf_free_code .= "\tg_free (_LIBGTOP_DATA_buf);\n";
     } else {
       $send_buf_free_code = "";
     }
@@ -231,14 +231,14 @@ sub output {
       $local_var_code .= "\tchar *_LIBGTOP_ARRAY_ptr, **ptrlist;\n";
       $local_var_code .= "\toff_t *_LIBGTOP_ARRAY_off_ptr;\n";
       $local_var_code .= "\tint i;\n";
-      $call_code .= "\tptrlist = glibtop_calloc_r (server, array->number+1, sizeof (char *));\n";
+      $call_code .= "\tptrlist = g_malloc (array->number+1 * sizeof (char *));\n";
       $call_code .= "\t_LIBGTOP_ARRAY_off_ptr = (off_t *) retval;\n";
       $call_code .= "\t_LIBGTOP_ARRAY_ptr = (char *) retval;\n";
       $call_code .= "\t_LIBGTOP_ARRAY_off_ptr++;\n\n";
       $call_code .= "\tfor (i = 0; i < array->number; i++)\n";
-      $call_code .= "\t\tptrlist [i] = glibtop_strdup_r (server, _LIBGTOP_ARRAY_ptr + *_LIBGTOP_ARRAY_off_ptr++);\n";
+      $call_code .= "\t\tptrlist [i] = g_strdup (_LIBGTOP_ARRAY_ptr + *_LIBGTOP_ARRAY_off_ptr++);\n";
       $call_code .= "\tptrlist [array->number] = NULL;\n\n";
-      $call_code .= "\tglibtop_free_r (server, retval);\n";
+      $call_code .= "\tg_free (retval);\n";
       $call_code .= "\tretval = ptrlist;\n";
     }
 

backends/server/read_data.c

@@ -47,7 +47,7 @@ glibtop_read_data_i (backend_server_private *priv)
 
     if (!size) return NULL;
 
-    ptr = glibtop_malloc_r (priv->server, size);
+    ptr = g_malloc (size);
 
     ret = read (priv->input [0], ptr, size);
 

backends/server/server.c

@@ -88,8 +88,7 @@ main(int argc, char *argv[])
     server = glibtop_global_server;
 
     if (!server->_priv)
-	server->_priv = glibtop_calloc_r
+	server->_priv = g_malloc (sizeof (glibtop_server_private));
-	    (server, 1, sizeof (glibtop_server_private));
 
     glibtop_init_p (server, 0, 0);
 
@@ -110,7 +109,7 @@ handle_slave_connection (int input, int output)
     glibtop_command _cmnd, *cmnd = &_cmnd;
     glibtop *server = glibtop_global_server;
 
-    // glibtop_send_version_i (glibtop_global_server, output);
+    /* glibtop_send_version_i (glibtop_global_server, output); */
 
     while (do_read (input, cmnd, sizeof (glibtop_command))) {
 	size_t recv_size = 0, send_size = 0, recv_data_size = 0;
@@ -156,7 +155,7 @@ handle_slave_connection (int input, int output)
 		     cmnd->data_size);
 #endif
 
-	    data_ptr = glibtop_malloc_r (server, cmnd->data_size);
+	    data_ptr = g_malloc (cmnd->data_size);
 	    do_read (input, data_ptr, cmnd->data_size);
 	}
 

backends/server/server.h

@@ -27,11 +27,9 @@
 #define __GLIBTOP_DAEMON_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 #include <glibtop/open.h>
 #include <glibtop/union.h>
-#include <glibtop/xmalloc.h>
 #include <glibtop/parameter.h>
 
 #include <fcntl.h>
@@ -44,7 +42,7 @@
 
 #include "command.h"
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
 
 /* Some don't have LOG_PERROR */
 #ifndef LOG_PERROR
@@ -80,6 +78,6 @@ glibtop_send_version_i (glibtop *server, int fd);
 extern int enable_debug;
 extern int verbose_output;
 
-END_LIBGTOP_DECLS
+G_END_DECLS
 
 #endif

backends/sysdeps/ChangeLog

@@ -1,3 +1,11 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* backend-sysdeps.c: (_open_sysdeps): s/u_int64_t/guint64/
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* backend-sysdeps.h: fixed compilation
+
 2000-11-26  Martin Baulig  <martin@home-of-linux.org>
 
 	* glibtop-backend-private.h: Removed.

backends/sysdeps/backend-sysdeps.c

@@ -26,7 +26,7 @@
 #include <backend-sysdeps.h>
 
 static int
-_open_sysdeps (glibtop_server *, glibtop_backend *, u_int64_t, const char **);
+_open_sysdeps (glibtop_server *, glibtop_backend *, guint64, const char **);
 
 static int
 _close_sysdeps (glibtop_server *, glibtop_backend *, void *);
@@ -47,7 +47,7 @@ glibtop_backend_info LibGTopBackendInfo_Sysdeps = {
 
 static int
 _open_sysdeps (glibtop_server *server, glibtop_backend *backend,
-	       u_int64_t features, const char **backend_args)
+	       guint64 features, const char **backend_args)
 {
     glibtop_init_func_t *init_fkt;
 

backends/sysdeps/backend-sysdeps.h

@@ -30,7 +30,6 @@
 #include <glibtop/global.h>
 
 #include <glibtop/open.h>
-#include <glibtop/xmalloc.h>
 #include <glibtop/glibtop-backend.h>
 #include <glibtop/glibtop-backend-info.h>
 

configure.in

@@ -7,12 +7,22 @@ AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
 
 LIBGTOP_MAJOR_VERSION=2
-LIBGTOP_MINOR_VERSION=0
+LIBGTOP_MINOR_VERSION=10
-LIBGTOP_MICRO_VERSION=5
+LIBGTOP_MICRO_VERSION=0
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
 AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
-LIBGTOP_INTERFACE_AGE=5
+
-LIBGTOP_BINARY_AGE=5
+dnl  increment if the interface has additions, changes, removals.
+LIBGTOP_CURRENT=5
+
+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=0
 
 # you can set this to `-snap' for instance to create
 # a `libgtop-1.x.y-snap.tar.gz' tarball.
@@ -36,10 +46,10 @@ AC_SUBST(LIBGTOP_VERSION_SUFFIX)
 
 # libtool versioning
 LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
-LT_CURRENT=`expr $LIBGTOP_MICRO_VERSION - $LIBGTOP_INTERFACE_AGE`
+LT_CURRENT=$LIBGTOP_CURRENT
-LT_REVISION=$LIBGTOP_INTERFACE_AGE
+LT_REVISION=$LIBGTOP_REVISION
-LT_AGE=`expr $LIBGTOP_BINARY_AGE - $LIBGTOP_INTERFACE_AGE`
+LT_AGE=$LIBGTOP_AGE
-LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_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)
@@ -81,46 +91,11 @@ export cross_compiling
 
 AM_PROG_LIBTOOL
 
-dnl Let the user enable compiler warnings
-dnl GNOME_COMPILE_WARNINGS
-
-dnl GNOME_INIT_HOOK(gnome_found=yes)
-
-dnl if test "x$gnome_found" != xyes; then
-dnl   if test "x$want_gnome" != xno ; then
-dnl     AC_MSG_ERROR([
-dnl *** GNOME was not found on this system. ***
-dnl 
-dnl *** If you want to use LibGTop without GNOME, you need
-dnl *** to give configure the --without-gnome parameter.
-dnl ])
-dnl   else
-dnl     AC_DEFINE(WITHOUT_GNOME)
-dnl   fi
-dnl   GNOME_SUPPORT_CHECKS
-dnl else
-dnl   if test "x$want_gnome" != xno ; then
-dnl     AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
-dnl   else
-dnl     GNOME_SUPPORT_CHECKS
-dnl   fi
-dnl fi
-
-AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
-
 AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
 
 GNOME_LIBGTOP_SYSDEPS
 GNOME_LIBGTOP_TYPES
 
-dnl AC_ARG_WITH(libgtop-guile,
-dnl [  --with-libgtop-guile    Build the libgtop guile interface (default=no)],
-dnl [build_guile="$withval"], [build_guile=yes])
-
-dnl if test x$build_guile != xno ; then
-dnl  GNOME_CHECK_GUILE
-dnl fi
-
 AC_ARG_WITH(libgtop-inodedb,
 [  --with-libgtop-inodedb  Build the inodedb stuff (default=no)],
 [build_inodedb="$withval"], [build_inodedb=no])
@@ -137,21 +112,6 @@ if test x$build_inodedb = xyes ; then
   AC_DEFINE(GLIBTOP_INODEDB)
 fi
 
-AC_DEFINE(GLIBTOP_NAMES)
-
-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
-  libgtop_guile_found=no
-  guile_examples=
-  guile_static_examples=
-  guile_subdirs=
-fi
 
 if test x$libgtop_smp = xyes ; then
   smp_examples='smp'
@@ -162,7 +122,7 @@ else
 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"
+  static_targets="first_static second_static mountlist_static procmap_static netload_static sysdeps_static timings_static $smp_static_examples pprint_static procargs_static df_static netlist netlist_static openfiles_static"
 else
   static_targets=""
 fi
@@ -172,22 +132,25 @@ 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
+GLIB_REQUIRED=2.6.0
-
-GLIB_REQUIRED=2.0.0
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-dnl (1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop))
+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)
+else
+   AC_MSG_ERROR([libgtop requires the popt development libraries])
+fi
 
-dnl You need to uncomment the following line if you want to use
+AC_CHECK_HEADER(ifaddrs.h, [HAVE_IFADDRS_H=yes], [HAVE_IFADDRS_H=no])
-dnl libGTop without Gnome.
+if test x$HAVE_IFADDRS_H = xyes ; then
-GNOME_SUPPORT_CHECKS
+	AC_DEFINE(HAVE_IFADDRS_H, 1, [defined if you have ifaddrs.h])
+fi
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -221,8 +184,14 @@ 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])
+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
@@ -285,7 +254,7 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
 
-ALL_LINGUAS="am ar az be bg bn ca cs cy da de el es et fa fi fr ga gl he hi hu id it ja ko lv mk ml mn ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
+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 lt lv mi mk ml mn ms nb ne nl nn no or pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
 
 GETTEXT_PACKAGE=libgtop-2.0
 AC_SUBST(GETTEXT_PACKAGE)
@@ -331,24 +300,6 @@ 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-2.0.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'
@@ -369,25 +320,14 @@ if test x$libgtop_have_sysinfo = xyes ; then
   LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SYSINFO"
 fi
 
-LIBGTOP_INCS="$LIBGTOP_INCS $SUPPORTINCS $GLIB_CFLAGS"
+LIBGTOP_INCS="$LIBGTOP_INCS $GLIB_CFLAGS"
 
-LIBGTOP_GUILE_LIBS="$LIBGTOP_LIBS"
-LIBGTOP_GUILE_INCS="$LIBGTOP_INCS"
 LIBGTOP_BINDIR='$(bindir)'
 LIBGTOP_SERVER='$(bindir)/libgtop_server2'
 
 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-2.0"
-  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
@@ -396,35 +336,27 @@ fi
 
 LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"
 
-LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0"
+LIBGTOP_LIBS="$LIBGTOP_LIBS"
-LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0"
-
-LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names-2.0"
-LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile_names-2.0 -lgtop_names-2.0"
 
 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 x$libgtop_guile_found = xyes ; then
+if test "$GCC" = "yes" ; then
-  guile_def="-DGLIBTOP_GUILE -DGLIBTOP_GUILE_NAMES $GUILE_INCS "
+        CFLAGS="\
-else
+	-Winline \
-  guile_def=""
+	-Wall \
+	-std=gnu89 \
+	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
+	-Wnested-externs -Wpointer-arith \
+	-Wcast-align -Wsign-compare \
+	-fno-strict-aliasing \
+	$CFLAGS"
 fi
 
-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 $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"'\"'
+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"'\"'
 
 AC_SUBST(INCLUDES)
 
@@ -432,12 +364,6 @@ 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)
 
@@ -460,15 +386,11 @@ 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
@@ -478,6 +400,6 @@ src/inodedb/Makefile
 lib/Makefile
 examples/Makefile
 doc/Makefile
-support/Makefile
 libgtop-2.0.pc
+libgtopconfig.h
 ])

copyright.txt

@@ -1,9 +1,8 @@
-/* $Id$ */
-
 /* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
+   This file is part of LibGTop 2.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

debian/libgtop-dev.files.in

@@ -1,17 +1,14 @@
 @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

doc/.cvsignore

@@ -8,3 +8,4 @@ auto-macros.texi
 version.texi
 stamp-vti
 *.html *.pdf
+mdate-sh

doc/ChangeLog

@@ -1,3 +1,33 @@
+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

doc/Makefile.am

@@ -16,12 +16,6 @@ auto-macros.texi: auto-macros.texi.in Makefile
 	  -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' \
@@ -33,7 +27,6 @@ auto-macros.texi: auto-macros.texi.in Makefile
 	  -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)/auto-macros.texi.in > auto-macros.tmp
 	echo '@c Set this if this is LibGTop 1.1.x' >> auto-macros.tmp

doc/reference.texi

@@ -50,24 +50,25 @@ typedef struct _glibtop_cpu     glibtop_cpu;
 
 struct _glibtop_cpu
 @{
-    u_int64_t   flags,
+    guint64   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
@@ -92,25 +93,33 @@ 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} and @code{idle}
+@code{total}, @code{user}, @code{nice}, @code{sys}, @code{idle},
+@code{iowait}, @code{irq} and @code{softirq}
 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
@@ -139,7 +148,7 @@ typedef struct _glibtop_mem     glibtop_mem;
 
 struct _glibtop_mem
 @{
-    u_int64_t   flags,
+    guint64   flags,
         total,
         used,
         free,
@@ -207,7 +216,7 @@ typedef struct _glibtop_swap    glibtop_swap;
 
 struct _glibtop_swap
 @{
-    u_int64_t   flags,
+    guint64   flags,
         total,
         used,
         free,
@@ -266,10 +275,10 @@ typedef struct _glibtop_uptime  glibtop_uptime;
 
 struct _glibtop_uptime
 @{
-    u_int64_t flags;
+    guint64 flags;
     double uptime,
         idletime;
-    u_int64_t boot_time;
+    guint64 boot_time;
 @};
 @end cartouche
 @end example
@@ -318,9 +327,9 @@ typedef struct _glibtop_loadavg glibtop_loadavg;
 
 struct _glibtop_loadavg
 @{
-    u_int64_t flags;
+    guint64 flags;
     double loadavg [3];
-    u_int64_t nr_running,
+    guint64 nr_running,
         nr_tasks,
         last_pid;
 @};
@@ -359,11 +368,11 @@ Library function @code{glibtop_get_proclist}:
 @cartouche
 unsigned *
 glibtop_get_proclist (glibtop_proclist *buf,
-                      int64_t which, int64_t arg);
+                      gint64 which, gint64 arg);
 
 unsigned *
 glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf,
-                        int64_t which, int64_t arg);
+                        gint64 which, gint64 arg);
 @end cartouche
 @end example
 
@@ -395,7 +404,7 @@ typedef struct _glibtop_proclist        glibtop_proclist;
 
 struct _glibtop_proclist
 @{
-    u_int64_t   flags,
+    guint64   flags,
         number,
         total,
         size;
@@ -464,8 +473,8 @@ Size of a single entry in the returned list
 (this equals @code{sizeof (unsigned)}).
 @end table
 
-The returned list is allocated using @code{glibtop_malloc} and must be freed
+The returned list is allocated using @code{g_malloc} and must be freed
-using @code{glibtop_free} to avoid a memory leak.
+using @code{g_free} to avoid a memory leak.
 
 @page
 @node glibtop_proc_state, glibtop_proc_uid, glibtop_proclist, System Dependent
@@ -492,7 +501,7 @@ typedef struct _glibtop_proc_state      glibtop_proc_state;
 
 struct _glibtop_proc_state
 @{
-    u_int64_t flags;
+    guint64 flags;
     char cmd[40];
 @ifset LIBGTOP-1-1
     unsigned state;
@@ -572,6 +581,7 @@ 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
@@ -618,7 +628,7 @@ typedef struct _glibtop_proc_uid        glibtop_proc_uid;
 
 struct _glibtop_proc_uid
 @{
-    u_int64_t flags;
+    guint64 flags;
     int uid,
         euid,
         gid,
@@ -698,7 +708,7 @@ typedef struct _glibtop_proc_mem        glibtop_proc_mem;
 
 struct _glibtop_proc_mem
 @{
-    u_int64_t   flags,
+    guint64   flags,
         size,
         vsize,
         resident,
@@ -717,7 +727,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.
@@ -813,7 +823,7 @@ typedef struct _glibtop_proc_time       glibtop_proc_time;
 
 struct _glibtop_proc_time
 @{
-    u_int64_t   flags,
+    guint64   flags,
         start_time,
         rtime,
         utime,
@@ -830,6 +840,7 @@ struct _glibtop_proc_time
 @end cartouche
 @end example
 
+
 @table @code
 @item start_time
 Start time of process in seconds since the epoch
@@ -856,6 +867,18 @@ 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
@@ -881,7 +904,7 @@ typedef struct _glibtop_proc_signal     glibtop_proc_signal;
 
 struct _glibtop_proc_signal
 @{
-    u_int64_t   flags,
+    guint64   flags,
         signal [2],
         blocked [2],
         sigignore [2],
@@ -902,7 +925,7 @@ Mask of caught signals
 @end table
 
 All signal masks are interpreted as bit mask; it is an array of two
-@code{u_int64_t}'s so we can save 128 signals there.
+@code{guint64}'s so we can save 128 signals there.
 
 @page
 @node glibtop_proc_kernel, glibtop_proc_segment, glibtop_proc_signal, System Dependent
@@ -929,8 +952,8 @@ typedef struct _glibtop_proc_kernel     glibtop_proc_kernel;
 
 struct _glibtop_proc_kernel
 @{
-    u_int64_t flags;
+    guint64 flags;
-    u_int64_t k_flags,
+    guint64 k_flags,
         min_flt,
         maj_flt,
         cmin_flt,
@@ -1029,7 +1052,7 @@ typedef struct _glibtop_proc_segment    glibtop_proc_segment;
 
 struct _glibtop_proc_segment
 @{
-    u_int64_t   flags,
+    guint64   flags,
         text_rss,
         shlib_rss,
         data_rss,
@@ -1037,16 +1060,7 @@ struct _glibtop_proc_segment
         dirty_size,
         start_code,
         end_code,
-        start_data,
+        start_stack;
-        end_data,
-        start_brk,
-        end_brk,
-        start_stack,
-        start_mmap,
-        arg_start,
-        arg_end,
-        env_start,
-        env_end;
 @};
 @end cartouche
 @end example
@@ -1079,7 +1093,7 @@ Library function @code{glibtop_get_proc_args}:
 @example
 @cartouche
 char *
-glibtop_get_proc_args_l (glibtop_proc_args *buf, pid_t pid,
+glibtop_get_proc_args(glibtop_proc_args *buf, pid_t pid,
                          unsigned max_len);
 
 char *
@@ -1096,7 +1110,7 @@ typedef struct _glibtop_proc_args       glibtop_proc_args;
 
 struct _glibtop_proc_args
 @{
-    u_int64_t   flags,
+    guint64   flags,
         size;
 @};
 @end cartouche
@@ -1108,7 +1122,31 @@ 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{glibtop_free} the returned string to avoid a memory leak.
+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.
 
 @page
 @node glibtop_proc_map, glibtop_netload, glibtop_proc_args, System Dependent
@@ -1135,7 +1173,7 @@ typedef struct _glibtop_proc_map        glibtop_proc_map;
 
 struct _glibtop_proc_map
 @{
-    u_int64_t   flags,
+    guint64   flags,
         number,
         total,
         size;
@@ -1144,7 +1182,7 @@ struct _glibtop_proc_map
 @end example
 
 Returns a @code{glibtop_map_entry *} list (which needs to be freed with
-@code{glibtop_free}) of memory maps of process @code{pid}.
+@code{g_free}) of memory maps of process @code{pid}.
 
 @table @code
 @item number
@@ -1164,7 +1202,7 @@ typedef struct _glibtop_map_entry       glibtop_map_entry;
 
 struct _glibtop_map_entry
 @{
-    u_int64_t flags, start, end, offset, perm, inode, device;
+    guint64 flags, start, end, offset, perm, inode, device;
     char filename [GLIBTOP_MAP_FILENAME_LEN+1];
 @};
 @end cartouche
@@ -1175,13 +1213,13 @@ fields are valid:
 
 @example
 @cartouche
-#define GLIBTOP_MAP_ENTRY_START         1
+#define GLIBTOP_MAP_ENTRY_START         0
-#define GLIBTOP_MAP_ENTRY_END           2
+#define GLIBTOP_MAP_ENTRY_END           1
-#define GLIBTOP_MAP_ENTRY_OFFSET        3
+#define GLIBTOP_MAP_ENTRY_OFFSET        2
-#define GLIBTOP_MAP_ENTRY_PERM          4
+#define GLIBTOP_MAP_ENTRY_PERM          3
-#define GLIBTOP_MAP_ENTRY_INODE         5
+#define GLIBTOP_MAP_ENTRY_INODE         4
-#define GLIBTOP_MAP_ENTRY_DEVICE        6
+#define GLIBTOP_MAP_ENTRY_DEVICE        5
-#define GLIBTOP_MAP_ENTRY_FILENAME      7
+#define GLIBTOP_MAP_ENTRY_FILENAME      6
 @end cartouche
 @end example
 
@@ -1222,7 +1260,7 @@ typedef struct _glibtop_netload glibtop_netload;
 
 struct _glibtop_netload
 @{
-    u_int64_t   flags,
+    guint64   flags,
         if_flags,
         mtu,
         subnet,
@@ -1329,7 +1367,7 @@ typedef struct _glibtop_ppp     glibtop_ppp;
 
 struct _glibtop_ppp
 @{
-    u_int64_t   flags,
+    guint64   flags,
         state,
         bytes_in,
         bytes_out;
@@ -1409,7 +1447,7 @@ typedef struct _glibtop_mountlist       glibtop_mountlist;
 
 struct _glibtop_mountlist
 @{
-    u_int64_t   flags,
+    guint64   flags,
         number,
         total,
         size;
@@ -1418,7 +1456,7 @@ struct _glibtop_mountlist
 @end example
 
 Returns a @code{glibtop_mountentry *} list (which needs to be freed with
-@code{glibtop_free}) of mounted filesystems.
+@code{g_free}) of mounted filesystems.
 
 @table @code
 @item number
@@ -1438,7 +1476,7 @@ typedef struct _glibtop_mountentry      glibtop_mountentry;
 
 struct _glibtop_mountentry
 @{
-    u_int64_t dev;
+    guint64 dev;
     char devname [GLIBTOP_MOUNTENTRY_LEN+1];
     char mountdir [GLIBTOP_MOUNTENTRY_LEN+1];
     char type [GLIBTOP_MOUNTENTRY_LEN+1];
@@ -1488,12 +1526,15 @@ typedef struct _glibtop_fsusage         glibtop_fsusage;
 
 struct _glibtop_fsusage
 @{
-    u_int64_t   flags,
+    guint64   flags,
         blocks,
         bfree,
         bavail,
         files,
         ffree;
+    guint32   block_size;
+    guint64 read,
+        write;
 @};
 @end cartouche
 @end example
@@ -1509,10 +1550,14 @@ 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
@@ -1639,7 +1684,7 @@ typedef struct _glibtop_sysdeps         glibtop_sysdeps;
 
 struct _glibtop_sysdeps
 @{
-    u_int64_t flags,
+    guint64 flags,
         features,
         pointer_size,
         cpu,

examples/.cvsignore

@@ -14,3 +14,13 @@ 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,3 +1,112 @@
+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.

examples/Makefile.am

@@ -6,93 +6,56 @@ INCLUDES		= @INCLUDES@
 
 DEFS			= @DEFS@
 
-# We install it in `libexec' since this will make it more easy
+noinst_PROGRAMS	= 	first second pprint procargs df netlist \
-# to put the examples into an extra RPM package.
-
-libgtopdir		= $(libexecdir)/libgtop
-
-libgtop_PROGRAMS	= first second\
 			  mountlist procmap netload sysdeps timings \
-			  @static_targets@ @guile_examples@ @smp_examples@
+			  openfiles \
+			  @static_targets@ @smp_examples@
 
 EXTRA_PROGRAMS		= first_static second_static \
 			  mountlist_static procmap_static \
-			  third third_static smp smp_static \
+			  smp smp_static openfiles_static \
 			  netload_static sysdeps_static \
-			  timings_static
+			  timings_static pprint_static procargs_static \
+			  df_static netlist_static
 
 first_SOURCES		= first.c
-first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.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 \
+second_LDADD		= $(top_builddir)/lib/libgtop-2.0.la -lm
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.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-2.0.la
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.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-2.0.la
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.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-2.0.la
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.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-2.0.la
-third_names_LIBS	= $(top_builddir)/sysdeps/names/libgtop_names-2.0.la
-
-third_SOURCES		= third.c
-third_LDADD		= $(top_builddir)/sysdeps/guile/libgtop_guile-2.0.la \
-			  $(third_guile_names_LIBS) $(third_names_LIBS) \
-			  $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.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-2.0.la
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
-			  @LIBSUPPORT@ @INTLLIBS@
 
 mountlist_static_SOURCES= $(mountlist_SOURCES)
 mountlist_static_LDADD	= $(mountlist_LDADD)
@@ -100,22 +63,57 @@ mountlist_static_LDFLAGS= -static
 
 
 smp_SOURCES		= smp.c
-smp_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+smp_LDADD		= $(top_builddir)/lib/libgtop-2.0.la -lm
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.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-2.0.la
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
-			  @LIBSUPPORT@ @INTLLIBS@
 
 timings_static_SOURCES	= $(timings_SOURCES)
 timings_static_LDADD	= $(timings_LDADD)
 timings_static_LDFLAGS	= -static
 
+
+pprint_SOURCES	        = pprint.c
+pprint_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+
+pprint_static_SOURCES   = $(pprint_SOURCES)
+pprint_static_LDADD	= $(pprint_LDADD)
+pprint_static_LDFLAGS   = -static
+
+
+procargs_SOURCES	  = procargs.c
+procargs_LDADD		  = $(top_builddir)/lib/libgtop-2.0.la
+
+procargs_static_SOURCES   = $(procargs_SOURCES)
+procargs_static_LDADD	  = $(procargs_LDADD)
+procargs_static_LDFLAGS   = -static
+
+
+df_SOURCES	  = df.c
+df_LDADD		  = $(top_builddir)/lib/libgtop-2.0.la
+
+df_static_SOURCES   = $(df_SOURCES)
+df_static_LDADD	  = $(df_LDADD)
+df_static_LDFLAGS   = -static
+
+
+netlist_SOURCES		= netlist.c
+netlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+
+netlist_static_SOURCES	= $(netlist_SOURCES)
+netlist_static_LDADD	= $(netlist_LDADD)
+netlist_static_LDFLAGS	= -static
+
+
+openfiles_SOURCES	= openfiles.c
+openfiles_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+
+openfiles_static_SOURCES	= $(openfiles_SOURCES)
+openfiles_static_LDADD		= $(openfiles_LDADD)
+openfiles_static_LDFLAGS	= -static
+
+

examples/df.c

@@ -0,0 +1,48 @@
+#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,11 +22,12 @@
 */
 
 #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>
 
@@ -232,7 +233,7 @@ main (int argc, char *argv [])
 		printf ("\n");
 	}
 
-	glibtop_free (ptr);
+	g_free (ptr);
 
 	pid = getpid ();
 	ppid = getppid ();
@@ -346,7 +347,7 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_args.size,
 		args ? args : "");
 
-	glibtop_free (args);
+	g_free (args);
 
 	printf ("\n");
 
@@ -456,7 +457,7 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_args.size,
 		args ? args : "");
 
-	glibtop_free (args);
+	g_free (args);
 
 	printf ("\n");
 
@@ -567,7 +568,7 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_args.size,
 		args ? args : "");
 
-	glibtop_free (args);
+	g_free (args);
 
 	glibtop_close ();
 

examples/mountlist.c

@@ -22,11 +22,12 @@
 */
 
 #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>
 
@@ -73,7 +74,7 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++) {
 		mount_entries = glibtop_get_mountlist (&mount_list, 1);
 
-		glibtop_free (mount_entries);
+		g_free (mount_entries);
 	}
 
 	printf ("sbrk (0) = %p\n\n", sbrk (0));
@@ -89,21 +90,21 @@ main (int argc, char *argv [])
 			mount_entries [index].type,
 			mount_entries [index].devname);
 
-	printf ("\n\n%-23s %9s %9s %9s %9s %9s\n\n",
+	printf ("\n\n%-16s %9s %9s %9s %9s %9s %9s\n",
-		"", "Blocks", "Free", "Avail", "Files", "Free");
+		"Mount", "Blocks", "Free", "Avail", "Files", "Free", "BlockSz");
 
 	for (index = 0; index < mount_list.number; index++) {
 		glibtop_get_fsusage (&fsusage,
 				     mount_entries [index].mountdir);
 
-		printf ("Usage: %-16s %9Lu %9Lu %9Lu %9Lu %9Lu\n",
+		printf ("%-16s %9Lu %9Lu %9Lu %9Lu %9Lu %9d\n",
 			mount_entries [index].mountdir,
 			fsusage.blocks, fsusage.bfree,
 			fsusage.bavail, fsusage.files,
-			fsusage.ffree);
+			fsusage.ffree, fsusage.block_size);
 	}
 
-	glibtop_free (mount_entries);
+	g_free (mount_entries);
 
 	printf ("\nsbrk (0) = %p\n\n", sbrk (0));
 

examples/netlist.c

@@ -1,9 +1,6 @@
-/* $Id$ */
+/* Copyright (C) 2004 Benoît Dejean
+   This file is part of LibGTop 2.0.
 
-/* 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
@@ -21,18 +18,29 @@
    Boston, MA 02111-1307, USA.
 */
 
-#ifndef __GLIBTOP_TYPES_H__
+#include <stdio.h>
-#define __GLIBTOP_TYPES_H__
 
-BEGIN_LIBGTOP_DECLS
+#include <glibtop.h>
+#include <glibtop/netlist.h>
 
-#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
 
-END_LIBGTOP_DECLS
+int main(int argc, char *argv [])
+{
+	glibtop_netlist buf;
+	char **devices;
+	guint32 i;
 
-#endif
+	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,11 +22,12 @@
 */
 
 #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>
 
@@ -39,6 +40,24 @@
 #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 [])
 {
@@ -46,6 +65,8 @@ 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;
@@ -75,49 +96,63 @@ main (int argc, char *argv [])
 	glibtop_init_r (&glibtop_global_server, 0, 0);
 
 	if (argc != 2)
-		glibtop_error ("Usage: %s interface", argv [0]);
+		g_error ("Usage: %s interface", argv [0]);
 
 	glibtop_get_netload (&netload, argv [1]);
 
 	addr.s_addr = netload.address;
 	subnet.s_addr = netload.subnet;
 
-	address_string = glibtop_strdup (inet_ntoa (addr));
+	address_string = g_strdup (inet_ntoa (addr));
-	subnet_string  = glibtop_strdup (inet_ntoa (subnet));
+	subnet_string  = g_strdup (inet_ntoa (subnet));
 
-	printf ("Network Load (0x%08lx):\n\n"
+	inet_ntop (AF_INET6, netload.address6, address6_string, INET6_ADDRSTRLEN);
-		"\tInterface Flags:\t0x%08lx\n"
+	inet_ntop (AF_INET6, netload.prefix6,  prefix6_string,  INET6_ADDRSTRLEN);
-		"\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);
 
-	glibtop_free (address_string);
+	hwaddress_string = hwaddress_format_for_display(&netload);
-	glibtop_free (subnet_string);
+
+	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_close ();
 

examples/openfiles.c

@@ -0,0 +1,64 @@
+#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

@@ -0,0 +1,281 @@
+#include <glibtop.h>
+
+#include <glibtop/union.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()
+{
+  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()
+{
+  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()
+{
+  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()
+{
+  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()
+{
+  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()
+{
+  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()
+{
+  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();
+}
+
+
+
+
+
+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();
+
+  glibtop_close();
+
+  return 0;
+}

examples/procargs.c

@@ -0,0 +1,47 @@
+#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,11 +22,12 @@
 */
 
 #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>
 
@@ -82,7 +83,7 @@ main (int argc, char *argv [])
 	glibtop_init_r (&glibtop_global_server, 0, 0);
 
 	if ((argc != 2) || (sscanf (argv [1], "%d", (int *) &pid) != 1))
-		glibtop_error ("Usage: %s pid", argv [0]);
+		g_error ("Usage: %s pid", argv [0]);
 
 #ifdef GLIBTOP_INODEDB
 	inodedb = glibtop_inodedb_open (0, 0);
@@ -153,10 +154,10 @@ main (int argc, char *argv [])
 		}
 
 		if (filename && (filename != maps [i].filename))
-			glibtop_free (filename);
+			g_free ((void*)filename);
 	}
 
-	glibtop_free (maps);
+	g_free (maps);
 
 	glibtop_close ();
 

examples/second.c

@@ -23,11 +23,12 @@
 
 #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>
@@ -45,7 +46,7 @@ output (pid_t pid)
 	double b_total, b_utime, b_stime;
 	double s_total, s_utime, s_stime;
 	double my_utime, my_stime;
-	int ncpu;
+	unsigned int ncpu;
 #endif
 
 	printf ("\n");
@@ -151,7 +152,7 @@ output (pid_t pid)
 		(unsigned long) data.proc_args.size,
 		args ? args : "");
 
-	glibtop_free (args);
+	g_free (args);
 
 	printf ("\n");
 
@@ -291,7 +292,7 @@ main (int argc, char *argv [])
 		output (pid);
 	}
 
-	glibtop_free (ptr);
+	g_free (ptr);
 
 	exit (0);
 }

examples/smp.c

@@ -21,12 +21,17 @@
    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>
+
+#include "libgtop-i18n.h"
 
 int
 main (int argc, char *argv [])

examples/sysdeps.c

@@ -22,11 +22,13 @@
 */
 
 #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/sysdeps.h>
 
 #include <glibtop/parameter.h>
 
@@ -69,7 +71,7 @@ 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"

examples/third.c

@@ -1,57 +0,0 @@
-/* $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 (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_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,11 +22,12 @@
 */
 
 #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>
 
@@ -187,7 +188,7 @@ main (int argc, char *argv [])
 
 	for (c = 0; c < PROFILE_COUNT_EXPENSIVE; c++) {
 		ptr = glibtop_get_proclist (&data.proclist, 0, 0);
-		glibtop_free (ptr);
+		g_free (ptr);
 	}
 
 	getrusage (RUSAGE_SELF, &rusage_end);

features.def

@@ -1,4 +1,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|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|mem|ulong(total,used,free,shared,buffer,cached,user,locked)
 void|swap|ulong(total,used,free,pagein,pageout)
 void|uptime|double(uptime,idletime)
@@ -16,7 +16,10 @@ 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,10 +24,33 @@
 #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>
@@ -37,10 +60,11 @@
 #define GLIBTOP_MOUNTENTRY_LEN	79
 #endif
 
-typedef struct _glibtop		glibtop;
 
 #include <glibtop/sysdeps.h>
 
+#include <glibtop/close.h>
+
 struct _glibtop
 {
 	unsigned flags;
@@ -84,24 +108,4 @@ 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/Makefile.am

@@ -1,2 +1,4 @@
 SUBDIRS		= glibtop
 
+EXTRA_DIST	= libgtop-i18n.h
+

include/glibtop/Makefile.am

@@ -3,8 +3,11 @@ glibtopdir		= $(includedir)/libgtop-2.0/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 write.h error.h open.h \
+			  procmem.h procuid.h swap.h \
-			  procsegment.h read.h sysdeps.h xmalloc.h global.h \
+			  procsegment.h sysdeps.h global.h \
-			  procsignal.h read_data.h union.h types.h gnuserv.h \
+			  procsignal.h union.h gnuserv.h \
 			  parameter.h mountlist.h fsusage.h procmap.h signal.h \
-			  inodedb.h sysinfo.h ppp.h procargs.h netload.h
+			  inodedb.h sysinfo.h ppp.h procargs.h netload.h \
+			  netlist.h procopenfiles.h
+
+noinst_HEADERS		= error.h write.h open.h read_data.h read.h

include/glibtop/array.h

@@ -1,50 +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_ARRAY_H__
-#define __GLIBTOP_ARRAY_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_ARRAY_NUMBER		0
-#define GLIBTOP_ARRAY_SIZE		1
-#define GLIBTOP_ARRAY_TOTAL		2
-
-#define GLIBTOP_MAX_ARRAY		3
-
-typedef struct _glibtop_array	glibtop_array;
-
-struct _glibtop_array
-{
-    u_int64_t flags,
-	number,		/* GLIBTOP_ARRAY_NUMBER	*/
-	size,		/* GLIBTOP_ARRAY_SIZE	*/
-	total;		/* GLIBTOP_ARRAY_TOTAL	*/
-};
-
-#endif

include/glibtop/close.h

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

include/glibtop/command.h

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

include/glibtop/compat_10.h

@@ -1,91 +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_COMPAT10_H__
-#define __GLIBTOP_COMPAT10_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-/* glibtop_cpu */
-
-#define GLIBTOP_XCPU_TOTAL		GLIBTOP_CPU_XCPU_TOTAL
-#define GLIBTOP_XCPU_USER		GLIBTOP_CPU_XCPU_USER
-#define GLIBTOP_XCPU_NICE		GLIBTOP_CPU_XCPU_NICE
-#define GLIBTOP_XCPU_SYS		GLIBTOP_CPU_XCPU_SYS
-#define GLIBTOP_XCPU_IDLE		GLIBTOP_CPU_XCPU_IDLE
-#define GLIBTOP_XCPU_FLAGS		GLIBTOP_CPU_XCPU_FLAGS
-
-/* glibtop_proclist */
-
-#define GLIBTOP_PROCLIST_NUMBER		GLIBTOP_ARRAY_NUMBER
-#define GLIBTOP_PROCLIST_SIZE		GLIBTOP_ARRAY_SIZE
-#define GLIBTOP_PROCLIST_TOTAL		GLIBTOP_ARRAY_TOTAL
-
-#define GLIBTOP_MAX_PROCLIST		GLIBTOP_MAX_ARRAY
-
-typedef struct _glibtop_array		glibtop_proclist;
-
-/* glibtop_mountlist */
-
-#define GLIBTOP_MOUNTLIST_NUMBER	GLIBTOP_ARRAY_NUMBER
-#define GLIBTOP_MOUNTLIST_SIZE		GLIBTOP_ARRAY_SIZE
-#define GLIBTOP_MOUNTLIST_TOTAL		GLIBTOP_ARRAY_TOTAL
-
-#define GLIBTOP_MAX_MOUNTLIST		GLIBTOP_MAX_ARRAY
-
-typedef struct _glibtop_array		glibtop_mountlist;
-
-/* glibtop_proc_args */
-
-#define GLIBTOP_PROC_ARGS_SIZE		0
-
-#define GLIBTOP_MAX_PROC_ARGS		1
-
-typedef struct _glibtop_array		glibtop_proc_args;
-
-/* glibtop_proc_map */
-
-#define GLIBTOP_PROC_MAP_NUMBER		GLIBTOP_ARRAY_NUMBER
-#define GLIBTOP_PROC_MAP_SIZE		GLIBTOP_ARRAY_SIZE
-#define GLIBTOP_PROC_MAP_TOTAL		GLIBTOP_ARRAY_TOTAL
-
-#define GLIBTOP_MAX_PROC_MAP		GLIBTOP_MAX_ARRAY
-
-typedef struct _glibtop_array		glibtop_proc_map;
-
-/* glibtop_interface_names */
-
-#define GLIBTOP_INTERFACE_NAMES_NUMBER	GLIBTOP_ARRAY_NUMBER
-#define GLIBTOP_INTERFACE_NAMES_SIZE	GLIBTOP_ARRAY_SIZE
-#define GLIBTOP_INTERFACE_NAMES_TOTAL	GLIBTOP_ARRAY_TOTAL
-
-#define GLIBTOP_MAX_INTERFACE_NAMES	GLIBTOP_MAX_ARRAY
-
-typedef struct _glibtop_array		glibtop_interface_names;
-
-#endif

include/glibtop/cpu.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
 
 #define GLIBTOP_CPU_TOTAL	0
 #define GLIBTOP_CPU_USER	1
@@ -41,8 +41,16 @@ BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_XCPU_NICE	8
 #define GLIBTOP_XCPU_SYS	9
 #define GLIBTOP_XCPU_IDLE	10
+#define GLIBTOP_XCPU_FLAGS	11
 
-#define GLIBTOP_MAX_CPU		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
 
 /* Nobody should really be using more than 4 processors. */
 #define GLIBTOP_NCPU		4
@@ -51,18 +59,25 @@ typedef struct _glibtop_cpu	glibtop_cpu;
 
 struct _glibtop_cpu
 {
-	u_int64_t	flags,
+	guint64	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_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		*/
 };
 
 #define glibtop_get_cpu(cpu)	glibtop_get_cpu_l(glibtop_global_server, cpu)
@@ -83,17 +98,7 @@ void glibtop_init_cpu_s (glibtop *server);
 void glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf);
 #endif
 
-#ifdef GLIBTOP_NAMES
 
-/* You need to link with -lgtop_names to get this stuff here. */
+G_END_DECLS
-
-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,116 +21,33 @@
    Boston, MA 02111-1307, USA.
 */
 
+
+/*
+ * This is private API
+ */
+
 #ifndef __GLIBTOP_ERROR_H__
 #define __GLIBTOP_ERROR_H__
 
 #include <glibtop.h>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
 
-#ifndef G_GNUC_UNUSED
+void glibtop_error_vr (glibtop *server, const char *format, va_list args) G_GNUC_INTERNAL G_GNUC_NORETURN;
-#if	__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
+void glibtop_warn_vr (glibtop *server, const char *format, va_list args) G_GNUC_INTERNAL;
-#define G_GNUC_UNUSED				\
+void glibtop_error_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_INTERNAL G_GNUC_NORETURN;
-  __attribute__((unused))
+void glibtop_warn_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_INTERNAL;
-#else	/* !__GNUC__ */
-#define	G_GNUC_UNUSED
-#endif	/* !__GNUC__ */
-#endif /* defined G_GNUC_UNUSED */
 
-void glibtop_error_vr (glibtop *server, char *format, va_list args);
+void glibtop_error_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
-void glibtop_warn_vr (glibtop *server, char *format, va_list args);
+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_io_vr (glibtop *server, char *format, int, va_list args);
+void glibtop_error (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
-void glibtop_warn_io_vr (glibtop *server, char *format, int, va_list args);
+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);
 
-static void G_GNUC_UNUSED
+G_END_DECLS
-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/errors.h

@@ -1,95 +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_ERRORS_H__
-#define __GLIBTOP_ERRORS_H__
-
-#include <glibtop.h>
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_ERROR glibtop_error_quark ()
-
-GQuark glibtop_error_quark (void) G_GNUC_CONST;
-
-typedef enum {
-    GLIBTOP_ERROR_NO_ERROR = 0,
-    GLIBTOP_ERROR_UNKNOWN,
-    GLIBTOP_ERROR_INVALID_ARGUMENT,
-    GLIBTOP_ERROR_NO_SUCH_PARAMETER,
-    GLIBTOP_ERROR_READONLY_VALUE,
-    GLIBTOP_ERROR_SIZE_MISMATCH,
-
-    GLIBTOP_ERROR_SERVER_COMM_FAILURE,
-
-    GLIBTOP_ERROR_NO_SUCH_PROCESS,
-
-    GLIBTOP_ERROR_NO_KERNEL_SUPPORT,
-    GLIBTOP_ERROR_INCOMPATIBLE_KERNEL,
-
-    GLIBTOP_ERROR_NO_SUCH_BACKEND,
-    GLIBTOP_ERROR_NOT_IMPLEMENTED,
-    GLIBTOP_ERROR_NO_BACKEND_OPENED,
-
-    GLIBTOP_ERROR_DEMARSHAL_ERROR
-} glibtop_error;
-
-void
-glibtop_error_vl (glibtop_client *client, glibtop_error code,
-		  const char *format, va_list args);
-
-void
-glibtop_error_io_vl (glibtop_client *client, glibtop_error code,
-		     int io_errno, const char *format, va_list args);
-
-void
-glibtop_warn_vl (glibtop_client *client, glibtop_error code,
-		 const char *format, va_list args);
-
-void
-glibtop_warn_io_vl (glibtop_client *client, glibtop_error code,
-		    int io_errno, const char *format, va_list args);
-
-void
-glibtop_error_l (glibtop_client *client, glibtop_error code,
-		 char *format, ...);
-
-void
-glibtop_warn_l (glibtop_client *client, glibtop_error code,
-		char *format, ...);
-
-void
-glibtop_error_io_l (glibtop_client *client, glibtop_error code,
-		    char *format, ...);
-
-void
-glibtop_warn_io_l (glibtop_client *client, glibtop_error code,
-		   char *format, ...);
-
-G_END_DECLS
-
-#endif

include/glibtop/fsusage.h

@@ -1,7 +1,6 @@
 /* $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.
 
@@ -27,26 +26,31 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_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
 {
-	u_int64_t	flags,
+	guint64	flags,
-		blocks,		/* Total blocks. */
+		blocks,		/* Total number of 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 */
 };
 
 #define glibtop_get_fsusage(fsusage,disk)	glibtop_get_fsusage_l(glibtop_global_server, fsusage, disk)
@@ -56,17 +60,7 @@ struct _glibtop_fsusage
 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
 
-/* You need to link with -lgtop_names to get this stuff here. */
+G_END_DECLS
-
-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/glib-arrays.h

@@ -1,50 +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_GLIB_ARRAYS_H__
-#define __GLIBTOP_GLIB_ARRAYS_H__
-
-#include <glibtop.h>
-#include <glibtop/array.h>
-#include <glibtop/global.h>
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-GPtrArray *
-glibtop_get_proc_args_as_array_l (glibtop_client *client, pid_t pid);
-
-GArray *
-glibtop_get_proclist_as_array_l (glibtop_client *client, int64_t which, int64_t arg);
-
-GPtrArray *
-glibtop_get_proc_map_as_array_l (glibtop_client *client, pid_t pid);
-
-GPtrArray *
-glibtop_get_mountlist_as_array_l (glibtop_client *client, int all_fs);
-
-G_END_DECLS
-#endif

include/glibtop/glibtop-backend-info.h

@@ -40,7 +40,7 @@ typedef struct _glibtop_backend_module	glibtop_backend_module;
 typedef struct _glibtop_call_vector	glibtop_call_vector;
 
 typedef int (*glibtop_backend_open_func_t)  (glibtop_server *, glibtop_backend *,
-					     u_int64_t, const char **);
+					     guint64, const char **);
 typedef int (*glibtop_backend_close_func_t) (glibtop_server *, glibtop_backend *,
 					     glibtop_closure *);
 

include/glibtop/glibtop-backend.h

@@ -65,7 +65,7 @@ GType
 glibtop_backend_get_type (void);
 
 glibtop_backend *
-glibtop_backend_get (const char *backend_name, u_int64_t features,
+glibtop_backend_get (const char *backend_name, guint64 features,
 		     const char **backend_args, GError **error);
 
 void

include/glibtop/glibtop-client.h

@@ -82,7 +82,7 @@ glibtop_client_propagate_warning (glibtop_client *client, GError *error);
 
 void
 glibtop_client_open_backend (glibtop_client *client, const char *backend_name,
-			     u_int64_t features, const char **backend_args);
+			     guint64 features, const char **backend_args);
 
 void
 glibtop_client_add_backend (glibtop_client *client,

include/glibtop/global.h

@@ -24,43 +24,14 @@
 #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
@@ -74,27 +45,6 @@
 # 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>
 
@@ -124,18 +74,13 @@
 
 #ifdef _IN_LIBGTOP
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
-
-#ifndef _
-#define _(String) dgettext (PACKAGE, String)
-#define N_(String) (String)
-#endif
 
 #ifndef HAVE_STRERROR
 char *strerror (int errno);
 #endif
 
-END_LIBGTOP_DECLS
+G_END_DECLS
 
 #endif /* _IN_LIBGTOP */
 

include/glibtop/gnuserv.h

@@ -42,7 +42,6 @@ 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

include/glibtop/inodedb.h

@@ -31,7 +31,7 @@
 
 #define GLIBTOP_INODEDB_ALL		7
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
 
 typedef struct _glibtop_inodedb		glibtop_inodedb;
 
@@ -39,7 +39,7 @@ typedef struct _glibtop_inodedb_key	glibtop_inodedb_key;
 
 struct _glibtop_inodedb_key
 {
-	u_int64_t device, inode;
+	guint64 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,
-			  u_int64_t device, u_int64_t inode);
+			  guint64 device, guint64 inode);
 
 void
 glibtop_inodedb_close_s (glibtop *server, glibtop_inodedb *inodedb);
 
-END_LIBGTOP_DECLS
+G_END_DECLS
 
 #endif

include/glibtop/interfaces.h

@@ -1,203 +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_INTERFACES_H__
-#define __GLIBTOP_INTERFACES_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-#include <glibtop/compat_10.h>
-#include <glibtop/array.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_INTERFACE_IF_FLAGS	0
-#define GLIBTOP_INTERFACE_TRANSPORT	1
-#define GLIBTOP_INTERFACE_TYPE		2
-#define GLIBTOP_INTERFACE_NUMBER	3
-#define GLIBTOP_INTERFACE_INSTANCE	4
-#define GLIBTOP_INTERFACE_NUM_LOGICAL	5
-#define GLIBTOP_INTERFACE_NAME		6
-
-#define GLIBTOP_MAX_INTERFACE		7
-
-#define GLIBTOP_IFADDR_TRANSPORT	0
-#define GLIBTOP_IFADDR_ADDR_LEN		1
-#define GLIBTOP_IFADDR_ADDRESS		2
-#define GLIBTOP_IFADDR_SUBNET		3
-#define GLIBTOP_IFADDR_SCOPE		4
-
-#define GLIBTOP_MAX_IFADDR		5
-
-typedef struct _glibtop_interface	glibtop_interface;
-typedef struct _glibtop_ifaddr		glibtop_ifaddr;
-
-typedef enum _glibtop_interface_type	glibtop_interface_type;
-typedef enum _glibtop_transport		glibtop_transport;
-typedef enum _glibtop_protocol		glibtop_protocol;
-
-typedef enum _glibtop_ipv6_scope	glibtop_ipv6_scope;
-
-typedef enum _glibtop_strategy		glibtop_strategy;
-typedef enum _glibtop_interface_flags	glibtop_interface_flags;
-
-enum _glibtop_protocol {
-    GLIBTOP_PROTOCOL_OTHERS	= 0,
-    GLIBTOP_PROTOCOL_ICMP	= 1 << 0,
-    GLIBTOP_PROTOCOL_TCP	= 1 << 1,
-    GLIBTOP_PROTOCOL_UDP	= 1 << 2,
-    GLIBTOP_PROTOCOL_IGMP	= 1 << 3,
-    GLIBTOP_PROTOCOL_RAW	= 1 << 4,
-    GLIBTOP_PROTOCOL_ICMP6	= 1 << 5,
-    GLIBTOP_PROTOCOL_TCP6	= 1 << 6,
-    GLIBTOP_PROTOCOL_UDP6	= 1 << 7,
-    GLIBTOP_PROTOCOL_IGMP6	= 1 << 8,
-    GLIBTOP_PROTOCOL_RAW6	= 1 << 9
-};
-
-enum _glibtop_transport {
-    GLIBTOP_TRANSPORT_DEFAULT	= 0,
-    GLIBTOP_TRANSPORT_IPV4	= 1 << 0,
-    GLIBTOP_TRANSPORT_IPV6	= 1 << 1,
-    GLIBTOP_TRANSPORT_IPX	= 1 << 2,
-    GLIBTOP_TRANSPORT_X25	= 1 << 3,
-    GLIBTOP_TRANSPORT_DECNET	= 1 << 4,
-    GLIBTOP_TRANSPORT_APPLETALK	= 1 << 5,
-    GLIBTOP_TRANSPORT_NETBEUI	= 1 << 6
-};
-
-#define GLIBTOP_TRANSPORT_ALL	GLIBTOP_UNLIMITED
-#define GLIBTOP_PROTOCOL_ALL	GLIBTOP_UNLIMITED
-
-enum _glibtop_interface_type {
-    GLIBTOP_INTERFACE_ALL		= 0,
-    GLIBTOP_INTERFACE_OTHER,
-    /* Network interfaces */
-    GLIBTOP_INTERFACE_ETHERNET		= 101,
-    GLIBTOP_INTERFACE_FDDI,
-    GLIBTOP_INTERFACE_FRAME_RELAY,
-    GLIBTOP_INTERFACE_TOKEN_RING,
-    GLIBTOP_INTERFACE_ARCNET,
-    GLIBTOP_INTERFACE_ATM,
-    /* Dummy interfaces */
-    GLIBTOP_INTERFACE_LOOPBACK		= 501,
-    GLIBTOP_INTERFACE_DUMMY,
-    /* Dialup interfaces */
-    GLIBTOP_INTERFACE_PARA		= 801,
-    GLIBTOP_INTERFACE_SLIP,
-    GLIBTOP_INTERFACE_PPP,
-    GLIBTOP_INTERFACE_ISDN
-};
-
-enum _glibtop_ipv6_scope {
-    GLIBTOP_IPV6_SCOPE_GLOBAL		= 0,
-    GLIBTOP_IPV6_SCOPE_LOOPBACK		= 1 << 1,
-    GLIBTOP_IPV6_SCOPE_LINKLOCAL	= 1 << 2,
-    GLIBTOP_IPV6_SCOPE_SITELOCAL	= 1 << 3,
-    GLIBTOP_IPV6_SCOPE_COMPATv4		= 1 << 4,
-    GLIBTOP_IPV6_SCOPE_UNKNOWN		= 1 << 5
-};
-
-enum _glibtop_strategy {
-    GLIBTOP_INTERFACES_ALL		= 0,
-    GLIBTOP_INTERFACES_BEST_MATCHING,
-    GLIBTOP_INTERFACES_ONLY_THIS_ONE,
-    GLIBTOP_INTERFACES_INCLUDE_LOGICAL	= 1 << 7
-};
-
-#define GLIBTOP_STRATEGY_FLAGS_MASK	(1 << 7)
-
-enum _glibtop_interface_flags {
-    GLIBTOP_IF_FLAGS_UP = 1,
-    GLIBTOP_IF_FLAGS_BROADCAST,
-    GLIBTOP_IF_FLAGS_DEBUG,
-    GLIBTOP_IF_FLAGS_LOOPBACK,
-    GLIBTOP_IF_FLAGS_POINTOPOINT,
-    GLIBTOP_IF_FLAGS_RUNNING,
-    GLIBTOP_IF_FLAGS_NOARP,
-    GLIBTOP_IF_FLAGS_PROMISC,
-    GLIBTOP_IF_FLAGS_ALLMULTI,
-    GLIBTOP_IF_FLAGS_OACTIVE,
-    GLIBTOP_IF_FLAGS_SIMPLEX,
-    GLIBTOP_IF_FLAGS_LINK0,
-    GLIBTOP_IF_FLAGS_LINK1,
-    GLIBTOP_IF_FLAGS_LINK2,
-    GLIBTOP_IF_FLAGS_ALTPHYS,
-    GLIBTOP_IF_FLAGS_MULTICAST
-};
-
-struct _glibtop_ifaddr
-{
-    u_int64_t	flags,
-	transport;			/* GLIBTOP_IFADDR_TRANSPORT	*/
-    u_int8_t	addr_len,		/* GLIBTOP_IFADDR_ADDR_LEN	*/
-	address [GLIBTOP_IFADDR_LEN];	/* GLIBTOP_IFADDR_ADDRESS	*/
-    u_int64_t	subnet,			/* GLIBTOP_IFADDR_SUBNET	*/
-	scope;				/* GLIBTOP_IFADDR_SCOPE	*/
-};
-
-struct _glibtop_interface
-{
-    u_int64_t	flags,
-	if_flags,		/* GLIBTOP_INTERFACE_IF_FLAGS		*/
-	transport,		/* GLIBTOP_INTERFACE_TRANSPORT		*/
-	type,			/* GLIBTOP_INTERFACE_TYPE		*/
-	number,			/* GLIBTOP_INTERFACE_NUMBER		*/
-	instance,		/* GLIBTOP_INTERFACE_INSTANCE		*/
-	num_logical;		/* GLIBTOP_INTERFACE_NUM_LOGICAL	*/
-    char name [GLIBTOP_INTERFACE_LEN];
-};
-
-#if GLIBTOP_SUID_INTERFACE_NAMES
-#define glibtop_get_interface_names_r	glibtop_get_interface_names_p
-#else
-#define glibtop_get_interface_names_r	glibtop_get_interface_names_s
-#endif
-
-glibtop_interface *glibtop_get_interface_names_l (glibtop_client *client, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);
-
-#if GLIBTOP_SUID_INTERFACE_NAMES
-int glibtop_init_interface_names_p (glibtop_server *server, glibtop_closure *closure);
-glibtop_interface *glibtop_get_interface_names_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);
-#else
-int glibtop_init_interface_names_s (glibtop_server *server, glibtop_closure *closure);
-glibtop_interface *glibtop_get_interface_names_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);
-#endif
-
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_interface_names [];
-extern const unsigned glibtop_types_interface_names [];
-extern const char *glibtop_labels_interface_names [];
-extern const char *glibtop_descriptions_interface_names [];
-
-#endif
-
-G_END_DECLS
-
-#endif

include/glibtop/limits.h

@@ -45,8 +45,8 @@ G_BEGIN_DECLS
 /* Length of a network interface address in bytes. */
 #define GLIBTOP_IFADDR_LEN	16
 
-/* This is ((u_int64_t)-1) */
+/* This is ((guint64)-1) */
-#define GLIBTOP_UNLIMITED	(~(u_int64_t)0)
+#define GLIBTOP_UNLIMITED	(~(guint64)0)
 
 /* Maximum length of a backend name. */
 #define GLIBTOP_BACKEND_NAME_LEN	40

include/glibtop/loadavg.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
 
 #define GLIBTOP_LOADAVG_LOADAVG		0
 #define GLIBTOP_LOADAVG_NR_RUNNING	1
@@ -40,9 +40,9 @@ typedef struct _glibtop_loadavg	glibtop_loadavg;
 
 struct _glibtop_loadavg
 {
-	u_int64_t flags;
+	guint64 flags;
 	double loadavg [3];		/* GLIBTOP_LOADAVG_LOADAVG	*/
-	u_int64_t nr_running,		/* GLIBTOP_LOADAVG_NR_RUNNING	*/
+	guint64 nr_running,		/* GLIBTOP_LOADAVG_NR_RUNNING	*/
 		nr_tasks,		/* GLIBTOP_LOADAVG_NR_TASKS	*/
 		last_pid;		/* GLIBTOP_LOADAVG_LAST_PID	*/
 };
@@ -65,17 +65,7 @@ void glibtop_init_loadavg_s (glibtop *server);
 void glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf);
 #endif
 
-#ifdef GLIBTOP_NAMES
 
-/* You need to link with -lgtop_names to get this stuff here. */
+G_END_DECLS
-
-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>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
 
 #define GLIBTOP_MEM_TOTAL	0
 #define GLIBTOP_MEM_USED	1
@@ -44,7 +44,7 @@ typedef struct _glibtop_mem	glibtop_mem;
 
 struct _glibtop_mem
 {
-	u_int64_t	flags,
+	guint64	flags,
 		total,		/* GLIBTOP_MEM_TOTAL	*/
 		used,		/* GLIBTOP_MEM_USED	*/
 		free,		/* GLIBTOP_MEM_FREE	*/
@@ -73,17 +73,7 @@ void glibtop_init_mem_s (glibtop *server);
 void glibtop_get_mem_s (glibtop *server, glibtop_mem *buf);
 #endif
 
-#ifdef GLIBTOP_NAMES
 
-/* You need to link with -lgtop_names to get this stuff here. */
+G_END_DECLS
-
-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>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
 
 #define GLIBTOP_MOUNTLIST_NUMBER	0
 #define GLIBTOP_MOUNTLIST_TOTAL		1
@@ -41,7 +41,7 @@ typedef struct _glibtop_mountlist	glibtop_mountlist;
 
 struct _glibtop_mountentry
 {
-	u_int64_t dev;
+	guint64 dev;
 	char devname [GLIBTOP_MOUNTENTRY_LEN+1];
 	char mountdir [GLIBTOP_MOUNTENTRY_LEN+1];
 	char type [GLIBTOP_MOUNTENTRY_LEN+1];
@@ -49,7 +49,7 @@ struct _glibtop_mountentry
 
 struct _glibtop_mountlist
 {
-	u_int64_t	flags,
+	guint64	flags,
 		number,			/* GLIBTOP_MOUNTLIST_NUMBER	*/
 		total,			/* GLIBTOP_MOUNTLIST_TOTAL	*/
 		size;			/* GLIBTOP_MOUNTLIST_SIZE	*/
@@ -65,17 +65,7 @@ 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
 
-/* You need to link with -lgtop_names to get this stuff here. */
+G_END_DECLS
-
-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>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_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
 {
-	u_int64_t	flags,
+	guint64	flags,
 		msgpool,	/* GLIBTOP_IPC_MSGPOOL	*/
 		msgmap,		/* GLIBTOP_IPC_MSGMAP	*/
 		msgmax,		/* GLIBTOP_IPC_MSGMAX	*/
@@ -71,18 +71,8 @@ void glibtop_init_msg_limits_s (glibtop *server);
 void glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf);
 #endif
 
-#ifdef GLIBTOP_NAMES
 
-/* You need to link with -lgtop_names to get this stuff here. */
+G_END_DECLS
-
-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/netinfo.h

@@ -1,83 +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_NETINFO_H__
-#define __GLIBTOP_NETINFO_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_NETINFO_IF_FLAGS	0
-#define GLIBTOP_NETINFO_TRANSPORT	1
-#define GLIBTOP_NETINFO_MTU		2
-#define GLIBTOP_NETINFO_SUBNET		3
-#define GLIBTOP_NETINFO_ADDRESS		4
-
-#define GLIBTOP_MAX_NETINFO		5
-
-typedef struct _glibtop_netinfo	glibtop_netinfo;
-
-#include <glibtop/interfaces.h>
-
-struct _glibtop_netinfo
-{
-    u_int64_t	flags,
-	if_flags,			/* GLIBTOP_NETINFO_IF_FLAGS	*/
-	transport,			/* GLIBTOP_NETINFO_TRANSPORT	*/
-	mtu;				/* GLIBTOP_NETINFO_MTU		*/
-};
-
-#if GLIBTOP_SUID_NETINFO
-#define glibtop_get_netinfo_r		glibtop_get_netinfo_p
-#else
-#define glibtop_get_netinfo_r		glibtop_get_netinfo_s
-#endif
-
-glibtop_ifaddr *glibtop_get_netinfo_l (glibtop_client *client, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport);
-
-#if GLIBTOP_SUID_NETINFO
-int glibtop_init_netinfo_p (glibtop_server *server, glibtop_closure *closure);
-glibtop_ifaddr *glibtop_get_netinfo_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport);
-#else
-int glibtop_init_netinfo_s (glibtop_server *server, glibtop_closure *closure);
-glibtop_ifaddr *glibtop_get_netinfo_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport);
-#endif
-
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_netinfo [];
-extern const unsigned glibtop_types_netinfo [];
-extern const char *glibtop_labels_netinfo [];
-extern const char *glibtop_descriptions_netinfo [];
-
-#endif
-
-G_END_DECLS
-
-#endif

include/glibtop/netlist.h

@@ -0,0 +1,61 @@
+/* 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;
+};
+
+#define glibtop_get_netlist(netlist)	glibtop_get_netlist_l(glibtop_global_server, netlist)
+
+#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>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
 
 #define GLIBTOP_NETLOAD_IF_FLAGS	0
 #define GLIBTOP_NETLOAD_MTU		1
@@ -43,8 +43,12 @@ BEGIN_LIBGTOP_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		14
+#define GLIBTOP_MAX_NETLOAD		18
 
 typedef struct _glibtop_netload	glibtop_netload;
 
@@ -67,14 +71,25 @@ 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
 {
-	u_int64_t	flags,
+	guint64	flags,
-		if_flags,		/* GLIBTOP_NETLOAD_IF_FLAGS	*/
+		if_flags;		/* GLIBTOP_NETLOAD_IF_FLAGS	*/
-		mtu,			/* GLIBTOP_NETLOAD_MTU		*/
+
+	guint32	mtu,			/* GLIBTOP_NETLOAD_MTU		*/
 		subnet,			/* GLIBTOP_NETLOAD_SUBNET	*/
-		address,		/* GLIBTOP_NETLOAD_ADDRESS	*/
+		address;		/* GLIBTOP_NETLOAD_ADDRESS	*/
-		packets_in,		/* GLIBTOP_NETLOAD_PACKETS_IN	*/
+
+	guint64	packets_in,		/* GLIBTOP_NETLOAD_PACKETS_IN	*/
 		packets_out,		/* GLIBTOP_NETLOAD_PACKETS_OUT	*/
 		packets_total,		/* GLIBTOP_NETLOAD_PACKETS_TOTAL*/
 		bytes_in,		/* GLIBTOP_NETLOAD_BYTES_IN	*/
@@ -84,6 +99,12 @@ 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    */
 };
 
 #define glibtop_get_netload(netload,interface)	glibtop_get_netload_l(glibtop_global_server, netload, interface)
@@ -104,17 +125,7 @@ void glibtop_init_netload_s (glibtop *server);
 void glibtop_get_netload_s (glibtop *server, glibtop_netload *buf, const char *interface);
 #endif
 
-#ifdef GLIBTOP_NAMES
 
-/* You need to link with -lgtop_names to get this stuff here. */
+G_END_DECLS
-
-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,10 +23,8 @@
 #define __GLIBTOP_OPEN_H__
 
 #include <glibtop.h>
-#include <glibtop/read.h>
-#include <glibtop/error.h>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
 
 #define _GLIBTOP_INIT_STATE_INIT	0x10000
 #define _GLIBTOP_INIT_STATE_OPEN	0x20000
@@ -68,6 +66,6 @@ glibtop_open_s (glibtop *server, const char *program_name,
 		const unsigned long features, const unsigned flags);
 
 
-END_LIBGTOP_DECLS
+G_END_DECLS
 
 #endif

include/glibtop/parameter.h

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

include/glibtop/ppp.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
 
 #define GLIBTOP_PPP_STATE	0
 #define GLIBTOP_PPP_BYTES_IN	1
@@ -45,7 +45,7 @@ enum {
 
 struct _glibtop_ppp
 {
-	u_int64_t	flags,
+	guint64	flags,
 		state,			/* GLIBTOP_PPP_STATE		*/
 		bytes_in,		/* GLIBTOP_PPP_BYTES_IN		*/
 		bytes_out;		/* GLIBTOP_PPP_BYTES_OUT	*/
@@ -69,17 +69,7 @@ void glibtop_init_ppp_s (glibtop *server);
 void glibtop_get_ppp_s (glibtop *server, glibtop_ppp *buf, unsigned short device);
 #endif
 
-#ifdef GLIBTOP_NAMES
 
-/* You need to link with -lgtop_names to get this stuff here. */
+G_END_DECLS
-
-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>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
 
 #define GLIBTOP_PROC_ARGS_SIZE		0
 
@@ -37,47 +37,55 @@ typedef struct _glibtop_proc_args	glibtop_proc_args;
 
 struct _glibtop_proc_args
 {
-	u_int64_t	flags,
+	guint64	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);
 
+#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
+
   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
+
+
+#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
+#endif /* GLIBTOP_SUID_PROC_ARGS */
 
-#ifdef GLIBTOP_NAMES
 
-/* 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 [];
+ * NEW functions
-extern const char *glibtop_labels_proc_args [];
+ */
-extern const char *glibtop_descriptions_proc_args [];
+
-
+char **
-#endif
+glibtop_get_proc_argv_l (glibtop *server, glibtop_proc_args *buf,
-
+			 pid_t pid, unsigned max_len);
-END_LIBGTOP_DECLS
+
+#define glibtop_get_proc_argv(proc_args,pid,max_len) glibtop_get_proc_argv_l(glibtop_global_server, proc_args, pid, max_len)
+
+
+
+G_END_DECLS
 
 #endif

include/glibtop/proccwd.h

@@ -1,81 +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_PROCCWD_H__
-#define __GLIBTOP_PROCCWD_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-#include <glibtop/array.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_PROC_CWD_SIZE			0
-#define GLIBTOP_PROC_CWD_DEVICE			1
-#define GLIBTOP_PROC_CWD_INODE			2
-
-#define GLIBTOP_MAX_PROC_CWD			3
-
-typedef struct _glibtop_proc_cwd	glibtop_proc_cwd;
-
-/* Cwd stuff */
-
-struct _glibtop_proc_cwd
-{
-    u_int64_t	flags,
-	size,
-	device,
-	inode;
-};
-
-#if GLIBTOP_SUID_PROC_CWD
-#define glibtop_get_proc_cwd_r		glibtop_get_proc_cwd_p
-#else
-#define glibtop_get_proc_cwd_r		glibtop_get_proc_cwd_s
-#endif
-
-char *glibtop_get_proc_cwd_l (glibtop_client *client, glibtop_proc_cwd *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_CWD
-int glibtop_init_proc_cwd_p (glibtop_server *server, glibtop_closure *closure);
-char *glibtop_get_proc_cwd_p (glibtop_server *server, glibtop_closure *closure, glibtop_proc_cwd *buf, pid_t pid);
-#else
-int glibtop_init_proc_cwd_s (glibtop_server *server, glibtop_closure *closure);
-char *glibtop_get_proc_cwd_s (glibtop_server *server, glibtop_closure *closure, glibtop_proc_cwd *buf, pid_t pid);
-#endif
-
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_proc_cwd [];
-extern const unsigned glibtop_types_proc_cwd [];
-extern const char *glibtop_labels_proc_cwd [];
-extern const char *glibtop_descriptions_proc_cwd [];
-
-#endif
-
-#endif

include/glibtop/prockernel.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_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
 {
-	u_int64_t flags;
+	guint64 flags;
-	u_int64_t k_flags,	/* kernel flags for the process */
+	guint64 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
@@ -82,17 +82,7 @@ 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
 
-/* You need to link with -lgtop_names to get this stuff here. */
+G_END_DECLS
-
-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>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
 
 #define GLIBTOP_PROCLIST_NUMBER	0
 #define GLIBTOP_PROCLIST_TOTAL	1
@@ -56,7 +56,7 @@ typedef struct _glibtop_proclist	glibtop_proclist;
 
 struct _glibtop_proclist
 {
-	u_int64_t	flags,
+	guint64	flags,
 		number,			/* GLIBTOP_PROCLIST_NUMBER	*/
 		total,			/* GLIBTOP_PROCLIST_TOTAL	*/
 		size;			/* GLIBTOP_PROCLIST_SIZE	*/
@@ -72,33 +72,23 @@ struct _glibtop_proclist
 
 unsigned *
 glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf,
-			int64_t which, int64_t arg);
+			gint64 which, gint64 arg);
 
 #if GLIBTOP_SUID_PROCLIST
 void glibtop_init_proclist_p (glibtop *server);
 
 unsigned *
 glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
-			int64_t which, int64_t arg);
+			gint64 which, gint64 arg);
 #else
 void glibtop_init_proclist_s (glibtop *server);
 
 unsigned *
 glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
-			int64_t which, int64_t arg);
+			gint64 which, gint64 arg);
 #endif
 
-#ifdef GLIBTOP_NAMES
 
-/* You need to link with -lgtop_names to get this stuff here. */
+G_END_DECLS
-
-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>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
 
 #define GLIBTOP_PROC_MAP_NUMBER		0
 #define GLIBTOP_PROC_MAP_TOTAL		1
@@ -35,15 +35,15 @@ BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_MAX_PROC_MAP		3
 
-#define GLIBTOP_MAP_ENTRY_START		1
+#define GLIBTOP_MAP_ENTRY_START		0
-#define GLIBTOP_MAP_ENTRY_END		2
+#define GLIBTOP_MAP_ENTRY_END		1
-#define GLIBTOP_MAP_ENTRY_OFFSET	3
+#define GLIBTOP_MAP_ENTRY_OFFSET	2
-#define GLIBTOP_MAP_ENTRY_PERM		4
+#define GLIBTOP_MAP_ENTRY_PERM		3
-#define GLIBTOP_MAP_ENTRY_INODE		5
+#define GLIBTOP_MAP_ENTRY_INODE		4
-#define GLIBTOP_MAP_ENTRY_DEVICE	6
+#define GLIBTOP_MAP_ENTRY_DEVICE	5
-#define GLIBTOP_MAP_ENTRY_FILENAME	7
+#define GLIBTOP_MAP_ENTRY_FILENAME	6
 
-#define GLIBTOP_MAX_MAP_ENTRY		8
+#define GLIBTOP_MAX_MAP_ENTRY		7
 
 #define GLIBTOP_MAP_FILENAME_LEN	215
 
@@ -59,13 +59,13 @@ typedef struct _glibtop_proc_map	glibtop_proc_map;
 
 struct _glibtop_map_entry
 {
-	u_int64_t flags, start, end, offset, perm, inode, device;
+	guint64 flags, start, end, offset, perm, inode, device;
 	char filename [GLIBTOP_MAP_FILENAME_LEN+1];
 };
 
 struct _glibtop_proc_map
 {
-	u_int64_t	flags,
+	guint64	flags,
 		number,			/* GLIBTOP_PROC_MAP_NUMBER	*/
 		total,			/* GLIBTOP_PROC_MAP_TOTAL	*/
 		size;			/* GLIBTOP_PROC_MAP_SIZE	*/
@@ -94,17 +94,7 @@ glibtop_map_entry *
 glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *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_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>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_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
 {
-	u_int64_t	flags,
+	guint64	flags,
 		size,		/* total # of pages of memory */
 		vsize,		/* number of pages of virtual memory ... */
 		resident,	/* number of resident set
@@ -73,17 +73,7 @@ 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
 
-/* You need to link with -lgtop_names to get this stuff here. */
+G_END_DECLS
-
-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

@@ -0,0 +1,122 @@
+/* $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   */
+};
+
+#define glibtop_get_proc_open_files(proc_open_files,pid) glibtop_get_proc_open_files_l(glibtop_global_server, proc_open_files, 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>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_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
 {
-	u_int64_t	flags,
+	guint64	flags,
 		text_rss,	/* text resident set size */
 		shlib_rss,	/* shared-lib resident set size */
 		data_rss,	/* data resident set size */
@@ -76,17 +76,7 @@ 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
 
-/* You need to link with -lgtop_names to get this stuff here. */
+G_END_DECLS
-
-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>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
 
 #define GLIBTOP_PROC_SIGNAL_SIGNAL	0
 #define GLIBTOP_PROC_SIGNAL_BLOCKED	1
@@ -42,7 +42,7 @@ typedef struct _glibtop_proc_signal	glibtop_proc_signal;
 
 struct _glibtop_proc_signal
 {
-	u_int64_t	flags,
+	guint64	flags,
 		signal [2],		/* mask of pending signals */
 		blocked [2],		/* mask of blocked signals */
 		sigignore [2],		/* mask of ignored signals */
@@ -67,17 +67,7 @@ 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
 
-/* You need to link with -lgtop_names to get this stuff here. */
+G_END_DECLS
-
-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,14 +27,27 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_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		4
+#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
 
 typedef struct _glibtop_proc_state	glibtop_proc_state;
 
@@ -42,10 +55,10 @@ typedef struct _glibtop_proc_state	glibtop_proc_state;
 
 struct _glibtop_proc_state
 {
-	u_int64_t flags;
+	guint64 flags;
-	char cmd[40],		/* basename of executable file in 
+	char cmd[40];		/* basename of executable file in
 				 * call to exec(2) */
-		state;		/* single-char code for process state
+	unsigned state;		/* single-char code for process state
 				 * (S=sleeping) */
 	/* NOTE: when porting the library, TRY HARD to implement the
 	 *       following two fields. */
@@ -53,7 +66,12 @@ 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 */
+		gid,		/* GID of process */
+        ruid,
+        rgid;
+    int has_cpu,
+        processor,
+        last_processor;
 };
 
 #define glibtop_get_proc_state(p1, p2)	glibtop_get_proc_state_l(glibtop_global_server, p1, p2)
@@ -74,17 +92,7 @@ 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>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
 
 #define GLIBTOP_PROC_TIME_START_TIME	0
 #define GLIBTOP_PROC_TIME_RTIME		1
@@ -50,7 +50,7 @@ typedef struct _glibtop_proc_time	glibtop_proc_time;
 
 struct _glibtop_proc_time
 {
-	u_int64_t	flags,
+	guint64	flags,
 		start_time,	/* start time of process --
 				 * seconds since 1-1-70 */
 		rtime,		/* real time accumulated by process */
@@ -88,17 +88,7 @@ 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
 
-/* You need to link with -lgtop_names to get this stuff here. */
+G_END_DECLS
-
-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,34 +27,46 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_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_PID		4
+#define GLIBTOP_PROC_UID_SUID		4
-#define GLIBTOP_PROC_UID_PPID		5
+#define GLIBTOP_PROC_UID_SGID		5
-#define GLIBTOP_PROC_UID_PGRP		6
+#define GLIBTOP_PROC_UID_FSUID		6
-#define GLIBTOP_PROC_UID_SESSION	7
+#define GLIBTOP_PROC_UID_FSGID		7
-#define GLIBTOP_PROC_UID_TTY		8
+#define GLIBTOP_PROC_UID_PID		8
-#define GLIBTOP_PROC_UID_TPGID		9
+#define GLIBTOP_PROC_UID_PPID		9
-#define GLIBTOP_PROC_UID_PRIORITY	10
+#define GLIBTOP_PROC_UID_PGRP		10
-#define GLIBTOP_PROC_UID_NICE		11
+#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_MAX_PROC_UID		12
+#define GLIBTOP_MAX_PROC_UID		18
 
 typedef struct _glibtop_proc_uid	glibtop_proc_uid;
 
+#define GLIBTOP_MAX_GROUPS          64
+
 /* User, Group, Terminal and session */
 
 struct _glibtop_proc_uid
 {
-	u_int64_t flags;
+	guint64 flags;
-	int uid,		/* user id */
+	gint32 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 */
@@ -62,7 +74,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 */
+		nice,		/* standard unix nice level of process */
+		ngroups,
+        groups [GLIBTOP_MAX_GROUPS];
+
 };
 
 #define glibtop_get_proc_uid(p1, p2)	glibtop_get_proc_uid_l(glibtop_global_server, p1, p2)
@@ -83,17 +98,7 @@ 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
 
-/* You need to link with -lgtop_names to get this stuff here. */
+G_END_DECLS
-
-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,15 +25,14 @@
 #define __GLIBTOP_READ_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_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);
 
-END_LIBGTOP_DECLS
+G_END_DECLS
 
 #endif

include/glibtop/read_data.h

@@ -25,15 +25,14 @@
 #define __GLIBTOP_READ_DATA_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_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);
 
-END_LIBGTOP_DECLS
+G_END_DECLS
 
 #endif

include/glibtop/sem_limits.h

@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_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
 {
-	u_int64_t	flags,
+	guint64	flags,
 		semmap,		/* GLIBTOP_IPC_SEMMAP	*/
 		semmni,		/* GLIBTOP_IPC_SEMMNI	*/
 		semmns,		/* GLIBTOP_IPC_SEMMNS	*/
@@ -77,17 +77,7 @@ void glibtop_init_sem_limits_s (glibtop *server);
 void glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf);
 #endif
 
-#ifdef GLIBTOP_NAMES
 
-/* You need to link with -lgtop_names to get this stuff here. */
+G_END_DECLS
-
-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