Nepali translation updated

* NEWS: Released 2.10.2.

.cvsignore

@@ -34,3 +34,9 @@ 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,13 +1,13 @@
 
 SUBDIRS = po misc include sysdeps lib src examples doc
 
-libgtopinclude_HEADERS = glibtop.h
+libgtopinclude_HEADERS = glibtop.h libgtopconfig.h
 libgtopincludedir = $(includedir)/libgtop-2.0
 
 EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \
-	LIBGTOP-VERSION features.def \
+	 features.def libgtopconfig.h.in \
 	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)

NEWS

@@ -1,3 +1,115 @@
+June 12, 2005: Overview of changes from 2.10.1 to 2.10.2
+========================================================
+* glibtop_get_mountlist() : Added tmpfs to ignore list.
+* Re-install open.h to please GTop (libgtop perl wrapper).
+* Linux:
+  * Fixed compilation on mips.
+  * Added pagein/pageout for 2.6.
+
+April 10, 2005: Overview of changes from 2.10.0 to 2.10.1
+=========================================================
+* Updated i18n.
+* Little cleanup and fixed gcc-4.0 compilation.
+* linux: fixed loadavg and uptime if locale != C.
+  Updated siglist.
+* Tighter libgtop-2.0.pc.
+
+Mars 7, 2005: Overview of Changes from 2.9.92 to 2.10.0
+=======================================================
+* Updated i18n.
+
+February 28, 2005: Overview of Changes from 2.9.90 to 2.9.92
+============================================================
+* *BSD updated by marcus@freebsd.org (Joe Marcus Clarke).
+* Removed a lot of dead files :)
+* Don't build&install libgtop_daemon when it's never used.
+
+February 6, 2004: Overview of Changes from 2.9.90 to 2.9.91
+==========================================================
+* Fixed typo in stub.
+* Updated i18n.
+
+January 24, 2004: Overview of Changes from 2.9.4 to 2.9.90
+==========================================================
+* Updated Linux support.
+
+January 10, 2004: Overview of Changes from 2.9.3 to 2.9.4
+=========================================================
+* New glibtop_proc_open_files nick@reloco.com.ar (Nicolás Lichtmaier).
+* Updated AIX support (Christophe Belle).
+
+December 20, 2004: Overview of Changes from 2.9.0 to 2.9.3
+==========================================================
+* Removed libgtop_names.
+* Fixed Argument passing between library and server. #139809.
+* *BSD updated by marcus@freebsd.org (Joe Marcus Clarke).
+* glibtop_get_mountlist(False) now ignores 'unknown' fs.
+
+
+November 30, 2004: Overview of Changes from 2.8.1 to 2.9.0
+=========================================================
+* glibtop_get_netload : Fixed segfault on linux with ppp devices.
+* NEW glibtop_get_netlist : retrieves the list of all available interfaces.
+* NEW LIBGTOP_CHECK_VERSION(major, minor, micro)
+* Removed dead kernel patch and implementation.
+* Cleanups on Linux and Solaris.
+
+October 11, 2004: Overview of Changes from 2.8.0 to 2.8.1
+=========================================================
+* Improved Solaris and AIX support.
+
+
+August 13, 2004: Overview of Changes from 2.7.92 to 2.8.0
+=========================================================
+* No changes
+
+
+August 30, 2004:
+===============
+* Applied some *BSD patches.
+* Removed old files.
+
+
+August 15, 2004:
+===============
+* Fixed compilation with C89-only compilers and old libc.
+
+
+August 3, 2004:
+==============
+* Some cleanups.
+* Fixed the behaviour of some linux proc_*() functions.
+* Updated the documentation.
+
+
+July 19, 2004: Overview of Changes from 2.6.1 to 2.7.4
+======================================================
+* Plenty of code cleanups. Uninlined a lot of functions. ~5-10KB object size
+  reduction.
+* Glibify a bit more.
+* API changes:
+ - glibtop_fsusage provides total read and writes since boot_time.
+ - glibtop_netload provides hardware address. IPv6 enable.
+ - Added glibtop_get_proc_argv.
+
+Work in progress :
+* Finish glibtop_fsusage implementation for Linux.
+* Some fuctions don't conform to the documentation, e.g. proctime.
+
+March 11, 2004:
+===============
+
+* Released LibGTop 2.5.99 "Gross Work", dedicated to people who do push-ups
+  in the loos.
+
+  - plenty of code cleanups
+
+  - removed the dependency on libgnome, only glib required now
+
+  - Linux 2.6 support, NetBSD support and better FreeBSD support
+
+  - Make the block size available for filesystem statistics
+
 February 27, 2001:
 =================
 

README

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

acconfig.h

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

@@ -586,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])
 
@@ -652,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)],[
@@ -688,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_sysdeps_dir=linux
+	  libgtop_use_machine_h=no
+	  libgtop_have_sysinfo=yes
 	  libgtop_need_server=no
 	  ;;
 	freebsd*|netbsd*|openbsd*|bsdi*)

backends/server/ChangeLog

@@ -1,3 +1,16 @@
+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):

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_response resp;
-#if 0
-    int retval;
-#endif
-
-    memset (&cmnd, 0, sizeof (glibtop_command));
-    memset (&resp, 0, sizeof (glibtop_response));
+    glibtop_command cmnd = {0};
+    glibtop_response resp = {0};
 
     cmnd.command = command;
 
@@ -57,7 +51,7 @@ glibtop_call_i (glibtop_server *server, backend_server_private *priv,
     }
 
     cmnd.data_size = data_size;
-	
+
     glibtop_write_i (priv, sizeof (glibtop_command), &cmnd);
 
     if (data_size) {
@@ -75,7 +69,7 @@ glibtop_call_i (glibtop_server *server, backend_server_private *priv,
 	     (long) resp.recv_size, (long) resp.data_size,
 	     recv_ptr, (long) recv_size);
 #endif
-    
+
     if (retval_ptr)
 	*retval_ptr = resp.glibtop_errno;
 
@@ -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 = g_malloc (server, resp.data_size);
+	void *ptr = g_malloc (resp.data_size);
 
 	glibtop_read_i (priv, resp.data_size, ptr);
 

backends/server/demarshal.pl

@@ -246,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 = g_malloc (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";
 
@@ -298,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 = g_malloc (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 .= "g_malloc (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 .= "g_malloc (server, _LIBGTOP_DATA_len+1)";
+      $send_buf_code .= "g_malloc (_LIBGTOP_DATA_len+1)";
     } else {
       $send_buf_code .= 'NULL';
     }
@@ -231,7 +231,7 @@ 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 = g_malloc (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";

backends/server/read_data.c

@@ -45,10 +45,10 @@ glibtop_read_data_i (backend_server_private *priv)
     fprintf (stderr, "LIBRARY: really reading %d data bytes (ret = %d).\n", size, ret);
 #endif
 
-    if (!size) return NULL;	
+    if (!size) return NULL;
+
+    ptr = g_malloc (size);
 
-    ptr = g_malloc (priv->server, size);
-	
     ret = read (priv->input [0], ptr, size);
 
     if (ret < 0)

backends/server/server.c

@@ -86,7 +86,7 @@ main(int argc, char *argv[])
     }
 
     server = glibtop_global_server;
-	
+
     if (!server->_priv)
 	server->_priv = g_malloc (sizeof (glibtop_server_private));
 
@@ -109,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;
@@ -155,7 +155,7 @@ handle_slave_connection (int input, int output)
 		     cmnd->data_size);
 #endif
 
-	    data_ptr = g_malloc (server, cmnd->data_size);
+	    data_ptr = g_malloc (cmnd->data_size);
 	    do_read (input, data_ptr, cmnd->data_size);
 	}
 
@@ -185,5 +185,5 @@ handle_slave_connection (int input, int output)
 	resp.data_size = recv_data_size;
 
 	do_output (output, &resp, recv_ptr, recv_data_ptr);
-    }		
+    }
 }

backends/server/server.h

@@ -27,7 +27,6 @@
 #define __GLIBTOP_DAEMON_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 #include <glibtop/open.h>
 #include <glibtop/union.h>

backends/server/version.c

@@ -37,7 +37,7 @@ glibtop_send_version_i (glibtop *server, int fd)
 	     sizeof (glibtop_response),
 	     sizeof (glibtop_union),
 	     sizeof (glibtop_sysdeps));
-	
+
     size = strlen (buffer) + 1;
 
 #ifdef DEBUG

backends/sysdeps/backend-sysdeps.c

@@ -60,7 +60,7 @@ _open_sysdeps (glibtop_server *server, glibtop_backend *backend,
 	    (*init_fkt) (server);
 
 	server->info->sysdeps.pointer_size = sizeof (void*)*8;
-		
+
 	server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS;
     }
 

configure.in

@@ -7,13 +7,13 @@ AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
 
 LIBGTOP_MAJOR_VERSION=2
-LIBGTOP_MINOR_VERSION=5
-LIBGTOP_MICRO_VERSION=1
+LIBGTOP_MINOR_VERSION=10
+LIBGTOP_MICRO_VERSION=2
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
 AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
 
 dnl  increment if the interface has additions, changes, removals.
-LIBGTOP_CURRENT=2
+LIBGTOP_CURRENT=5
 
 dnl  increment any time the source changes; set to
 dnl  0 if you increment CURRENT
@@ -91,11 +91,6 @@ export cross_compiling
 
 AM_PROG_LIBTOOL
 
-dnl Let the user enable compiler warnings
-dnl GNOME_COMPILE_WARNINGS
-
-dnl GNOME_INIT_HOOK(gnome_found=yes)
-
 AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
 
 GNOME_LIBGTOP_SYSDEPS
@@ -117,7 +112,6 @@ if test x$build_inodedb = xyes ; then
   AC_DEFINE(GLIBTOP_INODEDB)
 fi
 
-AC_DEFINE(GLIBTOP_NAMES)
 
 if test x$libgtop_smp = xyes ; then
   smp_examples='smp'
@@ -128,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 $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
@@ -139,13 +133,24 @@ AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes)
 AC_SUBST(static_targets)
 AC_SUBST(smp_examples)
 
-GLIB_REQUIRED=2.0.0
+GLIB_REQUIRED=2.6.0
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED libgnome-2.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
+
+AC_CHECK_HEADER(ifaddrs.h, [HAVE_IFADDRS_H=yes], [HAVE_IFADDRS_H=no])
+if test x$HAVE_IFADDRS_H = xyes ; then
+	AC_DEFINE(HAVE_IFADDRS_H, 1, [defined if you have ifaddrs.h])
+fi
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -179,6 +184,12 @@ AC_CHECK_FUNCS(dlerror,,)
 LIBS="$oLIBS"
 AC_SUBST(DL_LIB)
 
+dnl Linux
+AC_CHECK_HEADER(linux/isdn.h,[HAVE_ISDN_H=yes],[HAVE_ISDN_H=no])
+if test x$HAVE_ISDN_H = xyes ; then
+	AC_DEFINE(HAVE_ISDN_H, 1, [defined if you have linux/isdn.h])
+fi
+
 dnl AIX
 AH_TEMPLATE(HAVE_VMGETINFO, [Define to 1 if you have the 'vmgetinfo' function in libperfstat])
 AC_CHECK_LIB(perfstat, vmgetinfo, AC_DEFINE(HAVE_VMGETINFO))
@@ -243,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 hr hu id it ja ko lt 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 rw sk sl sq sr sr@Latn sv ta tr uk vi xh zh_CN zh_TW"
 
 GETTEXT_PACKAGE=libgtop-2.0
 AC_SUBST(GETTEXT_PACKAGE)
@@ -326,18 +337,26 @@ fi
 LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"
 
 LIBGTOP_LIBS="$LIBGTOP_LIBS"
-LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS"
 
 LIBGTOP_LIBS="$LIBGTOP_LIBS" 
-LIBGTOP_NAMES_LIBS="$LIBGTOP_NAMES_LIBS"
-
-LIBGTOP_NAMES_INCS="$LIBGTOP_INCS -DGLIBTOP_NAMES"
 
 machine_incs="-I\$(top_srcdir)/sysdeps/$sysdeps_dir"
 
 AC_SUBST(machine_incs)
 
-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 $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"'\"'
+if test "$GCC" = "yes" ; then
+        CFLAGS="\
+	-Winline \
+	-Wall \
+	-std=gnu89 \
+	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
+	-Wnested-externs -Wpointer-arith \
+	-Wcast-align -Wsign-compare \
+	-fno-strict-aliasing \
+	$CFLAGS"
+fi
+
+INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $GLIB_CFLAGS $CFLAGS $X_CFLAGS "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'
 
 AC_SUBST(INCLUDES)
 
@@ -345,8 +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_BINDIR)
 AC_SUBST(LIBGTOP_SERVER)
 
@@ -369,13 +386,11 @@ include/Makefile
 include/glibtop/Makefile
 sysdeps/Makefile
 sysdeps/common/Makefile
-sysdeps/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
@@ -386,4 +401,5 @@ lib/Makefile
 examples/Makefile
 doc/Makefile
 libgtop-2.0.pc
+libgtopconfig.h
 ])

copyright.txt

@@ -1,10 +1,9 @@
-/* $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
    the Free Software Foundation; either version 2 of the License,

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,25 @@
+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/

doc/Makefile.am

@@ -16,8 +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_BINDIR\%#$(LIBGTOP_BINDIR)#g' \
 	  -e 's#\%LIBGTOP_SERVER\%#$(LIBGTOP_SERVER)#g' \
 	  -e 's#\%LIBGTOP_MAJOR_VERSION\%#$(LIBGTOP_MAJOR_VERSION)#g' \

doc/reference.texi

@@ -56,18 +56,19 @@ struct _glibtop_cpu
         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
@@ -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
 
@@ -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
@@ -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.
@@ -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
@@ -1037,16 +1060,7 @@ struct _glibtop_proc_segment
         dirty_size,
         start_code,
         end_code,
-        start_data,
-        end_data,
-        start_brk,
-        end_brk,
-        start_stack,
-        start_mmap,
-        arg_start,
-        arg_end,
-        env_start,
-        env_end;
+        start_stack;
 @};
 @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 *
@@ -1110,6 +1124,30 @@ the lenght of this string is returned in the @code{size} field.
 
 Remember to @code{g_free} the returned string to avoid a memory leak.
 
+@strong{New functions}
+
+@example
+@cartouche
+char **
+glibtop_get_proc_argv(glibtop_proc_args *buf, pid_t pid,
+                         unsigned max_len);
+
+char **
+glibtop_get_proc_argv_l (glibtop *server, glibtop_proc_args *buf,
+                         pid_t pid, unsigned max_len);
+@end cartouche
+@end example
+
+Returns a NULL-terminated array of strings with all arguments of
+process @code{pid} (up to @code{max_len} characters, use zero to get
+all arguments). @code{glibtop_get_proc_argv()} and
+@code{glibtop_get_proc_argv_l()} are wrappers to
+@code{glibtop_get_proc_args()} and @code{glibtop_get_proc_args_l()}
+that return process' arguments like the C @code{argv}.
+
+Remember to @code{g_strfreev} the returned array to avoid a memory
+leak.
+
 @page
 @node glibtop_proc_map, glibtop_netload, glibtop_proc_args, System Dependent
 @subsection Process Memory Maps
@@ -1175,13 +1213,13 @@ fields are valid:
 
 @example
 @cartouche
-#define GLIBTOP_MAP_ENTRY_START         1
-#define GLIBTOP_MAP_ENTRY_END           2
-#define GLIBTOP_MAP_ENTRY_OFFSET        3
-#define GLIBTOP_MAP_ENTRY_PERM          4
-#define GLIBTOP_MAP_ENTRY_INODE         5
-#define GLIBTOP_MAP_ENTRY_DEVICE        6
-#define GLIBTOP_MAP_ENTRY_FILENAME      7
+#define GLIBTOP_MAP_ENTRY_START         0
+#define GLIBTOP_MAP_ENTRY_END           1
+#define GLIBTOP_MAP_ENTRY_OFFSET        2
+#define GLIBTOP_MAP_ENTRY_PERM          3
+#define GLIBTOP_MAP_ENTRY_INODE         4
+#define GLIBTOP_MAP_ENTRY_DEVICE        5
+#define GLIBTOP_MAP_ENTRY_FILENAME      6
 @end cartouche
 @end example
 
@@ -1494,6 +1532,9 @@ struct _glibtop_fsusage
         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

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,88 @@
+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:
@@ -42,7 +127,7 @@
 
 Fri Apr  9 00:14:52 1999 Timur Bakeyev  <timur@gnu.org>
 
-	* timings.c: Added timersub defenition, to make code compilable on 
+	* timings.c: Added timersub defenition, to make code compilable on
 	BSDI.
 
 1999-03-24  Martin Baulig  <martin@home-of-linux.org>
@@ -108,11 +193,11 @@ Fri Apr  9 00:14:52 1999 Timur Bakeyev  <timur@gnu.org>
 1998-06-12  Martin Baulig  <martin@home-of-linux.org>
 
 	* test.scm: New file.
-	
+
 1998-06-07  Martin Baulig  <martin@home-of-linux.org>
 
 	* Makefile.am (CFLAGS): Disable optimize.
-	
+
 	* first.c (PROFILE_COUNT): Number of times each function
 	should be called. Defaults to 1; to profile the code, you
 	can increase this when compiling.

examples/Makefile.am

@@ -6,15 +6,17 @@ INCLUDES		= @INCLUDES@
 
 DEFS			= @DEFS@
 
-noinst_PROGRAMS	= 	first second\
+noinst_PROGRAMS	= 	first second pprint procargs df netlist \
 			  mountlist procmap netload sysdeps timings \
+			  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
@@ -24,7 +26,7 @@ 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
 
 second_static_SOURCES	= $(second_SOURCES)
 second_static_LDADD	= $(second_LDADD)
@@ -51,16 +53,6 @@ sysdeps_static_SOURCES	= $(sysdeps_SOURCES)
 sysdeps_static_LDADD	= $(sysdeps_LDADD)
 sysdeps_static_LDFLAGS	= -static
 
-third_names_LIBS	= $(top_builddir)/sysdeps/names/libgtop_names-2.0.la
-
-third_SOURCES		= third.c
-third_LDADD		= $(third_names_LIBS) \
-			  $(top_builddir)/lib/libgtop-2.0.la \
-			  @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
@@ -71,7 +63,7 @@ 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
 
 smp_static_SOURCES	= $(smp_SOURCES)
 smp_static_LDADD	= $(smp_LDADD)
@@ -84,3 +76,44 @@ 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,6 +22,8 @@
 */
 
 #include <locale.h>
+#include <libintl.h>
+#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -53,7 +55,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 
 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
@@ -133,7 +135,7 @@ main (int argc, char *argv [])
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_shm_limits (&data.shm_limits);
-	
+
 	printf ("Shm Limits   (0x%08lx): %lu, %lu, %lu, %lu, %lu\n",
 		(unsigned long) data.shm_limits.flags,
 		(unsigned long) data.shm_limits.shmmax,
@@ -157,7 +159,7 @@ main (int argc, char *argv [])
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_sem_limits (&data.sem_limits);
-	
+
 	printf ("Sem Limits   (0x%08lx): "
 		"%lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu\n",
 		(unsigned long) data.sem_limits.flags,
@@ -215,7 +217,7 @@ main (int argc, char *argv [])
 		(unsigned long) sysdeps.ppp);
 
 	printf ("\n");
-	
+
 	ptr = glibtop_get_proclist (&data.proclist, 0, 0);
 
 	printf ("Proclist     (0x%08lx): %lu, %lu, %lu\n",
@@ -306,7 +308,7 @@ main (int argc, char *argv [])
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_signal (&data.proc_signal, pid);
-	
+
 	printf ("Proc_Signal  PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_signal.flags,

examples/mountlist.c

@@ -22,6 +22,8 @@
 */
 
 #include <locale.h>
+#include <libintl.h>
+#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -48,11 +50,11 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 
 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
-	
+
 	printf ("Method = %d\n", method);
 
 	count = glibtop_get_parameter (GLIBTOP_PARAM_COMMAND, buffer, BUFSIZ);
@@ -88,18 +90,18 @@ main (int argc, char *argv [])
 			mount_entries [index].type,
 			mount_entries [index].devname);
 
-	printf ("\n\n%-23s %9s %9s %9s %9s %9s\n\n",
-		"", "Blocks", "Free", "Avail", "Files", "Free");
+	printf ("\n\n%-16s %9s %9s %9s %9s %9s %9s\n",
+		"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);
 	}
 
 	g_free (mount_entries);

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__
-#define __GLIBTOP_TYPES_H__
+#include <stdio.h>
 
-G_BEGIN_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
 
-G_END_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,6 +22,8 @@
 */
 
 #include <locale.h>
+#include <libintl.h>
+#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -38,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 [])
 {
@@ -45,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;
@@ -52,7 +74,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 
 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
@@ -74,8 +96,8 @@ 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;
@@ -84,36 +106,50 @@ main (int argc, char *argv [])
 	address_string = g_strdup (inet_ntoa (addr));
 	subnet_string  = g_strdup (inet_ntoa (subnet));
 
-	printf ("Network Load (0x%08lx):\n\n"
-		"\tInterface Flags:\t0x%08lx\n"
-		"\tAddress:\t\t0x%08lx - %s\n"
-		"\tSubnet:\t\t\t0x%08lx - %s\n\n"
-		"\tMTU:\t\t\t%ld\n"
-		"\tCollisions:\t\t%ld\n\n"
-		"\tPackets In:\t\t%ld\n"
-		"\tPackets Out:\t\t%ld\n"
-		"\tPackets Total:\t\t%ld\n\n"
-		"\tBytes In:\t\t%ld\n"
-		"\tBytes Out:\t\t%ld\n"
-		"\tBytes Total:\t\t%ld\n\n"
-		"\tErrors In:\t\t%ld\n"
-		"\tErrors Out:\t\t%ld\n"
-		"\tErrors Total:\t\t%ld\n\n",
-		(unsigned long) netload.flags,
-		(unsigned long) netload.if_flags,
-		(unsigned long) netload.address, address_string,
-		(unsigned long) netload.subnet,  subnet_string,
-		(unsigned long) netload.mtu,
-		(unsigned long) netload.collisions,
-		(unsigned long) netload.packets_in,
-		(unsigned long) netload.packets_out,
-		(unsigned long) netload.packets_total,
-		(unsigned long) netload.bytes_in,
-		(unsigned long) netload.bytes_out,
-		(unsigned long) netload.bytes_total,
-		(unsigned long) netload.errors_in,
-		(unsigned long) netload.errors_out,
-		(unsigned long) netload.errors_total);
+	inet_ntop (AF_INET6, netload.address6, address6_string, INET6_ADDRSTRLEN);
+	inet_ntop (AF_INET6, netload.prefix6,  prefix6_string,  INET6_ADDRSTRLEN);
+
+	hwaddress_string = hwaddress_format_for_display(&netload);
+
+	printf ("Network Load (0x%016llx):\n\n"
+		"\tInterface Flags:\t0x%016llx\n"
+		"\tAddress:\t\t0x%08x - %s\n"
+		"\tSubnet:\t\t\t0x%08x - %s\n\n"
+		"\tMTU:\t\t\t%d\n"
+		"\tCollisions:\t\t%llu\n\n"
+		"\tPackets In:\t\t%llu\n"
+		"\tPackets Out:\t\t%llu\n"
+		"\tPackets Total:\t\t%llu\n\n"
+		"\tBytes In:\t\t%llu\n"
+		"\tBytes Out:\t\t%llu\n"
+		"\tBytes Total:\t\t%llu\n\n"
+		"\tErrors In:\t\t%llu\n"
+		"\tErrors Out:\t\t%llu\n"
+		"\tErrors Total:\t\t%llu\n\n"
+		"\tAddress6:\t\t%s\n"
+		"\tPrefix6:\t\t%s\n"
+		"\tScope6:\t\t\t%#03x\n\n"
+		"\tHarware Address:\t%s\n\n",
+		netload.flags,
+		netload.if_flags,
+		(guint32) netload.address, address_string,
+		(guint32) netload.subnet,  subnet_string,
+		netload.mtu,
+		netload.collisions,
+		netload.packets_in,
+		netload.packets_out,
+		netload.packets_total,
+		netload.bytes_in,
+		netload.bytes_out,
+		netload.bytes_total,
+		netload.errors_in,
+		netload.errors_out,
+		netload.errors_total,
+		address6_string,
+		prefix6_string,
+		(int) netload.scope6,
+		hwaddress_string);
+
 
 	g_free (address_string);
 	g_free (subnet_string);

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,6 +22,8 @@
 */
 
 #include <locale.h>
+#include <libintl.h>
+#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -59,7 +61,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 
 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
@@ -81,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);
@@ -95,7 +97,7 @@ main (int argc, char *argv [])
 		const char *filename = NULL;
 		unsigned device, device_major, device_minor;
 		char perm [5];
-		
+
 		if (maps [i].flags & (1L << GLIBTOP_MAP_ENTRY_FILENAME))
 			filename = maps [i].filename;
 
@@ -152,7 +154,7 @@ main (int argc, char *argv [])
 		}
 
 		if (filename && (filename != maps [i].filename))
-			g_free (filename);
+			g_free ((void*)filename);
 	}
 
 	g_free (maps);

examples/second.c

@@ -23,6 +23,8 @@
 
 #include <locale.h>
 #include <math.h>
+#include <stdio.h>
+#include <libintl.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -44,11 +46,11 @@ 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");
-		
+
 	glibtop_get_proc_state (&data.proc_state, pid);
 
 	printf ("Proc_State   PID  %5d (0x%08lx): "
@@ -57,9 +59,9 @@ output (pid_t pid)
 		data.proc_state.cmd, data.proc_state.state,
 		(unsigned long) data.proc_state.uid,
 		(unsigned long) data.proc_state.gid);
-		
+
 	glibtop_get_proc_uid (&data.proc_uid, pid);
-	
+
 	printf ("Proc_Uid     PID  %5d (0x%08lx): "
 		"%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) pid,
 		(unsigned long) data.proc_uid.flags,
@@ -71,7 +73,7 @@ output (pid_t pid)
 		data.proc_uid.priority, data.proc_uid.nice);
 
 	glibtop_get_proc_mem (&data.proc_mem, pid);
-		
+
 	printf ("Proc_Mem     PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_mem.flags,
@@ -81,7 +83,7 @@ output (pid_t pid)
 		(unsigned long) data.proc_mem.share,
 		(unsigned long) data.proc_mem.rss,
 		(unsigned long) data.proc_mem.rss_rlim);
-		
+
 	glibtop_get_proc_segment (&data.proc_segment, pid);
 
 	printf ("Proc_Segment PID  %5d (0x%08lx): "
@@ -97,7 +99,7 @@ output (pid_t pid)
 		(unsigned long) data.proc_segment.start_stack);
 
 	glibtop_get_proc_time (&data.proc_time, pid);
-		
+
 	printf ("Proc_Time    PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_time.flags,
@@ -112,7 +114,7 @@ output (pid_t pid)
 		(unsigned long) data.proc_time.frequency);
 
 	glibtop_get_proc_signal (&data.proc_signal, pid);
-	
+
 	printf ("Proc_Signal  PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_signal.flags,
@@ -158,7 +160,7 @@ output (pid_t pid)
 	ncpu = glibtop_global_server->ncpu;
 
 	glibtop_get_proc_time (&data.proc_time, pid);
-		
+
 	total = (unsigned long) data.proc_time.utime +
 		(unsigned long) data.proc_time.stime;
 
@@ -240,7 +242,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init ();
 
 	glibtop_get_sysdeps (&sysdeps);
@@ -286,7 +288,7 @@ main (int argc, char *argv [])
 	for (i = 0; i < proclist.number; i++) {
 
 		pid = ptr [i];
-		
+
 		output (pid);
 	}
 

examples/smp.c

@@ -24,12 +24,14 @@
 #include <config.h>
 
 #include <locale.h>
+#include <libintl.h>
 #include <math.h>
+#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/cpu.h>
 
-#include <libgnome/gnome-i18n.h>
+#include "libgtop-i18n.h"
 
 int
 main (int argc, char *argv [])
@@ -45,7 +47,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init();
 
 	glibtop_get_cpu (&cpu);
@@ -100,7 +102,7 @@ main (int argc, char *argv [])
 	printf ("%-26s %12s %12s %12s %12s %12s\n%s\n", _("Percent:"),
 		_("Total (%)"), _("User (%)"), _("Nice (%)"), _("Sys (%)"),
 		_("Idle (%)"), separator);
-	
+
 	printf (_("CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n\n"),
 		(unsigned long) cpu.flags, (double) total * 100.0 / total,
 		(double) user  * 100.0 / total,

examples/sysdeps.c

@@ -22,6 +22,8 @@
 */
 
 #include <locale.h>
+#include <libintl.h>
+#include <stdio.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -46,7 +48,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 
 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));

examples/third.c

@@ -1,56 +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/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,6 +22,8 @@
 */
 
 #include <locale.h>
+#include <stdio.h>
+#include <libintl.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -85,7 +87,7 @@ main (int argc, char *argv [])
 		"Feature", "Flags", "Count", "utime", "stime");
 	printf ("-------------------------------------------"
 		"---------------\n");
-	
+
 	glibtop_init_r (&glibtop_global_server, 0, 0);
 
 	getrusage (RUSAGE_SELF, &total_start);
@@ -301,7 +303,7 @@ main (int argc, char *argv [])
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_signal (&data.proc_signal, pid);
-	
+
 	getrusage (RUSAGE_SELF, &rusage_end);
 
 	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
@@ -332,7 +334,7 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_kernel.flags, PROFILE_COUNT,
 		(long double) ELAPSED_UTIME / PROFILE_COUNT,
 		(long double) ELAPSED_STIME / PROFILE_COUNT);
-	
+
 	getrusage (RUSAGE_SELF, &total_end);
 
 	libgtop_timersub (&total_end.ru_utime, &total_start.ru_utime,

features.def

@@ -1,4 +1,4 @@
-void|cpu|ulong(total,user,nice,sys,idle,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;

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 \
-			  procsegment.h read.h sysdeps.h global.h \
-			  procsignal.h read_data.h union.h types.h gnuserv.h \
+			  procmem.h procuid.h swap.h \
+			  procsegment.h sysdeps.h global.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 open.h
+
+noinst_HEADERS		= error.h write.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
-{
-    guint64 flags,
-	number,		/* GLIBTOP_ARRAY_NUMBER	*/
-	size,		/* GLIBTOP_ARRAY_SIZE	*/
-	total;		/* GLIBTOP_ARRAY_TOTAL	*/
-};
-
-#endif

include/glibtop/command.h

@@ -57,8 +57,10 @@ G_BEGIN_DECLS
 #define GLIBTOP_CMND_FSUSAGE		21
 #define GLIBTOP_CMND_NETLOAD		22
 #define GLIBTOP_CMND_PPP		23
+#define GLIBTOP_CMND_NETLIST		24
+#define GLIBTOP_CMND_PROC_OPEN_FILES	25
 
-#define GLIBTOP_MAX_CMND		24
+#define GLIBTOP_MAX_CMND		26
 
 #define _GLIBTOP_PARAM_SIZE		16
 
@@ -82,7 +84,7 @@ union _glibtop_response_union
 
 struct _glibtop_response
 {
-	int64_t offset;
+	gint64 offset;
 	guint64 size, data_size;
 	glibtop_response_union u;
 };

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

@@ -41,9 +41,16 @@ G_BEGIN_DECLS
 #define GLIBTOP_XCPU_NICE	8
 #define GLIBTOP_XCPU_SYS	9
 #define GLIBTOP_XCPU_IDLE	10
-#define GLIBTOP_XCPU_FLAGS  11
+#define GLIBTOP_XCPU_FLAGS	11
 
-#define GLIBTOP_MAX_CPU		12
+#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
@@ -58,12 +65,18 @@ struct _glibtop_cpu
 		nice,				/* GLIBTOP_CPU_NICE		*/
 		sys,				/* GLIBTOP_CPU_SYS		*/
 		idle,				/* GLIBTOP_CPU_IDLE		*/
+		iowait,				/* GLIBTOP_CPU_IOWAIT		*/
+		irq,				/* GLIBTOP_CPU_IRQ		*/
+		softirq,			/* GLIBTOP_CPU_SOFTIRQ		*/
 		frequency,			/* GLIBTOP_CPU_FREQUENCY	*/
 		xcpu_total [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_TOTAL		*/
 		xcpu_user [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_USER		*/
 		xcpu_nice [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_NICE		*/
 		xcpu_sys  [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_SYS		*/
 		xcpu_idle [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_IDLE		*/
+		xcpu_iowait [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_IOWAIT		*/
+		xcpu_irq [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_IRQ		*/
+		xcpu_softirq  [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_SOFTIRQ		*/
 		xcpu_flags;	                /* GLIBTOP_XCPU_IDLE		*/
 };
 
@@ -85,16 +98,6 @@ 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. */
-
-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
 
 G_END_DECLS
 

include/glibtop/error.h

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

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.
 
@@ -34,19 +33,24 @@ G_BEGIN_DECLS
 #define GLIBTOP_FSUSAGE_BAVAIL		2
 #define GLIBTOP_FSUSAGE_FILES		3
 #define GLIBTOP_FSUSAGE_FFREE		4
+#define GLIBTOP_FSUSAGE_BLOCK_SIZE	5
+#define GLIBTOP_FSUSAGE_READ           6
+#define GLIBTOP_FSUSAGE_WRITE          7
+#define GLIBTOP_MAX_FSUSAGE		8
 
-#define GLIBTOP_MAX_FSUSAGE		5
 
 typedef struct _glibtop_fsusage		glibtop_fsusage;
 
 struct _glibtop_fsusage
 {
 	guint64	flags,
-		blocks,		/* Total 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,16 +60,6 @@ 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. */
-
-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
 
 G_END_DECLS
 

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/gnuserv.h

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

include/glibtop/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
-{
-    guint64	flags,
-	transport;			/* GLIBTOP_IFADDR_TRANSPORT	*/
-    u_int8_t	addr_len,		/* GLIBTOP_IFADDR_ADDR_LEN	*/
-	address [GLIBTOP_IFADDR_LEN];	/* GLIBTOP_IFADDR_ADDRESS	*/
-    guint64	subnet,			/* GLIBTOP_IFADDR_SUBNET	*/
-	scope;				/* GLIBTOP_IFADDR_SCOPE	*/
-};
-
-struct _glibtop_interface
-{
-    guint64	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, guint64 interface, guint64 number, guint64 instance, guint64 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, guint64 interface, guint64 number, guint64 instance, guint64 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, guint64 interface, guint64 number, guint64 instance, guint64 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/loadavg.h

@@ -65,16 +65,6 @@ 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. */
-
-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
 
 G_END_DECLS
 

include/glibtop/mem.h

@@ -73,16 +73,6 @@ 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. */
-
-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
 
 G_END_DECLS
 

include/glibtop/mountlist.h

@@ -65,16 +65,6 @@ 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. */
-
-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
 
 G_END_DECLS
 

include/glibtop/msg_limits.h

@@ -71,16 +71,6 @@ 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. */
-
-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
 
 G_END_DECLS
 

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
-{
-    guint64	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, guint64 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, guint64 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, guint64 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

@@ -43,8 +43,12 @@ G_BEGIN_DECLS
 #define GLIBTOP_NETLOAD_ERRORS_OUT	11
 #define GLIBTOP_NETLOAD_ERRORS_TOTAL	12
 #define GLIBTOP_NETLOAD_COLLISIONS	13
+#define GLIBTOP_NETLOAD_ADDRESS6	14
+#define GLIBTOP_NETLOAD_PREFIX6		15
+#define GLIBTOP_NETLOAD_SCOPE6		16
+#define GLIBTOP_NETLOAD_HWADDRESS	17
 
-#define GLIBTOP_MAX_NETLOAD		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
 {
 	guint64	flags,
-		if_flags,		/* GLIBTOP_NETLOAD_IF_FLAGS	*/
-		mtu,			/* GLIBTOP_NETLOAD_MTU		*/
+		if_flags;		/* GLIBTOP_NETLOAD_IF_FLAGS	*/
+
+	guint32	mtu,			/* GLIBTOP_NETLOAD_MTU		*/
 		subnet,			/* GLIBTOP_NETLOAD_SUBNET	*/
-		address,		/* GLIBTOP_NETLOAD_ADDRESS	*/
-		packets_in,		/* GLIBTOP_NETLOAD_PACKETS_IN	*/
+		address;		/* GLIBTOP_NETLOAD_ADDRESS	*/
+
+	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,16 +125,6 @@ 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. */
-
-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
 
 G_END_DECLS
 

include/glibtop/open.h

@@ -23,8 +23,6 @@
 #define __GLIBTOP_OPEN_H__
 
 #include <glibtop.h>
-#include <glibtop/read.h>
-#include <glibtop/error.h>
 
 G_BEGIN_DECLS
 

include/glibtop/parameter.h

@@ -23,7 +23,6 @@
 #define __GLIBTOP_PARAMETER_H__
 
 #include <glibtop.h>
-#include <glibtop/open.h>
 
 G_BEGIN_DECLS
 

include/glibtop/ppp.h

@@ -30,7 +30,7 @@
 G_BEGIN_DECLS
 
 #define GLIBTOP_PPP_STATE	0
-#define GLIBTOP_PPP_BYTES_IN	1	
+#define GLIBTOP_PPP_BYTES_IN	1
 #define GLIBTOP_PPP_BYTES_OUT	2
 
 #define GLIBTOP_MAX_PPP		3
@@ -69,16 +69,6 @@ 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. */
-
-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
 
 G_END_DECLS
 

include/glibtop/procargs.h

@@ -41,42 +41,50 @@ struct _glibtop_proc_args
 		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
-void glibtop_init_proc_args_p (glibtop *server);
 
-char *
-glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
+# define glibtop_get_proc_args_r		glibtop_get_proc_args_p
+
+  void glibtop_init_proc_args_p (glibtop *server);
+
+  char *
+  glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
+			   pid_t pid, unsigned max_len);
+
+
+#else /* !GLIBTOP_SUID_PROC_ARGS */
+
+# define glibtop_get_proc_args_r		glibtop_get_proc_args_s
+
+  void glibtop_init_proc_args_s (glibtop *server);
+
+  char *
+  glibtop_get_proc_args_s (glibtop *server, glibtop_proc_args *buf,
+			   pid_t pid, unsigned max_len);
+#endif /* GLIBTOP_SUID_PROC_ARGS */
+
+
+
+/*
+ * NEW functions
+ */
+
+char **
+glibtop_get_proc_argv_l (glibtop *server, glibtop_proc_args *buf,
 			 pid_t pid, unsigned max_len);
-#else
-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
+#define glibtop_get_proc_argv(proc_args,pid,max_len) glibtop_get_proc_argv_l(glibtop_global_server, proc_args, pid, max_len)
 
-#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 [];
-extern const char *glibtop_labels_proc_args [];
-extern const char *glibtop_descriptions_proc_args [];
-
-#endif
 
 G_END_DECLS
 

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
-{
-    guint64	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

@@ -82,16 +82,6 @@ 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. */
-
-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
 
 G_END_DECLS
 

include/glibtop/proclist.h

@@ -72,32 +72,22 @@ 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. */
-
-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
 
 G_END_DECLS
 

include/glibtop/procmap.h

@@ -35,15 +35,15 @@ G_BEGIN_DECLS
 
 #define GLIBTOP_MAX_PROC_MAP		3
 
-#define GLIBTOP_MAP_ENTRY_START		1
-#define GLIBTOP_MAP_ENTRY_END		2
-#define GLIBTOP_MAP_ENTRY_OFFSET	3
-#define GLIBTOP_MAP_ENTRY_PERM		4
-#define GLIBTOP_MAP_ENTRY_INODE		5
-#define GLIBTOP_MAP_ENTRY_DEVICE	6
-#define GLIBTOP_MAP_ENTRY_FILENAME	7
+#define GLIBTOP_MAP_ENTRY_START		0
+#define GLIBTOP_MAP_ENTRY_END		1
+#define GLIBTOP_MAP_ENTRY_OFFSET	2
+#define GLIBTOP_MAP_ENTRY_PERM		3
+#define GLIBTOP_MAP_ENTRY_INODE		4
+#define GLIBTOP_MAP_ENTRY_DEVICE	5
+#define GLIBTOP_MAP_ENTRY_FILENAME	6
 
-#define GLIBTOP_MAX_MAP_ENTRY		8
+#define GLIBTOP_MAX_MAP_ENTRY		7
 
 #define GLIBTOP_MAP_FILENAME_LEN	215
 
@@ -94,16 +94,6 @@ 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. */
-
-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
 
 G_END_DECLS
 

include/glibtop/procmem.h

@@ -73,16 +73,6 @@ 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. */
-
-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
 
 G_END_DECLS
 

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

@@ -76,16 +76,6 @@ 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. */
-
-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
 
 G_END_DECLS
 

include/glibtop/procsignal.h

@@ -67,16 +67,6 @@ 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. */
-
-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
 
 G_END_DECLS
 

include/glibtop/procstate.h

@@ -47,6 +47,7 @@ G_BEGIN_DECLS
 #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;
 
@@ -55,7 +56,7 @@ typedef struct _glibtop_proc_state	glibtop_proc_state;
 struct _glibtop_proc_state
 {
 	guint64 flags;
-	char cmd[40];		/* basename of executable file in 
+	char cmd[40];		/* basename of executable file in
 				 * call to exec(2) */
 	unsigned state;		/* single-char code for process state
 				 * (S=sleeping) */
@@ -90,17 +91,7 @@ void glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf, pid_t p
 void glibtop_init_proc_state_s (glibtop *server);
 void glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf, pid_t pid);
 #endif
-     
-#ifdef GLIBTOP_NAMES
 
-/* You need to link with -lgtop_names to get this stuff here. */
-
-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
 
 G_END_DECLS
 

include/glibtop/proctime.h

@@ -51,14 +51,14 @@ typedef struct _glibtop_proc_time	glibtop_proc_time;
 struct _glibtop_proc_time
 {
 	guint64	flags,
-		start_time,	/* start time of process -- 
+		start_time,	/* start time of process --
 				 * seconds since 1-1-70 */
 		rtime,		/* real time accumulated by process */
 		utime,		/* user-mode CPU time accumulated by process */
 		stime,		/* kernel-mode CPU time accumulated by process */
-		cutime,		/* cumulative utime of process and 
+		cutime,		/* cumulative utime of process and
 				 * reaped children */
-		cstime,		/* cumulative stime of process and 
+		cstime,		/* cumulative stime of process and
 				 * reaped children */
 		timeout,	/* The time (in jiffies) of the process's
 				 * next timeout */
@@ -88,16 +88,6 @@ 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. */
-
-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
 
 G_END_DECLS
 

include/glibtop/procuid.h

@@ -59,7 +59,7 @@ typedef struct _glibtop_proc_uid	glibtop_proc_uid;
 struct _glibtop_proc_uid
 {
 	guint64 flags;
-	int uid,		/* user id */
+	gint32 uid,		/* user id */
 		euid,		/* effective user id */
 		gid,		/* group id */
 		egid,		/* effective group id */
@@ -98,16 +98,6 @@ 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. */
-
-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
 
 G_END_DECLS
 

include/glibtop/read.h

@@ -25,7 +25,6 @@
 #define __GLIBTOP_READ_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 G_BEGIN_DECLS
 

include/glibtop/read_data.h

@@ -25,7 +25,6 @@
 #define __GLIBTOP_READ_DATA_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 G_BEGIN_DECLS
 

include/glibtop/sem_limits.h

@@ -77,16 +77,6 @@ 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. */
-
-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
 
 G_END_DECLS
 

include/glibtop/shm_limits.h

@@ -67,16 +67,6 @@ void glibtop_init_shm_limits_s (glibtop *server);
 void glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf);
 #endif
 
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_shm_limits [];
-extern const unsigned glibtop_types_shm_limits [];
-extern const char *glibtop_labels_shm_limits [];
-extern const char *glibtop_descriptions_shm_limits [];
-
-#endif
 
 G_END_DECLS
 

include/glibtop/swap.h

@@ -67,16 +67,6 @@ void glibtop_init_swap_s (glibtop *server);
 void glibtop_get_swap_s (glibtop *server, glibtop_swap *buf);
 #endif
 
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_swap [];
-extern const unsigned glibtop_types_swap [];
-extern const char *glibtop_labels_swap [];
-extern const char *glibtop_descriptions_swap [];
-
-#endif
 
 G_END_DECLS
 

include/glibtop/sysdeps.h

@@ -51,8 +51,10 @@ G_BEGIN_DECLS
 #define GLIBTOP_SYSDEPS_FSUSAGE		20
 #define GLIBTOP_SYSDEPS_NETLOAD		21
 #define GLIBTOP_SYSDEPS_PPP		22
+#define GLIBTOP_SYSDEPS_NETLIST		23
+#define GLIBTOP_SYSDEPS_PROC_OPEN_FILES	24
 
-#define GLIBTOP_MAX_SYSDEPS		23
+#define GLIBTOP_MAX_SYSDEPS		25
 
 #define GLIBTOP_SYSDEPS_ALL		((1 << GLIBTOP_MAX_SYSDEPS) - 1)
 
@@ -84,8 +86,10 @@ struct _glibtop_sysdeps
 		proc_segment,		/* glibtop_proc_segment	*/
 		proc_args,		/* glibtop_proc_args	*/
 		proc_map,		/* glibtop_proc_map	*/
+		proc_open_files,	/* glibtop_proc_open_files */
 		mountlist,		/* glibtop_mountlist	*/
 		fsusage,		/* glibtop_fsusage	*/
+		netlist,		/* glibtop_netlist	*/
 		netload,		/* glibtop_netload	*/
 		ppp;			/* glibtop_ppp		*/
 };
@@ -94,16 +98,6 @@ struct _glibtop_sysdeps
 
 void glibtop_get_sysdeps_r (glibtop *server, glibtop_sysdeps *buf);
 
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_sysdeps [];
-extern const unsigned glibtop_types_sysdeps [];
-extern const char *glibtop_labels_sysdeps [];
-extern const char *glibtop_descriptions_sysdeps [];
-
-#endif
 
 G_END_DECLS
 

include/glibtop/sysinfo.h

@@ -32,9 +32,10 @@
 
 G_BEGIN_DECLS
 
-#define GLIBTOP_SYSINFO_CPUINFO		0
+#define GLIBTOP_SYSINFO_NCPU		0
+#define GLIBTOP_SYSINFO_CPUINFO		1
 
-#define GLIBTOP_MAX_SYSINFO		1
+#define GLIBTOP_MAX_SYSINFO		2
 
 typedef struct _glibtop_sysinfo	glibtop_sysinfo;
 
@@ -43,21 +44,21 @@ typedef struct _glibtop_entry	glibtop_entry;
 struct _glibtop_entry
 {
 	GPtrArray	*labels;
-	GHashTable	*values;
-	GHashTable	*descriptions;
+	GHashTable	*values; /* key -> description */
+	GHashTable	*descriptions; /* unused */
 };
 
 struct _glibtop_sysinfo
 {
 	guint64	flags, ncpu;
-	glibtop_entry	cpuinfo [GLIBTOP_NCPU];
+	glibtop_entry cpuinfo [GLIBTOP_NCPU];
 };
 
 #define glibtop_get_sysinfo()	glibtop_get_sysinfo_s(glibtop_global_server)
 
 #define glibtop_get_sysinfo_r	glibtop_get_sysinfo_s
 
-glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server);
+const glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server);
 
 G_END_DECLS
 

include/glibtop/union.h

@@ -43,11 +43,13 @@
 #include <glibtop/procsegment.h>
 #include <glibtop/procargs.h>
 #include <glibtop/procmap.h>
+#include <glibtop/procopenfiles.h>
 
 #include <glibtop/mountlist.h>
 #include <glibtop/fsusage.h>
 
 #include <glibtop/netload.h>
+#include <glibtop/netlist.h>
 #include <glibtop/ppp.h>
 
 G_BEGIN_DECLS
@@ -76,8 +78,10 @@ union _glibtop_union
 	glibtop_proc_map	proc_map;
 	glibtop_mountlist	mountlist;
 	glibtop_fsusage		fsusage;
+	glibtop_netlist		netlist;
 	glibtop_netload		netload;
 	glibtop_ppp		ppp;
+	glibtop_proc_open_files proc_open_files;
 };
 
 G_END_DECLS

include/glibtop/uptime.h

@@ -63,16 +63,6 @@ void glibtop_init_uptime_s (glibtop *server);
 void glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf);
 #endif
 
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_uptime [];
-extern const unsigned glibtop_types_uptime [];
-extern const char *glibtop_labels_uptime [];
-extern const char *glibtop_descriptions_uptime [];
-
-#endif
 
 G_END_DECLS
 

include/glibtop/version.h

@@ -23,9 +23,6 @@
 #define __GLIBTOP_VERSION_H__
 
 #include <glibtop.h>
-#include <glibtop/union.h>
-#include <glibtop/sysdeps.h>
-#include <glibtop/command.h>
 
 #define LIBGTOP_VERSION_STRING "Libgtop %s server version %s (%u,%u,%u,%u)."
 

include/glibtop/write.h

@@ -25,7 +25,6 @@
 #define __GLIBTOP_WRITE_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 G_BEGIN_DECLS
 

include/libgtop-i18n.h

@@ -0,0 +1,11 @@
+
+#include <config.h>
+
+#include <libintl.h>
+#define _(String) gettext (String)
+#ifdef gettext_noop
+#   define N_(String) gettext_noop (String)
+#else
+#   define N_(String) (String)
+#endif
+

kernel/ChangeLog

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

kernel/sysctl/.cvsignore

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

kernel/sysctl/Makefile

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

kernel/sysctl/libgtop.h

@@ -1,242 +0,0 @@
-#ifndef _LINUX_LIBGTOP_H
-#define _LINUX_LIBGTOP_H 1
-
-#include <linux/tasks.h>
-
-enum {
-    LIBGTOP_VERSION = 1,
-    LIBGTOP_UPDATE_EXPENSIVE,
-    LIBGTOP_STAT = 101,
-    LIBGTOP_MEM,
-    LIBGTOP_SWAP,
-    LIBGTOP_PROCLIST = 201,
-    LIBGTOP_PROC_STATE = 211,
-    LIBGTOP_PROC_KERNEL,
-    LIBGTOP_PROC_SEGMENT,
-    LIBGTOP_PROC_MEM,
-    LIBGTOP_PROC_SIGNAL,
-    LIBGTOP_PROC_ARGS = 251,
-    LIBGTOP_PROC_MAPS,
-    LIBGTOP_NETLOAD = 301
-};
-
-enum {
-    LIBGTOP_PROCLIST_ALL = 0,
-    LIBGTOP_PROCLIST_PID,
-    LIBGTOP_PROCLIST_PGRP,
-    LIBGTOP_PROCLIST_SESSION,
-    LIBGTOP_PROCLIST_TTY,
-    LIBGTOP_PROCLIST_UID,
-    LIBGTOP_PROCLIST_RUID
-};
-
-#define LIBGTOP_NSIG			4
-
-#define LIBGTOP_PROCLIST_MASK		15
-#define LIBGTOP_MAX_GROUPS		32
-
-#define LIBGTOP_EXCLUDE_IDLE		0x1000
-#define LIBGTOP_EXCLUDE_SYSTEM		0x2000
-#define LIBGTOP_EXCLUDE_NOTTY		0x4000
-
-#define LIBGTOP_TASK_RUNNING		1
-#define LIBGTOP_TASK_INTERRUPTIBLE	2
-#define LIBGTOP_TASK_UNINTERRUPTIBLE	4
-#define LIBGTOP_TASK_ZOMBIE		8
-#define LIBGTOP_TASK_STOPPED		16
-#define LIBGTOP_TASK_SWAPPING		32
-
-#define LIBGTOP_VM_READ		0x0001	/* currently active flags */
-#define LIBGTOP_VM_WRITE	0x0002
-#define LIBGTOP_VM_EXEC		0x0004
-#define LIBGTOP_VM_SHARED	0x0008
-
-#define LIBGTOP_VM_MAYREAD	0x0010	/* limits for mprotect() etc */
-#define LIBGTOP_VM_MAYWRITE	0x0020
-#define LIBGTOP_VM_MAYEXEC	0x0040
-#define LIBGTOP_VM_MAYSHARE	0x0080
-
-#define LIBGTOP_VM_GROWSDOWN	0x0100	/* general info on the segment */
-#define LIBGTOP_VM_GROWSUP	0x0200
-#define LIBGTOP_VM_SHM		0x0400	/* shared memory area, don't swap out */
-#define LIBGTOP_VM_DENYWRITE	0x0800	/* ETXTBSY on write attempts.. */
-
-#define LIBGTOP_VM_EXECUTABLE	0x1000
-#define LIBGTOP_VM_LOCKED	0x2000
-#define LIBGTOP_VM_IO		0x4000  /* Memory mapped I/O or similar */
-
-#define LIBGTOP_MAP_PATH_LEN	(PAGE_SIZE - sizeof (libgtop_proc_maps_header_t))
-
-#ifndef min
-#define min(a,b) ((a < b) ? a : b)
-#endif
-
-typedef struct libgtop_stat libgtop_stat_t;
-
-typedef struct libgtop_cpu libgtop_cpu_t;
-typedef struct libgtop_mem libgtop_mem_t;
-typedef struct libgtop_swap libgtop_swap_t;
-typedef struct libgtop_proclist libgtop_proclist_t;
-
-typedef struct libgtop_proc_state libgtop_proc_state_t;
-typedef struct libgtop_proc_kernel libgtop_proc_kernel_t;
-typedef struct libgtop_proc_segment libgtop_proc_segment_t;
-typedef struct libgtop_proc_mem libgtop_proc_mem_t;
-typedef struct libgtop_proc_signal libgtop_proc_signal_t;
-
-typedef struct libgtop_proc_maps_header libgtop_proc_maps_header_t;
-typedef struct libgtop_proc_maps libgtop_proc_maps_t;
-
-typedef struct libgtop_netload libgtop_netload_t;
-
-struct libgtop_cpu
-{
-    unsigned long total;		/* Total CPU Time		*/
-    unsigned long user;			/* CPU Time in User Mode	*/
-    unsigned long nice;			/* CPU Time in User Mode (nice)	*/
-    unsigned long sys;			/* CPU Time in System Mode	*/
-    unsigned long idle;			/* CPU Time in the Idle Task	*/
-};
-
-struct libgtop_mem
-{
-    unsigned long totalram;		/* Total usable main memory size */
-    unsigned long freeram;		/* Available memory size */
-    unsigned long sharedram;		/* Amount of shared memory */
-    unsigned long bufferram;		/* Memory used by buffers */
-    unsigned long cachedram;
-};
-
-struct libgtop_swap
-{
-    unsigned long totalswap;		/* Total swap space size */
-    unsigned long freeswap;		/* swap space still available */
-};
-
-struct libgtop_proclist
-{
-    int count;
-    int nr_running, nr_tasks, last_pid;
-    unsigned pids [NR_TASKS];
-};
-
-struct libgtop_stat
-{
-    int ncpu;				/* Number of CPUs		*/
-    unsigned long frequency;		/* Tick frequency (HZ)		*/
-    libgtop_cpu_t cpu;			/* CPU statistics		*/
-    libgtop_cpu_t xcpu [NR_CPUS];	/* SMP per-CPU statistics	*/
-    double loadavg [3];			/* Load average			*/
-    unsigned long total_forks;		/* Total # of forks		*/
-    unsigned int context_swtch;		/* Total # of context switches	*/
-    unsigned long boot_time;		/* Boot time (seconds s. epoch)	*/
-    unsigned int pgpgin, pgpgout;	/* # of pages paged in/out	*/
-    unsigned int pswpin, pswpout;	/* # of swap pgs brought in/out	*/
-};
-
-struct libgtop_proc_state
-{
-    long state;
-    unsigned long flags;
-    char comm [16];
-    int uid, euid, suid, fsuid;
-    int gid, egid, sgid, fsgid;
-    int pid, pgrp, ppid;
-    int session;
-    unsigned int tty;
-    int tpgid;
-    long priority, counter, def_priority;
-    long utime, stime, cutime, cstime, start_time;
-    long per_cpu_utime [NR_CPUS], per_cpu_stime [NR_CPUS];
-    int has_cpu, processor, last_processor;
-
-    unsigned long context;
-    unsigned long start_code, end_code, start_data, end_data;
-    unsigned long start_brk, brk, start_stack, start_mmap;
-    unsigned long arg_start, arg_end, env_start, env_end;
-    unsigned long rss, rlim, total_vm, locked_vm;
-
-    unsigned long policy, rt_priority;
-    unsigned long it_real_value, it_prof_value, it_virt_value;
-    unsigned long it_real_incr, it_prof_incr, it_virt_incr;
-
-    unsigned long keip, kesp;
-    unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
-    unsigned long nswap, cnswap;
-
-    int ngroups, groups [LIBGTOP_MAX_GROUPS];
-};
-
-struct libgtop_proc_kernel
-{
-    unsigned long wchan;
-};
-
-struct libgtop_proc_segment
-{
-    unsigned long vsize, data, exec, stack, lib;
-};
-
-struct libgtop_proc_mem
-{
-    libgtop_proc_segment_t segment;
-    int size, resident, share, trs, lrs, drs, dt;
-    unsigned long rss, rlim;
-};
-
-struct libgtop_proc_signal
-{
-    unsigned long signal [LIBGTOP_NSIG];
-    unsigned long blocked [LIBGTOP_NSIG];
-    unsigned long ignore [LIBGTOP_NSIG];
-    unsigned long catch [LIBGTOP_NSIG];
-};
-
-struct libgtop_proc_maps_header
-{
-    unsigned long start, end, offset, perm;
-    off_t filename_offset;
-    ino_t inode;
-    dev_t device;
-} __attribute__ ((aligned (64)));
-
-struct libgtop_proc_maps
-{
-    libgtop_proc_maps_header_t header;
-    char filename [LIBGTOP_MAP_PATH_LEN];
-};
-
-struct libgtop_netload
-{
-    unsigned long rx_packets;		/* total packets received	*/
-    unsigned long tx_packets;		/* total packets transmitted	*/
-    unsigned long rx_bytes;		/* total bytes received 	*/
-    unsigned long tx_bytes;		/* total bytes transmitted	*/
-    unsigned long rx_errors;		/* bad packets received		*/
-    unsigned long tx_errors;		/* packet transmit problems	*/
-    unsigned long rx_dropped;		/* no space in linux buffers	*/
-    unsigned long tx_dropped;		/* no space available in linux	*/
-    unsigned long multicast;		/* multicast packets received	*/
-    unsigned long collisions;
-    
-    /* detailed rx_errors: */
-    unsigned long rx_length_errors;
-    unsigned long rx_over_errors;	/* receiver ring buff overflow	*/
-    unsigned long rx_crc_errors;	/* recved pkt with crc error	*/
-    unsigned long rx_frame_errors;	/* recv'd frame alignment error */
-    unsigned long rx_fifo_errors;	/* recv'r fifo overrun		*/
-    unsigned long rx_missed_errors;	/* receiver missed packet	*/
-    
-    /* detailed tx_errors */
-    unsigned long tx_aborted_errors;
-    unsigned long tx_carrier_errors;
-    unsigned long tx_fifo_errors;
-    unsigned long tx_heartbeat_errors;
-    unsigned long tx_window_errors;
-    
-    /* for cslip etc */
-    unsigned long rx_compressed;
-    unsigned long tx_compressed;
-};
-
-#endif

kernel/sysctl/libgtop_syms.c

@@ -1,30 +0,0 @@
-/*
- * linux/libgtop/libgtop_syms.c
- * Copyright (C) 1999 Martin Baulig
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-
-#include <linux/sched.h>
-
-#include <linux/mm.h>
-#include <linux/pagemap.h>
-#include <linux/swap.h>
-
-extern unsigned long total_forks;
-
-EXPORT_SYMBOL(task);
-EXPORT_SYMBOL(init_mm);
-EXPORT_SYMBOL(pidhash);
-EXPORT_SYMBOL(avenrun);
-EXPORT_SYMBOL(nr_running);
-EXPORT_SYMBOL(nr_tasks);
-EXPORT_SYMBOL(last_pid);
-EXPORT_SYMBOL(total_forks);
-EXPORT_SYMBOL(si_swapinfo);
-
-extern void scheduling_functions_start_here(void);
-extern void scheduling_functions_end_here(void);
-EXPORT_SYMBOL(scheduling_functions_start_here);
-EXPORT_SYMBOL(scheduling_functions_end_here);

kernel/sysctl/main.c

@@ -1,4 +0,0 @@
-/*
- * linux/libgtop/main.c
- * Copyright (C) 1999 Martin Baulig
- */

kernel/sysctl/patch-2.2.1

@@ -1,81 +0,0 @@
-diff -ru linux-2.2.1/Makefile hacker/Makefile
---- linux-2.2.1/Makefile	Sun Jan 31 22:45:42 1999
-+++ hacker/Makefile	Sun Mar 21 16:10:41 1999
-@@ -109,6 +109,7 @@
- DRIVERS		=drivers/block/block.a \
- 		 drivers/char/char.a \
- 	         drivers/misc/misc.a
-+EXTRAS		=
- LIBS		=$(TOPDIR)/lib/lib.a
- SUBDIRS		=kernel drivers mm fs net ipc lib
- 
-@@ -186,6 +187,11 @@
- DRIVERS := $(DRIVERS) drivers/net/irda/irda_drivers.a
- endif
- 
-+ifdef CONFIG_LIBGTOP
-+SUBDIRS := $(SUBDIRS) libgtop
-+EXTRAS  := $(EXTRAS) libgtop/kernel.o
-+endif
-+
- include arch/$(ARCH)/Makefile
- 
- .S.s:
-@@ -206,6 +212,7 @@
- 		$(FILESYSTEMS) \
- 		$(NETWORKS) \
- 		$(DRIVERS) \
-+		$(EXTRAS) \
- 		$(LIBS) \
- 		--end-group \
- 		-o vmlinux
-diff -ru linux-2.2.1/arch/i386/config.in hacker/arch/i386/config.in
---- linux-2.2.1/arch/i386/config.in	Sun Jan 31 22:25:25 1999
-+++ hacker/arch/i386/config.in	Sat Mar 20 18:26:18 1999
-@@ -84,6 +84,9 @@
- bool 'System V IPC' CONFIG_SYSVIPC
- bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
- bool 'Sysctl support' CONFIG_SYSCTL
-+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-+  tristate 'LibGTop support' CONFIG_LIBGTOP
-+fi
- tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
- tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
- tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
-diff -ru linux-2.2.1/include/linux/sysctl.h hacker/include/linux/sysctl.h
---- linux-2.2.1/include/linux/sysctl.h	Sun Jan 31 22:24:14 1999
-+++ hacker/include/linux/sysctl.h	Sat Mar 20 19:12:54 1999
-@@ -56,7 +56,8 @@
- 	CTL_PROC=4,		/* Process info */
- 	CTL_FS=5,		/* Filesystems */
- 	CTL_DEBUG=6,		/* Debugging */
--	CTL_DEV=7		/* Devices */
-+	CTL_DEV=7,		/* Devices */
-+	CTL_LIBGTOP=408		/* LibGTop */
- };
- 
- 
-diff -ru linux-2.2.1/kernel/sysctl.c hacker/kernel/sysctl.c
---- linux-2.2.1/kernel/sysctl.c	Sun Jan 31 22:24:43 1999
-+++ hacker/kernel/sysctl.c	Sat Mar 20 19:24:34 1999
-@@ -82,7 +82,9 @@
- static ctl_table fs_table[];
- static ctl_table debug_table[];
- static ctl_table dev_table[];
--
-+#ifdef CONFIG_LIBGTOP
-+extern ctl_table libgtop_table[];
-+#endif
- 
- /* /proc declarations: */
- 
-@@ -148,6 +150,9 @@
- 	{CTL_FS, "fs", NULL, 0, 0555, fs_table},
- 	{CTL_DEBUG, "debug", NULL, 0, 0555, debug_table},
-         {CTL_DEV, "dev", NULL, 0, 0555, dev_table},
-+#ifdef CONFIG_LIBGTOP
-+	{CTL_LIBGTOP, "libgtop", NULL, 0, 0555, libgtop_table},
-+#endif
- 	{0}
- };
- 

kernel/sysctl/patch-2.2.x

@@ -1,93 +0,0 @@
-diff -ru kernel-source-2.2.12/Makefile hacker-2.2.12/Makefile
---- kernel-source-2.2.12/Makefile	Thu Aug 26 02:29:45 1999
-+++ hacker-2.2.12/Makefile	Sat Dec 18 17:33:04 1999
-@@ -113,6 +113,7 @@
- DRIVERS		=drivers/block/block.a \
- 		 drivers/char/char.a \
- 	         drivers/misc/misc.a
-+EXTRAS		=
- LIBS		=$(TOPDIR)/lib/lib.a
- SUBDIRS		=kernel drivers mm fs net ipc lib
- 
-@@ -202,6 +203,11 @@
- DRIVERS := $(DRIVERS) drivers/net/irda/irda_drivers.a
- endif
- 
-+ifdef CONFIG_LIBGTOP
-+SUBDIRS := $(SUBDIRS) libgtop
-+EXTRAS  := $(EXTRAS) libgtop/kernel.o
-+endif
-+
- include arch/$(ARCH)/Makefile
- 
- .S.s:
-@@ -222,6 +228,7 @@
- 		$(FILESYSTEMS) \
- 		$(NETWORKS) \
- 		$(DRIVERS) \
-+		$(EXTRAS) \
- 		$(LIBS) \
- 		--end-group \
- 		-o vmlinux
-diff -ru kernel-source-2.2.12/arch/i386/config.in hacker-2.2.12/arch/i386/config.in
---- kernel-source-2.2.12/arch/i386/config.in	Thu Oct 14 00:57:46 1999
-+++ hacker-2.2.12/arch/i386/config.in	Sat Dec 18 17:33:04 1999
-@@ -88,6 +88,9 @@
- bool 'System V IPC' CONFIG_SYSVIPC
- bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
- bool 'Sysctl support' CONFIG_SYSCTL
-+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-+  tristate 'LibGTop support' CONFIG_LIBGTOP
-+fi
- tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
- tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
- tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
-diff -ru kernel-source-2.2.12/include/linux/autoconf.h hacker-2.2.12/include/linux/autoconf.h
---- kernel-source-2.2.12/include/linux/autoconf.h	Sat Dec  4 01:20:30 1999
-+++ hacker-2.2.12/include/linux/autoconf.h	Sat Dec 18 17:41:44 1999
-@@ -53,6 +53,8 @@
- #define CONFIG_SYSVIPC 1
- #define CONFIG_BSD_PROCESS_ACCT 1
- #define CONFIG_SYSCTL 1
-+#undef  CONFIG_LIBGTOP
-+#define CONFIG_LIBGTOP_MODULE 1
- #undef  CONFIG_BINFMT_AOUT
- #define CONFIG_BINFMT_AOUT_MODULE 1
- #define CONFIG_BINFMT_ELF 1
-diff -ru kernel-source-2.2.12/include/linux/sysctl.h hacker-2.2.12/include/linux/sysctl.h
---- kernel-source-2.2.12/include/linux/sysctl.h	Mon Aug  9 21:05:13 1999
-+++ hacker-2.2.12/include/linux/sysctl.h	Sat Dec 18 17:34:38 1999
-@@ -57,7 +57,8 @@
- 	CTL_FS=5,		/* Filesystems */
- 	CTL_DEBUG=6,		/* Debugging */
- 	CTL_DEV=7,		/* Devices */
--	CTL_BUS=8		/* Buses */
-+	CTL_BUS=8,		/* Buses */
-+	CTL_LIBGTOP=408		/* LibGTop */
- };
- 
- /* CTL_BUS names: */
-diff -ru kernel-source-2.2.12/kernel/sysctl.c hacker-2.2.12/kernel/sysctl.c
---- kernel-source-2.2.12/kernel/sysctl.c	Mon Aug  9 21:05:13 1999
-+++ hacker-2.2.12/kernel/sysctl.c	Sat Dec 18 17:33:04 1999
-@@ -83,7 +83,9 @@
- static ctl_table fs_table[];
- static ctl_table debug_table[];
- static ctl_table dev_table[];
--
-+#ifdef CONFIG_LIBGTOP
-+extern ctl_table libgtop_table[];
-+#endif
- 
- /* /proc declarations: */
- 
-@@ -149,6 +151,9 @@
- 	{CTL_FS, "fs", NULL, 0, 0555, fs_table},
- 	{CTL_DEBUG, "debug", NULL, 0, 0555, debug_table},
-         {CTL_DEV, "dev", NULL, 0, 0555, dev_table},
-+#ifdef CONFIG_LIBGTOP
-+	{CTL_LIBGTOP, "libgtop", NULL, 0, 0555, libgtop_table},
-+#endif
- 	{0}
- };
-