Released 2.9.91.

* NEWS: * configure.in: Released 2.9.91.
Updated Danish translation.
2005-02-06 18:46:05 +00:00 · 2005-02-06 15:47:24 +00:00 · 2005-02-06 01:14:53 +00:00 · 2005-02-04 08:52:01 +00:00 · 2005-02-02 21:30:27 +00:00 · 2005-01-30 01:52:45 +00:00
206 changed files with 11100 additions and 29557 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -39,3 +39,4 @@ INSTALL
 install-sh
 missing
 mkinstalldirs
+libgtopconfig.h
--- a/2
+++ b/2
@@ -1,3 +1,3 @@
 Martin Baulig (martin@home-of-linux.org)
 Drazen Kacar (dave@srce.hr)
-Beno<EFBFBD>t Dejean (tazforever@dlfp.org)
+Benoît Dejean (tazforever@dlfp.org)
--- a/291
+++ b/291
@@ -1,3 +1,294 @@
+2005-02-06  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* NEWS:
+	* configure.in: Released 2.9.91.
+
+2005-01-24  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* NEWS:
+	* configure.in: Released 2.9.90.
+
+2005-01-24  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* include/glibtop/procopenfiles.h:
+	* sysdeps/linux/procopenfiles.c:
+	* sysdeps/stub/procopenfiles.c: UTF-8-ified.
+
+2005-01-22  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* examples/openfiles.c: (show_open_files):
+	* include/glibtop/procopenfiles.h: added localsock { name } to
+	glibtop_open_files_entry. Should not break ABI.
+
+2005-01-12  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* configure.in: 2.9.5.
+
+2005-01-10  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* NEWS: Released 2.9.4.
+
+2005-01-10  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* configure.in:
+	* examples/.cvsignore:
+	* examples/Makefile.am:
+	* examples/openfiles.c: (show_open_files), (main):
+	* features.def:
+	* include/glibtop/Makefile.am:
+	* include/glibtop/command.h:
+	* include/glibtop/procopenfiles.h:
+	* include/glibtop/sysdeps.h:
+	* include/glibtop/union.h:
+	* structures.def:
+	* sysdeps/linux/Makefile.am:
+	* sysdeps/linux/procopenfiles.c: (glibtop_init_proc_open_files_s),
+	(get_socket_endpoint), (glibtop_get_proc_open_files_s):
+	* sysdeps/stub/Makefile.am:
+	* sysdeps/stub/procopenfiles.c: (glibtop_init_proc_open_files_s),
+	(glibtop_get_proc_open_files_s):
+	
+	New feature by nick@reloco.com.ar (Nicolás Lichtmaier).
+	
+	glibtop_get_open_files(pid) -> list of files by process.
+	TODO: Add documentation.
+
+2005-01-03  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* examples/pprint.c: (pprint_get_cpu):
+	* features.def:
+	* include/glibtop/cpu.h:
+	* sysdeps/linux/cpu.c: (glibtop_init_cpu_s), (glibtop_get_cpu_s):
+	Added I/O and IRQ wait time to glibtop_cpu. Closes #160443.
+	
+	* configure.in: Post-release bump 2.9.4
+
+2004-12-29  Benoît Dejean  <tazforever@dlfp.org>
+
+	* lib/read_data.c: (glibtop_read_data_l):
+	* lib/write.c: (glibtop_write_l): Fixed error messages.
+	Closes #162406.
+
+2004-12-23  Benoît Dejean  <tazforever@dlfp.org>
+
+	* include/glibtop/error.h:
+	* lib/parameter.c: (glibtop_set_parameter_l):
+	* lib/read_data.c: (glibtop_read_data_l):
+	* sysdeps/common/error.c: (print_server_name), (glibtop_error_vr),
+	(glibtop_error_io_vr), (glibtop_warn_vr), (glibtop_warn_io_vr),
+	(glibtop_error_r), (glibtop_warn_r), (glibtop_error_io_r),
+	(glibtop_warn_io_r), (glibtop_error), (glibtop_warn),
+	(glibtop_error_io), (glibtop_warn_io): Turned all macros to functions.
+	Marked everything as G_GNUC_PRINTF and fixed format bugs.
+
+	* sysdeps/common/fsusage.c: Marked some functions as G_GNUC_INTERNAL
+
+2004-12-20  Benoît Dejean  <tazforever@dlfp.org>
+
+	* NEWS:
+	* configure.in: Released 2.9.3.
+
+2004-12-10  Benoît Dejean  <tazforever@dlfp.org>
+
+	* lib/lib.pl: Fixed Argument passing between library and server.
+	Thanks everyone. Closes #139809.
+
+2004-12-06  Benoît Dejean  <tazforever@dlfp.org>
+
+	* acconfig.h:
+	* configure.in:
+	* debian/libgtop-dev.files.in:
+	* doc/Makefile.am:
+	* examples/Makefile.am:
+	* examples/third.c:
+	* include/glibtop/cpu.h:
+	* include/glibtop/fsusage.h:
+	* include/glibtop/loadavg.h:
+	* include/glibtop/mem.h:
+	* include/glibtop/mountlist.h:
+	* include/glibtop/msg_limits.h:
+	* include/glibtop/netlist.h:
+	* include/glibtop/netload.h:
+	* include/glibtop/ppp.h:
+	* include/glibtop/procargs.h:
+	* include/glibtop/prockernel.h:
+	* include/glibtop/proclist.h:
+	* include/glibtop/procmap.h:
+	* include/glibtop/procmem.h:
+	* include/glibtop/procsegment.h:
+	* include/glibtop/procsignal.h:
+	* include/glibtop/procstate.h:
+	* include/glibtop/proctime.h:
+	* include/glibtop/procuid.h:
+	* include/glibtop/sem_limits.h:
+	* include/glibtop/shm_limits.h:
+	* include/glibtop/swap.h:
+	* include/glibtop/sysdeps.h:
+	* include/glibtop/uptime.h:
+	* po/POTFILES.in:
+	* sysdeps/Makefile.am:
+	* sysdeps/names/.cvsignore:
+	* sysdeps/names/Makefile.am:
+	* sysdeps/names/cpu.c:
+	* sysdeps/names/fsusage.c:
+	* sysdeps/names/loadavg.c:
+	* sysdeps/names/mem.c:
+	* sysdeps/names/mountlist.c:
+	* sysdeps/names/msg_limits.c:
+	* sysdeps/names/netlist.c:
+	* sysdeps/names/netload.c:
+	* sysdeps/names/ppp.c:
+	* sysdeps/names/procargs.c:
+	* sysdeps/names/prockernel.c:
+	* sysdeps/names/proclist.c:
+	* sysdeps/names/procmap.c:
+	* sysdeps/names/procmem.c:
+	* sysdeps/names/procsegment.c:
+	* sysdeps/names/procsignal.c:
+	* sysdeps/names/procstate.c:
+	* sysdeps/names/proctime.c:
+	* sysdeps/names/procuid.c:
+	* sysdeps/names/sem_limits.c:
+	* sysdeps/names/shm_limits.c:
+	* sysdeps/names/swap.c:
+	* sysdeps/names/sysdeps.c:
+	* sysdeps/names/uptime.c: Removed libgtop_names :)
+
+2004-11-30  Benoît Dejean  <tazforever@dlfp.org>
+
+	* configure.in: post-release bump to 2.9.1.
+
+2004-11-30  Benoît Dejean  <tazforever@dlfp.org>
+
+	* NEWS:
+	* configure.in: released 2.9.0
+
+2004-11-22  Benoît Dejean  <tazforever@dlfp.org>
+
+	* AUTHORS:
+	* MAINTAINERS: UTF-8-ified.
+	
+	* acconfig.h:
+	* acinclude.m4:
+	* configure.in:
+	* kernel/ChangeLog:
+	* kernel/sysctl/.cvsignore:
+	* kernel/sysctl/Makefile:
+	* kernel/sysctl/libgtop.c:
+	* kernel/sysctl/libgtop.h:
+	* kernel/sysctl/libgtop_syms.c:
+	* kernel/sysctl/main.c:
+	* kernel/sysctl/patch-2.2.1:
+	* kernel/sysctl/patch-2.2.x:
+	* kernel/table.h:
+	* kernel/table20/Makefile:
+	* kernel/table20/README:
+	* kernel/table20/entry-i386.S:
+	* kernel/table20/kernel.patch:
+	* kernel/table20/main.c:
+	* kernel/table20/unistd-i386.h:
+	* kernel/table20/version.h:
+	* kernel/table21/.cvsignore:
+	* kernel/table21/Makefile:
+	* kernel/table21/README:
+	* kernel/table21/entry-i386.S:
+	* kernel/table21/main.c:
+	* kernel/table21/module.c:
+	* kernel/table21/unistd-i386.h:
+	* kernel/table21/version.h:
+	* kernel/version.h:
+	* libgtop-sysdeps.m4:
+	* sysdeps/Makefile.am:
+	* sysdeps/kernel/.cvsignore:
+	* sysdeps/kernel/ChangeLog:
+	* sysdeps/kernel/Makefile.am:
+	* sysdeps/kernel/close.c:
+	* sysdeps/kernel/cpu.c:
+	* sysdeps/kernel/glibtop_private.h:
+	* sysdeps/kernel/glibtop_server.h:
+	* sysdeps/kernel/kernel.h:
+	* sysdeps/kernel/kernel.s:
+	* sysdeps/kernel/loadavg.c:
+	* sysdeps/kernel/mem.c:
+	* sysdeps/kernel/msg_limits.c:
+	* sysdeps/kernel/netload.c:
+	* sysdeps/kernel/open.c:
+	* sysdeps/kernel/ppp.c:
+	* sysdeps/kernel/procargs.c:
+	* sysdeps/kernel/procdata.c:
+	* sysdeps/kernel/prockernel.c:
+	* sysdeps/kernel/proclist.c:
+	* sysdeps/kernel/procmap.c:
+	* sysdeps/kernel/procmem.c:
+	* sysdeps/kernel/procsegment.c:
+	* sysdeps/kernel/procsignal.c:
+	* sysdeps/kernel/procstate.c:
+	* sysdeps/kernel/proctime.c:
+	* sysdeps/kernel/procuid.c:
+	* sysdeps/kernel/sem_limits.c:
+	* sysdeps/kernel/shm_limits.c:
+	* sysdeps/kernel/siglist.c:
+	* sysdeps/kernel/swap.c:
+	* sysdeps/kernel/sysinfo.c:
+	* sysdeps/kernel/uptime.c: Removed kernel patch and implementation.
+
+2004-11-18  Benoît Dejean  <tazforever@dlfp.org>
+
+	* Makefile.am: Forgot to ship libgtopconfig.h.
+
+2004-11-18  Benoît Dejean  <tazforever@dlfp.org>
+	
+	* LIBGTOP-VERSION:
+	* libgtop-mirror.sh: Removed unused files.
+
+	* libgtopconfig.h.in: Added.
+	* Makefile.am:
+	* configure.in:
+	* glibtop.h: Added libgtopconfig.h and LIBGTOP_VERSION_CHECK(X, Y, Z).
+	This can be used in build tests.
+
+2004-11-15  Benoît Dejean  <tazforever@dlfp.org>
+
+	* copyright.txt: Added myself.
+
+2004-11-13  Benoît Dejean  <tazforever@dlfp.org>
+
+	* include/glibtop/procargs.h:
+	* sysdeps/common/procargs.c: (glibtop_get_proc_argv_l): Removed SUID 
+	wrappers because glibtop_proc_argv_l is a client-side function that wraps
+	glibtop_get_proc_args.
+
+2004-11-13  Benoît Dejean  <tazforever@dlfp.org>
+
+	* structures.def: Removed old functions. OMG, everything is really broken
+	here :/
+
+2004-11-13  Benoît Dejean  <tazforever@dlfp.org>
+
+	* configure.in: Bumped to 2.9.0
+	
+	* configure.in:
+	* examples/.cvsignore:
+	* examples/Makefile.am:
+	* examples/netlist.c: (main):
+	* features.def:
+	* include/glibtop/Makefile.am:
+	* include/glibtop/command.h:
+	* include/glibtop/netlist.h:
+	* include/glibtop/sysdeps.h:
+	* include/glibtop/union.h:
+	* include/glibtop/version.h:
+	* src/daemon/version.c:
+	* sysdeps/linux/Makefile.am:
+	* sysdeps/linux/netlist.c: (glibtop_init_netlist_s),
+	(glibtop_get_netlist_s):
+	* sysdeps/names/Makefile.am:
+	* sysdeps/names/netlist.c:
+	* sysdeps/solaris/Makefile.am:
+	* sysdeps/solaris/netlist.c: (glibtop_init_netlist_s),
+	(glibtop_get_netlist_s): Added new function glibtop_get_netlist().
+	Implemented for linux and solaris. Doc needed.
+
 2004-10-11  Benoît Dejean  <tazforever@dlfp.org>

 	* NEWS: Released 2.8.1.
--- a/28
+++ b/28
@@ -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
--- a/2
+++ b/2
@@ -1,3 +1,3 @@
 Email: martin@home-of-linux.org
 Email: dave@srce.hr
-Beno<EFBFBD>t Dejean (tazforever@dlfp.org)
+Benoît Dejean (tazforever@dlfp.org)
--- a/Makefile.am
+++ b/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)
--- a/30
+++ b/30
@@ -1,3 +1,33 @@
+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.
--- a/acconfig.h
+++ b/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
--- a/acinclude.m4
+++ b/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*)
--- a/configure.in
+++ b/configure.in
@@ -7,13 +7,13 @@ AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM

 LIBGTOP_MAJOR_VERSION=2
-LIBGTOP_MINOR_VERSION=8
-LIBGTOP_MICRO_VERSION=1
+LIBGTOP_MINOR_VERSION=9
+LIBGTOP_MICRO_VERSION=91
 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=4
+LIBGTOP_CURRENT=5

 dnl  increment any time the source changes; set to
 dnl  0 if you increment CURRENT
@@ -112,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'
@@ -123,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 pprint_static procargs_static df_static"
+  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
@@ -255,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 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 nl nn no or pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id it ja ko lt lv mi mk ml mn ms nb ne nl nn no or pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"

 GETTEXT_PACKAGE=libgtop-2.0
 AC_SUBST(GETTEXT_PACKAGE)
@@ -338,12 +337,8 @@ 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"

@@ -361,7 +356,7 @@ if test "$GCC" = "yes" ; then
 	$CFLAGS"
 fi

-INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $GLIB_CFLAGS $CFLAGS $X_CFLAGS "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'
+INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -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)

@@ -369,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)

@@ -393,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
@@ -410,4 +401,5 @@ lib/Makefile
 examples/Makefile
 doc/Makefile
 libgtop-2.0.pc
+libgtopconfig.h
 ])
--- a/copyright.txt
+++ b/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,
--- a/debian/libgtop-dev.files.in
+++ b/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
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,11 @@
+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.
--- a/doc/Makefile.am
+++ b/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' \
--- a/doc/reference.texi
+++ b/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
@@ -1051,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
@@ -1533,6 +1533,8 @@ struct _glibtop_fsusage
        files,
        ffree;
    guint32   block_size;
+    guint64 read,
+        write;
@};
@end cartouche
@end example
@@ -1550,10 +1552,12 @@ Total file nodes.
 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
--- a/examples/.cvsignore
+++ b/examples/.cvsignore
@@ -20,4 +20,7 @@ procargs
 procargs_static
 df
 df_static
-
+netlist
+netlist_static
+openfiles
+openfiles_static
--- a/examples/ChangeLog
+++ b/examples/ChangeLog
@@ -1,3 +1,21 @@
+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()
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -6,16 +6,17 @@ INCLUDES		= @INCLUDES@

 DEFS			= @DEFS@

-noinst_PROGRAMS	= 	first second pprint procargs df \
+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 pprint_static procargs_static \
-			  df_static
+			  df_static netlist_static

 first_SOURCES		= first.c
 first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
@@ -52,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
@@ -109,3 +100,20 @@ 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
+
+
--- a/sysdeps/kernel/ppp.c
+++ b/sysdeps/kernel/ppp.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>, October 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,24 +18,29 @@
   Boston, MA 02111-1307, USA.
 */

+#include <stdio.h>
+
 #include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/ppp.h>
+#include <glibtop/netlist.h>

-static const unsigned long _glibtop_sysdeps_ppp = 0;

-/* Init function. */
-
-void
-glibtop_init_ppp_s (glibtop *server)
+int main(int argc, char *argv [])
 {
-	server->sysdeps.ppp = _glibtop_sysdeps_ppp;
-}
+	glibtop_netlist buf;
+	char **devices;
+	guint32 i;

-/* Provides PPP/ISDN information. */
+	glibtop_init();

-void
-glibtop_get_ppp_s (glibtop *server, glibtop_ppp *buf, unsigned short device)
-{
-	memset (buf, 0, sizeof (glibtop_ppp));
+	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;
 }
--- a/examples/netload.c
+++ b/examples/netload.c
@@ -40,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 [])
 {
@@ -47,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;
@@ -76,7 +96,7 @@ 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]);

@@ -86,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);
--- a/examples/openfiles.c
+++ b/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;
+}
+
--- a/examples/pprint.c
+++ b/examples/pprint.c
@@ -9,7 +9,7 @@

 #define buf_offsetof(MEMBER) ((ptrdiff_t)&(buf.MEMBER) - (ptrdiff_t)&buf)

-#define HEADER_PPRINT(FUNC) printf(#FUNC "\tsizeof = %lu B\n", \
+#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", \
@@ -24,7 +24,7 @@ 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')
+#define FOOTER_PPRINT() putchar('\n');



@@ -41,12 +41,18 @@ static void pprint_get_cpu()
  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();
 }
@@ -60,6 +66,7 @@ static void pprint_get_fsusage(const char *mountpoint)
  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");
@@ -121,6 +128,7 @@ static void pprint_get_mountlist(gboolean allfs)
  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");
@@ -175,10 +183,33 @@ static void pprint_get_netload(const char *iface)
  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()
 {
@@ -214,6 +245,8 @@ static void pprint_get_uptime()



+
+
 int main()
 {
  glibtop_init();
@@ -231,11 +264,13 @@ int main()

  pprint_get_msg_limits();

-/*   pprint_get_netload("lo"); */
-
-
  pprint_get_swap();

+  pprint_get_netlist();
+
+  pprint_get_netload("eth0");
+  pprint_get_netload("ppp0");
+  pprint_get_netload("<unknown>");
 /* pprint_get_sysinfo(); */

  pprint_get_uptime();
--- a/examples/procmap.c
+++ b/examples/procmap.c
@@ -83,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);
--- a/examples/third.c
+++ b/examples/third.c
@@ -1,58 +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 <libintl.h>
-#include <stdio.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);
-}
--- a/features.def
+++ b/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)
+
--- a/glibtop.h
+++ b/glibtop.h
@@ -26,6 +26,27 @@

 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>

--- a/include/glibtop/Makefile.am
+++ b/include/glibtop/Makefile.am
@@ -7,4 +7,5 @@ glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  procsegment.h read.h sysdeps.h global.h \
 			  procsignal.h read_data.h union.h types.h gnuserv.h \
 			  parameter.h mountlist.h fsusage.h procmap.h signal.h \
-			  inodedb.h sysinfo.h ppp.h procargs.h netload.h
+			  inodedb.h sysinfo.h ppp.h procargs.h netload.h \
+			  netlist.h procopenfiles.h
--- a/include/glibtop/command.h
+++ b/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

--- a/include/glibtop/cpu.h
+++ b/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

--- a/include/glibtop/error.h
+++ b/include/glibtop/error.h
@@ -28,42 +28,20 @@

 G_BEGIN_DECLS

-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_vr (glibtop *server, const char *format, va_list args);
+void glibtop_warn_vr (glibtop *server, const char *format, va_list args);
+void glibtop_error_io_vr (glibtop *server, const char *format, int, va_list args);
+void glibtop_warn_io_vr (glibtop *server, const char *format, int, va_list args);

-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);
+void glibtop_error_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
+void glibtop_warn_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
+void glibtop_error_io_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
+void glibtop_warn_io_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);

-void G_GNUC_UNUSED glibtop_error_r (glibtop *server, char *format, ...);
-void G_GNUC_UNUSED glibtop_warn_r (glibtop *server, char *format, ...);
-void G_GNUC_UNUSED glibtop_error_io_r (glibtop *server, char *format, ...);
-void G_GNUC_UNUSED glibtop_warn_io_r (glibtop *server, char *format, ...);
-
-
-#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)
-
-#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-
-#define glibtop_error(p1, ...)	glibtop_error_r(glibtop_global_server , p1 , __VA_ARGS__)
-#define glibtop_warn(p1, ...)	glibtop_warn_r(glibtop_global_server , p1 , __VA_ARGS__)
-
-#define glibtop_error_io(p1, ...)	glibtop_error_io_r(glibtop_global_server , p1 , __VA_ARGS__)
-#define glibtop_warn_io(p1, ...)	glibtop_warn_io_r(glibtop_global_server , p1 , __VA_ARGS__)
-
-#else /* no __GNUC__, no C99*/
-
-void glibtop_error (char *format, ...);
-void glibtop_warn (char *format, ...);
-void glibtop_error_io (char *format, ...);
-void glibtop_warn_io (char *format, ...);
-
-#endif /* no __GNUC__ */
+void glibtop_error (const char *format, ...) G_GNUC_PRINTF(1, 2);
+void glibtop_warn (const char *format, ...) G_GNUC_PRINTF(1, 2);
+void glibtop_error_io (const char *format, ...) G_GNUC_PRINTF(1, 2);
+void glibtop_warn_io (const char *format, ...) G_GNUC_PRINTF(1, 2);

 G_END_DECLS

--- a/include/glibtop/fsusage.h
+++ b/include/glibtop/fsusage.h
@@ -60,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

--- a/include/glibtop/loadavg.h
+++ b/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

--- a/include/glibtop/mem.h
+++ b/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

--- a/include/glibtop/mountlist.h
+++ b/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

--- a/include/glibtop/msg_limits.h
+++ b/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

--- a/include/glibtop/netlist.h
+++ b/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
--- a/include/glibtop/netload.h
+++ b/include/glibtop/netload.h
@@ -125,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

--- a/include/glibtop/ppp.h
+++ b/include/glibtop/ppp.h
@@ -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

--- a/include/glibtop/procargs.h
+++ b/include/glibtop/procargs.h
@@ -85,38 +85,6 @@ glibtop_get_proc_argv_l (glibtop *server, glibtop_proc_args *buf,
 #define glibtop_get_proc_argv(proc_args,pid,max_len) glibtop_get_proc_argv_l(glibtop_global_server, proc_args, pid, max_len)


-#if GLIBTOP_SUID_PROC_ARGS
-
-# define glibtop_get_proc_argv_r		glibtop_get_proc_args_p
-# define glibtop_init_proc_argv_p		glibtop_init_proc_args_p
-
-  char **
-  glibtop_get_proc_argv_p (glibtop *server, glibtop_proc_args *buf,
-			   pid_t pid, unsigned max_len);
-
-
-#else /* !GLIBTOP_SUID_PROC_ARGS */
-
-# define glibtop_get_proc_argv_r		glibtop_get_proc_args_s
-# define glibtop_init_proc_argv_s		glibtop_init_proc_args_s
-
-  char **
-  glibtop_get_proc_argv_s (glibtop *server, glibtop_proc_args *buf,
-			   pid_t pid, unsigned max_len);
-#endif /* GLIBTOP_SUID_PROC_ARGS */
-
-
-
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_proc_args [];
-extern const unsigned glibtop_types_proc_args [];
-extern const char *glibtop_labels_proc_args [];
-extern const char *glibtop_descriptions_proc_args [];
-
-#endif

 G_END_DECLS

--- a/include/glibtop/prockernel.h
+++ b/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

--- a/include/glibtop/proclist.h
+++ b/include/glibtop/proclist.h
@@ -88,16 +88,6 @@ glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
 			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

--- a/include/glibtop/procmap.h
+++ b/include/glibtop/procmap.h
@@ -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

--- a/include/glibtop/procmem.h
+++ b/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

--- a/include/glibtop/procopenfiles.h
+++ b/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
--- a/include/glibtop/procsegment.h
+++ b/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

--- a/include/glibtop/procsignal.h
+++ b/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

--- a/include/glibtop/procstate.h
+++ b/include/glibtop/procstate.h
@@ -92,16 +92,6 @@ 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

--- a/include/glibtop/proctime.h
+++ b/include/glibtop/proctime.h
@@ -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

--- a/include/glibtop/procuid.h
+++ b/include/glibtop/procuid.h
@@ -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

--- a/include/glibtop/sem_limits.h
+++ b/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

--- a/include/glibtop/shm_limits.h
+++ b/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

--- a/include/glibtop/swap.h
+++ b/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

--- a/include/glibtop/sysdeps.h
+++ b/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

--- a/include/glibtop/union.h
+++ b/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
--- a/include/glibtop/uptime.h
+++ b/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

--- a/include/glibtop/version.h
+++ b/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)."

--- a/kernel/ChangeLog
+++ b/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.
--- a/kernel/sysctl/.cvsignore
+++ b/kernel/sysctl/.cvsignore
@@ -1 +0,0 @@
-*.flags
--- a/kernel/sysctl/Makefile
+++ b/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
--- a/kernel/sysctl/libgtop.c
+++ b/kernel/sysctl/libgtop.c
--- a/kernel/sysctl/libgtop.h
+++ b/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
--- a/kernel/sysctl/libgtop_syms.c
+++ b/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);
--- a/kernel/sysctl/main.c
+++ b/kernel/sysctl/main.c
@@ -1,4 +0,0 @@
-/*
- * linux/libgtop/main.c
- * Copyright (C) 1999 Martin Baulig
- */
--- a/kernel/sysctl/patch-2.2.1
+++ b/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}
- };
- 
--- a/kernel/sysctl/patch-2.2.x
+++ b/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}
- };
- 
--- a/kernel/table.h
+++ b/kernel/table.h
@@ -1,188 +0,0 @@
-#ifndef _LINUX_TABLE_H
-#define _LINUX_TABLE_H
-
-#ifdef _KERNEL
-#include <linux/types.h>
-#else
-#define NR_TASKS		512
-#endif
-
-#define TABLE_KERN_PROC_ALL		0	/* all processes */
-#define TABLE_KERN_PROC_PID		1
-#define TABLE_KERN_PROC_PGRP		2
-#define TABLE_KERN_PROC_SESSION		3
-#define TABLE_KERN_PROC_TTY		4
-#define TABLE_KERN_PROC_UID		5
-#define TABLE_KERN_PROC_RUID		6
-
-#define TABLE_KERN_PROC_MASK		15
-
-#define TABLE_EXCLUDE_IDLE		0x1000
-#define TABLE_EXCLUDE_SYSTEM		0x2000
-#define TABLE_EXCLUDE_NOTTY		0x4000
-
-#define TABLE_VERSION		0
-#define TABLE_CPU		1
-#define TABLE_MEM		2
-#define TABLE_SWAP		3
-#define TABLE_LOADAVG		4
-#define TABLE_UPTIME		5
-#define TABLE_PROCLIST		6
-#define TABLE_PROC_UID		7
-#define TABLE_PROC_MEM		8
-#define TABLE_PROC_SEGMENT	9
-#define TABLE_PROC_TIME		10
-#define TABLE_PROC_STATE	11
-#define TABLE_PROC_SIGNAL	12
-#define TABLE_PROC_KERNEL	13
-
-/* CPU Usage (in jiffies = 1/100th seconds) */
-
-struct table_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	*/
-	unsigned long frequency;	/* Tick frequency		*/
-};
-
-/* Memory Usage (in bytes) */
-
-struct table_mem
-{
-	unsigned long total;		/* Total physical memory	*/
-	unsigned long used;		/* Used memory size		*/
-	unsigned long free;		/* Free memory size		*/
-	unsigned long shared;		/* Shared memory size		*/
-	unsigned long buffer;		/* Size of buffers		*/
-	unsigned long cached;		/* Size of cached memory       	*/
-};
-
-/* Swap Space (in bytes) */
-
-struct table_swap
-{
-	unsigned long total;		/* Total swap space		*/
-	unsigned long used;		/* Used swap space		*/
-	unsigned long free;		/* Free swap space		*/
-	unsigned long pagein;		/* Total # of pages swapped in	*/
-	unsigned long pageout;		/* Total # of pages swapped out	*/
-};
-
-/* Load average */
-
-struct table_loadavg
-{
-	double loadavg [3];
-	unsigned nr_running;
-	unsigned nr_tasks;
-	unsigned last_pid;
-};
-
-/* Uptime */
-
-struct table_uptime
-{
-	unsigned long uptime;
-	unsigned long idle;
-};
-
-/* Process list. */
-
-struct proclist_args
-{
-	int which, arg;
-};
-
-struct table_proclist
-{
-	int nr_running, nr_tasks, last_pid;
-	unsigned pids [NR_TASKS];
-};
-
-/* Information about processes. */
-
-struct table_proc_state
-{
-	long state;
-	unsigned long flags;
-	char comm[16];
-	int uid, gid;
-};
-
-struct table_proc_uid
-{
-	int uid, euid, suid, fsuid;
-	int gid, egid, sgid, fsgid;
-	int pid, pgrp, ppid;
-	int session;
-	unsigned int tty;
-	int tpgid;
-	long priority;
-	long counter;
-	long def_priority;
-};
-
-struct table_proc_mem
-{
-	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;
-};
-
-struct table_proc_segment
-{
-	unsigned long vsize;
-	unsigned long size, resident, shared;
-	unsigned long trs, lrs, drs, srs, dt;
-};
-
-struct table_proc_time
-{
-	long utime, stime, cutime, cstime, start_time;
-	unsigned long timeout, 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;
-};
-
-struct table_proc_signal
-{
-	unsigned long long signal,
-		blocked,	/* bitmap of masked signals */
-		ignored,	/* mask of ignored signals */
-		caught;		/* mask of caught signals */
-};
-
-struct table_proc_kernel
-{
-	unsigned long keip, kesp, wchan;
-	unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
-	unsigned long nswap, cnswap;
-};
-
-/* Union */
-
-union table
-{
-	struct table_cpu cpu;
-	struct table_mem mem;
-	struct table_swap swap;
-	struct table_loadavg loadavg;
-	struct table_uptime uptime;
-	struct table_proclist proclist;
-	struct table_proc_uid proc_uid;
-	struct table_proc_mem proc_mem;
-	struct table_proc_segment proc_segment;
-	struct table_proc_time proc_time;
-	struct table_proc_state proc_state;
-	struct table_proc_signal proc_signal;
-	struct table_proc_kernel proc_kernel;
-};
-
-#endif /* _LINUX_IPC_H */
-
-
--- a/kernel/table20/Makefile
+++ b/kernel/table20/Makefile
@@ -1,13 +0,0 @@
-#
-# Makefile for the linux system information tables.
-#
-# 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 := table.o
-O_OBJS   := main.o
-
-include $(TOPDIR)/Rules.make
--- a/kernel/table20/README
+++ b/kernel/table20/README
@@ -1,21 +0,0 @@
-This is a new system call `table ()' for the Linux table. It is faster
-than reading from /proc and can be used to fetch all information required
-for libgtop until whe have some other function (extended sysctl, ...) in
-standard kernels.
-
-I didn't want to change sysctl or some other function myself cause this may
-cause other applications relying upon those function to fail. This is
-something for the ``real'' kernel gurus ...
-
-To use this new system call for libgtop, do the following:
-
-* Copy this directory to /usr/src/linux/table
-* Make /usr/src/linux/include/linux/table.h symlink to /usr/src/linux/table/table.h
-* Apply the patch `kernel.patch' to the kernel, compile, install and reboot
-* Recompile libgtop (remove `config.cache' and run the `autogen.sh' again).
-
-If you want to change and/or add something - feel free to do so !
-
-Have fun,
-
-Martin
--- a/kernel/table20/entry-i386.S
+++ b/kernel/table20/entry-i386.S
@@ -1,706 +0,0 @@
-/*
- *  linux/arch/i386/entry.S
- *
- *  Copyright (C) 1991, 1992  Linus Torvalds
- */
-
-/*
- * entry.S contains the system-call and fault low-level handling routines.
- * This also contains the timer-interrupt handler, as well as all interrupts
- * and faults that can result in a task-switch.
- *
- * NOTE: This code handles signal-recognition, which happens every time
- * after a timer-interrupt and after each system call.
- *
- * I changed all the .align's to 4 (16 byte alignment), as that's faster
- * on a 486.
- *
- * Stack layout in 'ret_from_system_call':
- * 	ptrace needs to have all regs on the stack.
- *	if the order here is changed, it needs to be 
- *	updated in fork.c:copy_process, signal.c:do_signal,
- *	ptrace.c and ptrace.h
- *
- *	 0(%esp) - %ebx
- *	 4(%esp) - %ecx
- *	 8(%esp) - %edx
- *       C(%esp) - %esi
- *	10(%esp) - %edi
- *	14(%esp) - %ebp
- *	18(%esp) - %eax
- *	1C(%esp) - %ds
- *	20(%esp) - %es
- *      24(%esp) - %fs
- *	28(%esp) - %gs
- *	2C(%esp) - orig_eax
- *	30(%esp) - %eip
- *	34(%esp) - %cs
- *	38(%esp) - %eflags
- *	3C(%esp) - %oldesp
- *	40(%esp) - %oldss
- */
-
-#include <linux/sys.h>
-#include <linux/linkage.h>
-#include <asm/segment.h>
-#define ASSEMBLY
-#include <asm/smp.h>
-
-EBX		= 0x00
-ECX		= 0x04
-EDX		= 0x08
-ESI		= 0x0C
-EDI		= 0x10
-EBP		= 0x14
-EAX		= 0x18
-DS		= 0x1C
-ES		= 0x20
-FS		= 0x24
-GS		= 0x28
-ORIG_EAX	= 0x2C
-EIP		= 0x30
-CS		= 0x34
-EFLAGS		= 0x38
-OLDESP		= 0x3C
-OLDSS		= 0x40
-
-CF_MASK		= 0x00000001
-IF_MASK		= 0x00000200
-NT_MASK		= 0x00004000
-VM_MASK		= 0x00020000
-
-/*
- * these are offsets into the task-struct.
- */
-state		=  0
-counter		=  4
-priority	=  8
-signal		= 12
-blocked		= 16
-flags		= 20
-dbgreg6		= 52
-dbgreg7		= 56
-exec_domain	= 60
-
-ENOSYS = 38
-
-#define SAVE_ALL \
-	cld; \
-	push %gs; \
-	push %fs; \
-	push %es; \
-	push %ds; \
-	pushl %eax; \
-	pushl %ebp; \
-	pushl %edi; \
-	pushl %esi; \
-	pushl %edx; \
-	pushl %ecx; \
-	pushl %ebx; \
-	movl $(KERNEL_DS),%edx; \
-	mov %dx,%ds; \
-	mov %dx,%es; \
-	movl $(USER_DS),%edx; \
-	mov %dx,%fs;
-
-#ifdef	__SMP__
-
-#define GET_PROCESSOR_ID \
-	movl SYMBOL_NAME(apic_reg), %edx; \
-	movl 32(%edx), %eax;\
-	movl %eax,SYMBOL_NAME(apic_retval); \
-	shrl $24,%eax; \
-	andb $0x0F,%al;
-
-/*
- *	Get the processor ID multiplied by 4
- */
-
-#define GET_PROCESSOR_OFFSET(x) \
-	movl SYMBOL_NAME(apic_reg), x ; \
-	movl 32( x ), x ; \
-	shrl $22, x ; \
-	andl $0x3C, x ;
-
-/* macro LEAVE_KERNEL decrements kernel_counter and resets kernel_flag and
-   saves processor variables if zero */
-#define	LEAVE_KERNEL \
-	pushfl; \
-	cli; \
-	GET_PROCESSOR_ID \
-	btrl $ SMP_FROM_SYSCALL,SYMBOL_NAME(smp_proc_in_lock)(,%eax,4); \
-	decl SYMBOL_NAME(syscall_count); \
-	decl SYMBOL_NAME(kernel_counter); \
-	jnz 1f;	\
-	movb SYMBOL_NAME(saved_active_kernel_processor), %al; \
-	movb %al, SYMBOL_NAME(active_kernel_processor); \
-	cmpb $(NO_PROC_ID), %al; \
-	jnz 1f; \
-	lock; \
-	btrl $0, SYMBOL_NAME(kernel_flag); \
-1:	popfl;
-
-/* macro ENTER_KERNEL waits for entering the kernel, increments
-   kernel_counter, and reloads the processor variables if necessary
-   uses : %eax, %edx (pushed and popped) 
-
-   Note: We go to great pains to minimise the number of locked operations.
-   We want to spin without locking, and lock when we attempt an update.
-   The pentium has a MESI cache so the spin without lock will exit when
-   another CPU write invalidates our cache, and the lock is avoided when
-   possible so we don't play ping-pong games with the cache line.
-
-*/
-
-#ifndef __SMP_PROF__
-
-#define SMP_PROF_A
-#define SMP_PROF_B 
-
-#else
-
-#define SMP_PROF_A movl $0,SYMBOL_NAME(smp_spins_syscall_cur)(,%eax,4);
-#define SMP_PROF_B incl SYMBOL_NAME(smp_spins_syscall)(,%eax,4); \
-        incl SYMBOL_NAME(smp_spins_syscall_cur)(,%eax,4);
-#endif
-
-#define	ENTER_KERNEL \
-	pushl %eax; \
-	pushl %ebx; \
-	pushl %ecx; \
-	pushl %edx; \
-	pushfl; \
-	cli; \
-	movl $6000, %ebx; \
-	movl SYMBOL_NAME(smp_loops_per_tick), %ecx; \
-	GET_PROCESSOR_ID \
-	btsl $ SMP_FROM_SYSCALL,SYMBOL_NAME(smp_proc_in_lock)(,%eax,4); \
-	SMP_PROF_A \
-1:	lock; \
-	btsl $0, SYMBOL_NAME(kernel_flag); \
-	jnc 3f; \
-	cmpb SYMBOL_NAME(active_kernel_processor), %al; \
-	je 4f; \
-2:	SMP_PROF_B \
-	btl %eax, SYMBOL_NAME(smp_invalidate_needed); \
-	jnc 5f; \
-	lock; \
-	btrl %eax, SYMBOL_NAME(smp_invalidate_needed); \
-	jnc 5f; \
-	movl %cr3,%edx; \
-	movl %edx,%cr3; \
-5:	sti; \
-	decl %ecx; \
-	cli; \
-	jne 7f; \
-	decl %ebx; \
-	jne 6f; \
-	call SYMBOL_NAME(non_irq_deadlock_detected); \
-6:	movl SYMBOL_NAME(smp_loops_per_tick), %ecx; \
-	cmpb SYMBOL_NAME(boot_cpu_id), %al; \
-	jne 7f; \
-	incl SYMBOL_NAME(jiffies);  \
-7:	btl $0, SYMBOL_NAME(kernel_flag); \
-	jc 2b; \
-	jmp 1b; \
-3:	movb %al, SYMBOL_NAME(active_kernel_processor); \
-4:	incl SYMBOL_NAME(kernel_counter); \
-	incl SYMBOL_NAME(syscall_count); \
-	popfl; \
-	popl %edx; \
-	popl %ecx; \
-	popl %ebx; \
-	popl %eax;
-
-
-#define RESTORE_ALL \
-	cmpw $(KERNEL_CS),CS(%esp); \
-	je 1f;   \
-	GET_PROCESSOR_OFFSET(%edx) \
-	movl SYMBOL_NAME(current_set)(,%edx), %eax ; ; \
-	movl dbgreg7(%eax),%ebx; \
-	movl %ebx,%db7;	\
-1:	LEAVE_KERNEL \
-	popl %ebx; \
-	popl %ecx; \
-	popl %edx; \
-	popl %esi; \
-	popl %edi; \
-	popl %ebp; \
-	popl %eax; \
-	pop %ds; \
-	pop %es; \
-	pop %fs; \
-	pop %gs; \
-	addl $4,%esp; \
-	iret
-
-#else
-
-#define RESTORE_ALL \
-	cmpw $(KERNEL_CS),CS(%esp); \
-	je 1f;   \
-	movl SYMBOL_NAME(current_set),%eax; \
-	movl dbgreg7(%eax),%ebx; \
-	movl %ebx,%db7;	\
-1:	\
-	popl %ebx; \
-	popl %ecx; \
-	popl %edx; \
-	popl %esi; \
-	popl %edi; \
-	popl %ebp; \
-	popl %eax; \
-	pop %ds; \
-	pop %es; \
-	pop %fs; \
-	pop %gs; \
-	addl $4,%esp; \
-	iret
-#endif
-
-ENTRY(lcall7)
-	pushfl			# We get a different stack layout with call gates,
-	pushl %eax		# which has to be cleaned up later..
-	SAVE_ALL
-#ifdef __SMP__
-	ENTER_KERNEL
-#endif
-	movl EIP(%esp),%eax	# due to call gates, this is eflags, not eip..
-	movl CS(%esp),%edx	# this is eip..
-	movl EFLAGS(%esp),%ecx	# and this is cs..
-	movl %eax,EFLAGS(%esp)	#
-	movl %edx,EIP(%esp)	# Now we move them to their "normal" places
-	movl %ecx,CS(%esp)	#
-	movl %esp,%eax
-#ifdef __SMP__
-	GET_PROCESSOR_OFFSET(%edx)	# Processor offset into edx
-	movl SYMBOL_NAME(current_set)(,%edx),%edx
-#else
-	movl SYMBOL_NAME(current_set),%edx
-#endif
-	pushl %eax
-	movl exec_domain(%edx),%edx	# Get the execution domain
-	movl 4(%edx),%edx	# Get the lcall7 handler for the domain
-	call *%edx
-	popl %eax
-	jmp ret_from_sys_call
-
-	ALIGN
-handle_bottom_half:
-	incl SYMBOL_NAME(intr_count)
-	call SYMBOL_NAME(do_bottom_half)
-	decl SYMBOL_NAME(intr_count)
-	jmp 9f
-	ALIGN
-reschedule:
-	pushl $ret_from_sys_call
-	jmp SYMBOL_NAME(schedule)    # test
-
-ENTRY(system_call)
-	pushl %eax			# save orig_eax
-	SAVE_ALL
-#ifdef __SMP__
-	ENTER_KERNEL
-#endif
-	movl $-ENOSYS,EAX(%esp)
-	cmpl $(NR_syscalls),%eax
-	jae ret_from_sys_call
-	movl SYMBOL_NAME(sys_call_table)(,%eax,4),%eax
-	testl %eax,%eax
-	je ret_from_sys_call
-#ifdef __SMP__
-	GET_PROCESSOR_OFFSET(%edx)
-	movl SYMBOL_NAME(current_set)(,%edx),%ebx
-#else
-	movl SYMBOL_NAME(current_set),%ebx
-#endif
-	andl $~CF_MASK,EFLAGS(%esp)	# clear carry - assume no errors
-	movl %db6,%edx
-	movl %edx,dbgreg6(%ebx)  # save current hardware debugging status
-	testb $0x20,flags(%ebx)		# PF_TRACESYS
-	jne 1f
-	call *%eax
-	movl %eax,EAX(%esp)		# save the return value
-	jmp ret_from_sys_call
-	ALIGN
-1:	call SYMBOL_NAME(syscall_trace)
-	movl ORIG_EAX(%esp),%eax
-	call SYMBOL_NAME(sys_call_table)(,%eax,4)
-	movl %eax,EAX(%esp)		# save the return value
-#ifdef __SMP__
-	GET_PROCESSOR_OFFSET(%eax)
-	movl SYMBOL_NAME(current_set)(,%eax),%eax
-#else
-	movl SYMBOL_NAME(current_set),%eax
-#endif
-	call SYMBOL_NAME(syscall_trace)
-
-	ALIGN
-	.globl ret_from_sys_call
-ret_from_sys_call:
-	cmpl $0,SYMBOL_NAME(intr_count)
-	jne 2f
-9:	movl SYMBOL_NAME(bh_mask),%eax
-	andl SYMBOL_NAME(bh_active),%eax
-	jne handle_bottom_half
-#ifdef __SMP__
-	cmpb $(NO_PROC_ID), SYMBOL_NAME(saved_active_kernel_processor)
-	jne 2f
-#endif
-	movl EFLAGS(%esp),%eax		# check VM86 flag: CS/SS are
-	testl $(VM_MASK),%eax		# different then
-	jne 1f
-	cmpw $(KERNEL_CS),CS(%esp)	# was old code segment supervisor ?
-	je 2f
-1:	sti
-	orl $(IF_MASK),%eax		# these just try to make sure
-	andl $~NT_MASK,%eax		# the program doesn't do anything
-	movl %eax,EFLAGS(%esp)		# stupid
-	cmpl $0,SYMBOL_NAME(need_resched)
-	jne reschedule
-#ifdef __SMP__
-	GET_PROCESSOR_OFFSET(%eax)
-	movl SYMBOL_NAME(current_set)(,%eax), %eax
-#else
-	movl SYMBOL_NAME(current_set),%eax
-#endif
-	cmpl SYMBOL_NAME(task),%eax	# task[0] cannot have signals
-	je 2f
-	movl blocked(%eax),%ecx
-	movl %ecx,%ebx			# save blocked in %ebx for signal handling
-	notl %ecx
-	andl signal(%eax),%ecx
-	jne signal_return
-2:	RESTORE_ALL
-	ALIGN
-signal_return:
-	movl %esp,%ecx
-	pushl %ecx
-	testl $(VM_MASK),EFLAGS(%ecx)
-	jne v86_signal_return
-	pushl %ebx
-	call SYMBOL_NAME(do_signal)
-	popl %ebx
-	popl %ebx
-	RESTORE_ALL
-	ALIGN
-v86_signal_return:
-	call SYMBOL_NAME(save_v86_state)
-	movl %eax,%esp
-	pushl %eax
-	pushl %ebx
-	call SYMBOL_NAME(do_signal)
-	popl %ebx
-	popl %ebx
-	RESTORE_ALL
-
-ENTRY(divide_error)
-	pushl $0		# no error code
-	pushl $ SYMBOL_NAME(do_divide_error)
-	ALIGN
-error_code:
-	push %fs
-	push %es
-	push %ds
-	pushl %eax
-	xorl %eax,%eax
-	pushl %ebp
-	pushl %edi
-	pushl %esi
-	pushl %edx
-	decl %eax			# eax = -1
-	pushl %ecx
-	pushl %ebx
-	cld
-	xorl %ebx,%ebx			# zero ebx
-	xchgl %eax, ORIG_EAX(%esp)	# orig_eax (get the error code. )
-	mov %gs,%bx			# get the lower order bits of gs
-	movl %esp,%edx
-	xchgl %ebx, GS(%esp)		# get the address and save gs.
-	pushl %eax			# push the error code
-	pushl %edx
-	movl $(KERNEL_DS),%edx
-	mov %dx,%ds
-	mov %dx,%es
-	movl $(USER_DS),%edx
-	mov %dx,%fs
-#ifdef __SMP__
-	ENTER_KERNEL
-	GET_PROCESSOR_OFFSET(%eax)
-	movl SYMBOL_NAME(current_set)(,%eax), %eax
-#else
-	movl SYMBOL_NAME(current_set),%eax
-#endif
-	movl %db6,%edx
-	movl %edx,dbgreg6(%eax)  # save current hardware debugging status
-	call *%ebx
-	addl $8,%esp
-	jmp ret_from_sys_call
-
-ENTRY(coprocessor_error)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_coprocessor_error)
-	jmp error_code
-
-ENTRY(device_not_available)
-	pushl $-1		# mark this as an int
-	SAVE_ALL
-#ifdef __SMP__
-	ENTER_KERNEL
-#endif
-	pushl $ret_from_sys_call
-	movl %cr0,%eax
-	testl $0x4,%eax			# EM (math emulation bit)
-	je SYMBOL_NAME(math_state_restore)
-	pushl $0		# temporary storage for ORIG_EIP
-	call  SYMBOL_NAME(math_emulate)
-	addl $4,%esp
-	ret
-
-ENTRY(debug)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_debug)
-	jmp error_code
-
-ENTRY(nmi)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_nmi)
-	jmp error_code
-
-ENTRY(int3)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_int3)
-	jmp error_code
-
-ENTRY(overflow)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_overflow)
-	jmp error_code
-
-ENTRY(bounds)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_bounds)
-	jmp error_code
-
-ENTRY(invalid_op)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_invalid_op)
-	jmp error_code
-
-ENTRY(coprocessor_segment_overrun)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_coprocessor_segment_overrun)
-	jmp error_code
-
-ENTRY(reserved)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_reserved)
-	jmp error_code
-
-ENTRY(double_fault)
-	pushl $ SYMBOL_NAME(do_double_fault)
-	jmp error_code
-
-ENTRY(invalid_TSS)
-	pushl $ SYMBOL_NAME(do_invalid_TSS)
-	jmp error_code
-
-ENTRY(segment_not_present)
-	pushl $ SYMBOL_NAME(do_segment_not_present)
-	jmp error_code
-
-ENTRY(stack_segment)
-	pushl $ SYMBOL_NAME(do_stack_segment)
-	jmp error_code
-
-ENTRY(general_protection)
-	pushl $ SYMBOL_NAME(do_general_protection)
-	jmp error_code
-
-ENTRY(alignment_check)
-	pushl $ SYMBOL_NAME(do_alignment_check)
-	jmp error_code
-
-ENTRY(page_fault)
-	pushl $ SYMBOL_NAME(do_page_fault)
-	jmp error_code
-
-ENTRY(spurious_interrupt_bug)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_spurious_interrupt_bug)
-	jmp error_code
-
-.data
-ENTRY(sys_call_table)
-	.long SYMBOL_NAME(sys_setup)		/* 0 */
-	.long SYMBOL_NAME(sys_exit)
-	.long SYMBOL_NAME(sys_fork)
-	.long SYMBOL_NAME(sys_read)
-	.long SYMBOL_NAME(sys_write)
-	.long SYMBOL_NAME(sys_open)		/* 5 */
-	.long SYMBOL_NAME(sys_close)
-	.long SYMBOL_NAME(sys_waitpid)
-	.long SYMBOL_NAME(sys_creat)
-	.long SYMBOL_NAME(sys_link)
-	.long SYMBOL_NAME(sys_unlink)		/* 10 */
-	.long SYMBOL_NAME(sys_execve)
-	.long SYMBOL_NAME(sys_chdir)
-	.long SYMBOL_NAME(sys_time)
-	.long SYMBOL_NAME(sys_mknod)
-	.long SYMBOL_NAME(sys_chmod)		/* 15 */
-	.long SYMBOL_NAME(sys_chown)
-	.long SYMBOL_NAME(sys_break)
-	.long SYMBOL_NAME(sys_stat)
-	.long SYMBOL_NAME(sys_lseek)
-	.long SYMBOL_NAME(sys_getpid)		/* 20 */
-	.long SYMBOL_NAME(sys_mount)
-	.long SYMBOL_NAME(sys_umount)
-	.long SYMBOL_NAME(sys_setuid)
-	.long SYMBOL_NAME(sys_getuid)
-	.long SYMBOL_NAME(sys_stime)		/* 25 */
-	.long SYMBOL_NAME(sys_ptrace)
-	.long SYMBOL_NAME(sys_alarm)
-	.long SYMBOL_NAME(sys_fstat)
-	.long SYMBOL_NAME(sys_pause)
-	.long SYMBOL_NAME(sys_utime)		/* 30 */
-	.long SYMBOL_NAME(sys_stty)
-	.long SYMBOL_NAME(sys_gtty)
-	.long SYMBOL_NAME(sys_access)
-	.long SYMBOL_NAME(sys_nice)
-	.long SYMBOL_NAME(sys_ftime)		/* 35 */
-	.long SYMBOL_NAME(sys_sync)
-	.long SYMBOL_NAME(sys_kill)
-	.long SYMBOL_NAME(sys_rename)
-	.long SYMBOL_NAME(sys_mkdir)
-	.long SYMBOL_NAME(sys_rmdir)		/* 40 */
-	.long SYMBOL_NAME(sys_dup)
-	.long SYMBOL_NAME(sys_pipe)
-	.long SYMBOL_NAME(sys_times)
-	.long SYMBOL_NAME(sys_prof)
-	.long SYMBOL_NAME(sys_brk)		/* 45 */
-	.long SYMBOL_NAME(sys_setgid)
-	.long SYMBOL_NAME(sys_getgid)
-	.long SYMBOL_NAME(sys_signal)
-	.long SYMBOL_NAME(sys_geteuid)
-	.long SYMBOL_NAME(sys_getegid)		/* 50 */
-	.long SYMBOL_NAME(sys_acct)
-	.long SYMBOL_NAME(sys_phys)
-	.long SYMBOL_NAME(sys_lock)
-	.long SYMBOL_NAME(sys_ioctl)
-	.long SYMBOL_NAME(sys_fcntl)		/* 55 */
-	.long SYMBOL_NAME(sys_mpx)
-	.long SYMBOL_NAME(sys_setpgid)
-	.long SYMBOL_NAME(sys_ulimit)
-	.long SYMBOL_NAME(sys_olduname)
-	.long SYMBOL_NAME(sys_umask)		/* 60 */
-	.long SYMBOL_NAME(sys_chroot)
-	.long SYMBOL_NAME(sys_ustat)
-	.long SYMBOL_NAME(sys_dup2)
-	.long SYMBOL_NAME(sys_getppid)
-	.long SYMBOL_NAME(sys_getpgrp)		/* 65 */
-	.long SYMBOL_NAME(sys_setsid)
-	.long SYMBOL_NAME(sys_sigaction)
-	.long SYMBOL_NAME(sys_sgetmask)
-	.long SYMBOL_NAME(sys_ssetmask)
-	.long SYMBOL_NAME(sys_setreuid)		/* 70 */
-	.long SYMBOL_NAME(sys_setregid)
-	.long SYMBOL_NAME(sys_sigsuspend)
-	.long SYMBOL_NAME(sys_sigpending)
-	.long SYMBOL_NAME(sys_sethostname)
-	.long SYMBOL_NAME(sys_setrlimit)	/* 75 */
-	.long SYMBOL_NAME(sys_getrlimit)
-	.long SYMBOL_NAME(sys_getrusage)
-	.long SYMBOL_NAME(sys_gettimeofday)
-	.long SYMBOL_NAME(sys_settimeofday)
-	.long SYMBOL_NAME(sys_getgroups)	/* 80 */
-	.long SYMBOL_NAME(sys_setgroups)
-	.long SYMBOL_NAME(old_select)
-	.long SYMBOL_NAME(sys_symlink)
-	.long SYMBOL_NAME(sys_lstat)
-	.long SYMBOL_NAME(sys_readlink)		/* 85 */
-	.long SYMBOL_NAME(sys_uselib)
-	.long SYMBOL_NAME(sys_swapon)
-	.long SYMBOL_NAME(sys_reboot)
-	.long SYMBOL_NAME(old_readdir)
-	.long SYMBOL_NAME(old_mmap)		/* 90 */
-	.long SYMBOL_NAME(sys_munmap)
-	.long SYMBOL_NAME(sys_truncate)
-	.long SYMBOL_NAME(sys_ftruncate)
-	.long SYMBOL_NAME(sys_fchmod)
-	.long SYMBOL_NAME(sys_fchown)		/* 95 */
-	.long SYMBOL_NAME(sys_getpriority)
-	.long SYMBOL_NAME(sys_setpriority)
-	.long SYMBOL_NAME(sys_profil)
-	.long SYMBOL_NAME(sys_statfs)
-	.long SYMBOL_NAME(sys_fstatfs)		/* 100 */
-	.long SYMBOL_NAME(sys_ioperm)
-	.long SYMBOL_NAME(sys_socketcall)
-	.long SYMBOL_NAME(sys_syslog)
-	.long SYMBOL_NAME(sys_setitimer)
-	.long SYMBOL_NAME(sys_getitimer)	/* 105 */
-	.long SYMBOL_NAME(sys_newstat)
-	.long SYMBOL_NAME(sys_newlstat)
-	.long SYMBOL_NAME(sys_newfstat)
-	.long SYMBOL_NAME(sys_uname)
-	.long SYMBOL_NAME(sys_iopl)		/* 110 */
-	.long SYMBOL_NAME(sys_vhangup)
-	.long SYMBOL_NAME(sys_idle)
-	.long SYMBOL_NAME(sys_vm86old)
-	.long SYMBOL_NAME(sys_wait4)
-	.long SYMBOL_NAME(sys_swapoff)		/* 115 */
-	.long SYMBOL_NAME(sys_sysinfo)
-	.long SYMBOL_NAME(sys_ipc)
-	.long SYMBOL_NAME(sys_fsync)
-	.long SYMBOL_NAME(sys_sigreturn)
-	.long SYMBOL_NAME(sys_clone)		/* 120 */
-	.long SYMBOL_NAME(sys_setdomainname)
-	.long SYMBOL_NAME(sys_newuname)
-	.long SYMBOL_NAME(sys_modify_ldt)
-	.long SYMBOL_NAME(sys_adjtimex)
-	.long SYMBOL_NAME(sys_mprotect)		/* 125 */
-	.long SYMBOL_NAME(sys_sigprocmask)
-	.long SYMBOL_NAME(sys_create_module)
-	.long SYMBOL_NAME(sys_init_module)
-	.long SYMBOL_NAME(sys_delete_module)
-	.long SYMBOL_NAME(sys_get_kernel_syms)	/* 130 */
-	.long SYMBOL_NAME(sys_quotactl)
-	.long SYMBOL_NAME(sys_getpgid)
-	.long SYMBOL_NAME(sys_fchdir)
-	.long SYMBOL_NAME(sys_bdflush)
-	.long SYMBOL_NAME(sys_sysfs)		/* 135 */
-	.long SYMBOL_NAME(sys_personality)
-	.long 0					/* for afs_syscall */
-	.long SYMBOL_NAME(sys_setfsuid)
-	.long SYMBOL_NAME(sys_setfsgid)
-	.long SYMBOL_NAME(sys_llseek)		/* 140 */
-	.long SYMBOL_NAME(sys_getdents)
-	.long SYMBOL_NAME(sys_select)
-	.long SYMBOL_NAME(sys_flock)
-	.long SYMBOL_NAME(sys_msync)
-	.long SYMBOL_NAME(sys_readv)		/* 145 */
-	.long SYMBOL_NAME(sys_writev)
-	.long SYMBOL_NAME(sys_getsid)
-	.long SYMBOL_NAME(sys_fdatasync)
-	.long SYMBOL_NAME(sys_sysctl)
-	.long SYMBOL_NAME(sys_mlock)		/* 150 */
-	.long SYMBOL_NAME(sys_munlock)
-	.long SYMBOL_NAME(sys_mlockall)
-	.long SYMBOL_NAME(sys_munlockall)
-	.long SYMBOL_NAME(sys_sched_setparam)
-	.long SYMBOL_NAME(sys_sched_getparam)   /* 155 */
-	.long SYMBOL_NAME(sys_sched_setscheduler)
-	.long SYMBOL_NAME(sys_sched_getscheduler)
-	.long SYMBOL_NAME(sys_sched_yield)
-	.long SYMBOL_NAME(sys_sched_get_priority_max)
-	.long SYMBOL_NAME(sys_sched_get_priority_min)  /* 160 */
-	.long SYMBOL_NAME(sys_sched_rr_get_interval)
-	.long SYMBOL_NAME(sys_nanosleep)
-	.long SYMBOL_NAME(sys_mremap)
-	.long 0,0
-	.long SYMBOL_NAME(sys_vm86)
-	.long 0,0,0,0					/* 170 */
-	.long 0,0,0,0,0,0,0,0,0,0			/* 180 */
-	.long 0,0,0,0,0,0,0
-	.long SYMBOL_NAME(sys_table)
-	.space (NR_syscalls-188)*4
--- a/kernel/table20/kernel.patch
+++ b/kernel/table20/kernel.patch
@@ -1,51 +0,0 @@
-diff -ur linux-2.0.32/Makefile linux-hacked/Makefile
--- linux-2.0.32/Makefile	Fri Nov  7 19:51:05 1997
-+++ linux-hacked/Makefile	Thu Jun 11 20:41:12 1998
-@@ -87,7 +87,7 @@
- # standard CFLAGS
- #
- 
-CFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strength-reduce
-+CFLAGS = -Wall -Wstrict-prototypes -g -O2 -fomit-frame-pointer -fno-strength-reduce
- 
- ifdef CONFIG_CPP
- CFLAGS := $(CFLAGS) -x c++
-@@ -113,12 +113,12 @@
- # Include the make variables (CC, etc...)
- #
- 
-ARCHIVES	=kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o net/network.a
-+ARCHIVES	=kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o net/network.a table/table.o
- FILESYSTEMS	=fs/filesystems.a
- DRIVERS		=drivers/block/block.a \
- 		 drivers/char/char.a
- LIBS		=$(TOPDIR)/lib/lib.a
-SUBDIRS		=kernel drivers mm fs net ipc lib
-+SUBDIRS		=kernel drivers mm fs net ipc lib table
- 
- ifeq ($(CONFIG_ISDN),y)
- DRIVERS := $(DRIVERS) drivers/isdn/isdn.a
-diff -ur linux-2.0.32/arch/i386/kernel/entry.S linux-hacked/arch/i386/kernel/entry.S
--- linux-2.0.32/arch/i386/kernel/entry.S	Tue Sep 16 23:42:45 1997
-+++ linux-hacked/arch/i386/kernel/entry.S	Thu Jun 11 21:37:20 1998
-@@ -699,4 +699,8 @@
- 	.long SYMBOL_NAME(sys_mremap)
- 	.long 0,0
- 	.long SYMBOL_NAME(sys_vm86)
-	.space (NR_syscalls-166)*4
-+	.long 0,0,0,0					/* 170 */
-+	.long 0,0,0,0,0,0,0,0,0,0			/* 180 */
-+	.long 0,0,0,0,0,0,0
-+	.long SYMBOL_NAME(sys_table)
-+	.space (NR_syscalls-188)*4
-diff -ur linux-2.0.32/include/asm-i386/unistd.h linux-hacked/include/asm-i386/unistd.h
--- linux-2.0.32/include/asm-i386/unistd.h	Fri Mar 22 07:34:02 1996
-+++ linux-hacked/include/asm-i386/unistd.h	Thu Jun 11 21:37:03 1998
-@@ -169,6 +169,7 @@
- #define __NR_sched_rr_get_interval	161
- #define __NR_nanosleep		162
- #define __NR_mremap		163
-+#define __NR_table		188
- 
- /* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
- #define _syscall0(type,name) \
--- a/kernel/table20/main.c
+++ b/kernel/table20/main.c
@@ -1,468 +0,0 @@
-/*
- * linux/table/table_impl.c
- * Copyright (C) 1998 Martin Baulig
- */
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/kernel_stat.h>
-#include <linux/tty.h>
-#include <linux/user.h>
-#include <linux/a.out.h>
-#include <linux/string.h>
-#include <linux/mman.h>
-#include <linux/proc_fs.h>
-#include <linux/ioport.h>
-#include <linux/config.h>
-#include <linux/mm.h>
-#include <linux/pagemap.h>
-#include <linux/swap.h>
-
-#include <asm/segment.h>
-#include <asm/pgtable.h>
-#include <asm/io.h>
-
-#include <linux/table.h>
-
-#include "version.h"
-
-#if defined(__i386__)
-# define KSTK_EIP(tsk)	(((unsigned long *)tsk->kernel_stack_page)[1019])
-# define KSTK_ESP(tsk)	(((unsigned long *)tsk->kernel_stack_page)[1022])
-#elif defined(__alpha__)
-  /*
-   * See arch/alpha/kernel/ptrace.c for details.
-   */
-# define PT_REG(reg)		(PAGE_SIZE - sizeof(struct pt_regs)	\
-				 + (long)&((struct pt_regs *)0)->reg)
-# define KSTK_EIP(tsk)	(*(unsigned long *)(tsk->kernel_stack_page + PT_REG(pc)))
-# define KSTK_ESP(tsk)	((tsk) == current ? rdusp() : (tsk)->tss.usp)
-#elif defined(__sparc__)
-# define PT_REG(reg)            (PAGE_SIZE - sizeof(struct pt_regs)     \
-                                 + (long)&((struct pt_regs *)0)->reg)
-# define KSTK_EIP(tsk)  (*(unsigned long *)(tsk->kernel_stack_page + PT_REG(pc)))
-# define KSTK_ESP(tsk)  (*(unsigned long *)(tsk->kernel_stack_page + PT_REG(u_regs[UREG_FP])))
-#endif
-
-static struct task_struct *
-get_task (pid_t pid)
-{
-	struct task_struct ** p;
-
-	p = task;
-	while (++p < task+NR_TASKS) {
-		if (*p && (*p)->pid == pid)
-			return *p;
-	}
-
-	return NULL;
-}
-
-static inline void statm_pte_range(pmd_t * pmd, unsigned long address, unsigned long size,
-	int * pages, int * shared, int * dirty, int * total)
-{
-	pte_t * pte;
-	unsigned long end;
-
-	if (pmd_none(*pmd))
-		return;
-	if (pmd_bad(*pmd)) {
-		printk("statm_pte_range: bad pmd (%08lx)\n", pmd_val(*pmd));
-		pmd_clear(pmd);
-		return;
-	}
-	pte = pte_offset(pmd, address);
-	address &= ~PMD_MASK;
-	end = address + size;
-	if (end > PMD_SIZE)
-		end = PMD_SIZE;
-	do {
-		pte_t page = *pte;
-
-		address += PAGE_SIZE;
-		pte++;
-		if (pte_none(page))
-			continue;
-		++*total;
-		if (!pte_present(page))
-			continue;
-		++*pages;
-		if (pte_dirty(page))
-			++*dirty;
-		if (pte_page(page) >= high_memory)
-			continue;
-		if (mem_map[MAP_NR(pte_page(page))].count > 1)
-			++*shared;
-	} while (address < end);
-}
-
-static inline void statm_pmd_range(pgd_t * pgd, unsigned long address, unsigned long size,
-	int * pages, int * shared, int * dirty, int * total)
-{
-	pmd_t * pmd;
-	unsigned long end;
-
-	if (pgd_none(*pgd))
-		return;
-	if (pgd_bad(*pgd)) {
-		printk("statm_pmd_range: bad pgd (%08lx)\n", pgd_val(*pgd));
-		pgd_clear(pgd);
-		return;
-	}
-	pmd = pmd_offset(pgd, address);
-	address &= ~PGDIR_MASK;
-	end = address + size;
-	if (end > PGDIR_SIZE)
-		end = PGDIR_SIZE;
-	do {
-		statm_pte_range(pmd, address, end - address, pages, shared, dirty, total);
-		address = (address + PMD_SIZE) & PMD_MASK;
-		pmd++;
-	} while (address < end);
-}
-
-static void statm_pgd_range(pgd_t * pgd, unsigned long address, unsigned long end,
-	int * pages, int * shared, int * dirty, int * total)
-{
-	while (address < end) {
-		statm_pmd_range(pgd, address, end - address, pages, shared, dirty, total);
-		address = (address + PGDIR_SIZE) & PGDIR_MASK;
-		pgd++;
-	}
-}
-
-static unsigned long
-get_wchan (struct task_struct *p)
-{
-	if (!p || p == current || p->state == TASK_RUNNING)
-		return 0;
-#if defined(__i386__)
-	{
-		unsigned long ebp, eip;
-		unsigned long stack_page;
-		int count = 0;
-
-		stack_page = p->kernel_stack_page;
-		if (!stack_page)
-			return 0;
-		ebp = p->tss.ebp;
-		do {
-			if (ebp < stack_page || ebp >= 4092+stack_page)
-				return 0;
-			eip = *(unsigned long *) (ebp+4);
-			if (eip < (unsigned long) interruptible_sleep_on
-			    || eip >= (unsigned long) add_timer)
-				return eip;
-			ebp = *(unsigned long *) ebp;
-		} while (count++ < 16);
-	}
-#elif defined(__alpha__)
-	/*
-	 * This one depends on the frame size of schedule().  Do a
-	 * "disass schedule" in gdb to find the frame size.  Also, the
-	 * code assumes that sleep_on() follows immediately after
-	 * interruptible_sleep_on() and that add_timer() follows
-	 * immediately after interruptible_sleep().  Ugly, isn't it?
-	 * Maybe adding a wchan field to task_struct would be better,
-	 * after all...
-	 */
-	{
-		unsigned long schedule_frame;
-		unsigned long pc;
-
-		pc = thread_saved_pc(&p->tss);
-		if (pc >= (unsigned long) interruptible_sleep_on && pc < (unsigned long) add_timer) {
-			schedule_frame = ((unsigned long *)p->tss.ksp)[6];
-			return ((unsigned long *)schedule_frame)[12];
-		}
-		return pc;
-	}
-#endif
-	return 0;
-}
-
-asmlinkage int
-sys_table (int type, union table *buf, const void *param)
-{
-	union table tbl;
-	struct sysinfo i;
-	struct task_struct *tsk = NULL;
-	struct ip_chain *chain;
-	struct ip_fwkernel *rule;
-	char devname [9];
-	int index, err;
-	pid_t pid;
-
-	if (type == TABLE_VERSION)
-		return _TABLE_VERSION;
-
-	if (!buf)
-		return -EFAULT;
-
-	memset (&tbl, 0, sizeof (union table));
-
-	/* For TABLE_PROC_*, read pid and get task_struct */
-
-	switch (type) {
-	case TABLE_PROC_UID:
-	case TABLE_PROC_MEM:
-	case TABLE_PROC_SEGMENT:
-	case TABLE_PROC_TIME:
-	case TABLE_PROC_STATE:
-	case TABLE_PROC_SIGNAL:
-	case TABLE_PROC_KERNEL:
-	  err = verify_area (VERIFY_READ, param, sizeof (pid_t));
-		if (err)
-			return err;
-		memcpy_fromfs (&pid, param, sizeof (pid_t));
-
-		tsk = get_task (pid);
-		if (tsk == NULL)
-			return -ESRCH;
-		break;
-	case TABLE_NETACCT:
-		err = verify_area (VERIFY_READ, param, 5);
-		if (err)
-			return err;
-		copy_from_user (devname, param, 5);
-		devname [5] = 0;
-
-		break;
-	}
-
-	/* Main function dispatcher */
-
-	switch (type) {
-	case TABLE_PROCLIST:
-		tsk = task [0];
-		for (index = 0; index < nr_tasks; index++) {
-			tbl.proclist.pids [index] = tsk->pid;
-			tsk = tsk->next_task;
-		}
-		tbl.proclist.nr_running = nr_running;
-		tbl.proclist.nr_tasks = nr_tasks;
-		tbl.proclist.last_pid = last_pid;
-		break;
-	case TABLE_CPU:
-		tbl.cpu.total = jiffies;
-		tbl.cpu.user  = kstat.cpu_user;
-		tbl.cpu.nice  = kstat.cpu_nice;
-		tbl.cpu.sys   = kstat.cpu_system;
-		tbl.cpu.idle  = tbl.cpu.total -
-			(tbl.cpu.user + tbl.cpu.nice + tbl.cpu.sys);
-		tbl.cpu.frequency = HZ;
-		break;
-	case TABLE_MEM:
-		si_meminfo (&i);
-		tbl.mem.total  = i.totalram;
-		tbl.mem.used   = i.totalram - i.freeram;
-		tbl.mem.free   = i.freeram;
-		tbl.mem.shared = i.sharedram;
-		tbl.mem.buffer = i.bufferram;
-		tbl.mem.cached = page_cache_size << PAGE_SHIFT;
-		break;
-	case TABLE_SWAP:
-		si_swapinfo (&i);
-		tbl.swap.total = i.totalswap;
-		tbl.swap.used  = i.totalswap - i.freeswap;
-		tbl.swap.free  = i.freeswap;
-		tbl.swap.pagein = kstat.pswpin;
-		tbl.swap.pageout = kstat.pswpout;
-		break;
-	case TABLE_LOADAVG:
-		tbl.loadavg.loadavg [0] = (double) avenrun [0] / (1 << FSHIFT);
-		tbl.loadavg.loadavg [1] = (double) avenrun [1] / (1 << FSHIFT);
-		tbl.loadavg.loadavg [2] = (double) avenrun [2] / (1 << FSHIFT);
-		tbl.loadavg.nr_running = nr_running;
-		tbl.loadavg.nr_tasks = nr_tasks;
-		tbl.loadavg.last_pid = last_pid;
-		break;
-	case TABLE_UPTIME:
-		tbl.uptime.uptime = jiffies;
-		tbl.uptime.idle   = task[0]->utime + task[0]->stime;
-		break;
-	case TABLE_PROC_STATE:
-		tbl.proc_state.state = tsk->state;
-		tbl.proc_state.flags = tsk->flags;
-		memcpy (tbl.proc_state.comm, tsk->comm,
-			sizeof (tbl.proc_state.comm));
-		break;
-	case TABLE_PROC_UID:
-		tbl.proc_uid.uid = tsk->uid;
-		tbl.proc_uid.euid = tsk->euid;
-		tbl.proc_uid.suid = tsk->suid;
-		tbl.proc_uid.fsuid = tsk->fsuid;
-
-		tbl.proc_uid.gid = tsk->gid;
-		tbl.proc_uid.egid = tsk->egid;
-		tbl.proc_uid.sgid = tsk->sgid;
-		tbl.proc_uid.fsgid = tsk->fsgid;
-
-		tbl.proc_uid.pid = tsk->pid;
-		tbl.proc_uid.pgrp = tsk->pgrp;
-		tbl.proc_uid.ppid = tsk->p_pptr->pid;
-
-		tbl.proc_uid.session = tsk->session;
-	        tbl.proc_uid.tty = tsk->tty ?
-			kdev_t_to_nr (tsk->tty->device) : 0;
-		tbl.proc_uid.tpgid = tsk->tty ? tsk->tty->pgrp : -1;
-
-		tbl.proc_uid.priority = tsk->priority;
-		tbl.proc_uid.counter = tsk->counter;
-		tbl.proc_uid.def_priority = DEF_PRIORITY;
-		break;
-	case TABLE_PROC_SIGNAL:
-		tbl.proc_signal.signal = tsk->signal;
-		tbl.proc_signal.blocked = tsk->blocked;
-
-		if (tsk->sig) {
-			struct sigaction * action = tsk->sig->action;
-			unsigned long sig_ign = 0, sig_caught = 0;
-			unsigned long bit = 1;
-			int i;
-
-			for (i = 0; i < 32; i++) {
-				switch((unsigned long) action->sa_handler) {
-				case 0:
-					break;
-				case 1:
-					sig_ign |= bit;
-					break;
-				default:
-					sig_caught |= bit;
-				}
-				bit <<= 1;
-				action++;
-			}
-
-			tbl.proc_signal.ignored = sig_ign;
-			tbl.proc_signal.caught  = sig_caught;
-		} else {
-			tbl.proc_signal.ignored = 0;
-			tbl.proc_signal.caught  = 0;
-		}
-		break;
-	case TABLE_PROC_MEM:
-		if (tsk->mm && tsk->mm != &init_mm) {
-			tbl.proc_mem.context = tsk->mm->context;
-			tbl.proc_mem.start_code = tsk->mm->start_code;
-			tbl.proc_mem.end_code = tsk->mm->end_code;
-			tbl.proc_mem.start_data = tsk->mm-> start_data;
-			tbl.proc_mem.end_data = tsk->mm->end_data;
-			tbl.proc_mem.start_brk = tsk->mm->start_brk;
-			tbl.proc_mem.brk = tsk->mm->brk;
-			tbl.proc_mem.start_stack = tsk->mm->start_stack;
-			tbl.proc_mem.start_mmap = tsk->mm->start_mmap;
-			tbl.proc_mem.arg_start = tsk->mm->arg_start;
-			tbl.proc_mem.arg_end = tsk->mm->arg_end;
-			tbl.proc_mem.env_start = tsk->mm->env_start;
-			tbl.proc_mem.env_end = tsk->mm->env_end;
-			tbl.proc_mem.rss = tsk->mm->rss;
-			tbl.proc_mem.total_vm = tsk->mm->total_vm;
-			tbl.proc_mem.locked_vm = tsk->mm->locked_vm;
-		}
-		tbl.proc_mem.rlim = tsk->rlim ?
-			tsk->rlim[RLIMIT_RSS].rlim_cur : 0;
-		break;
-	case TABLE_PROC_SEGMENT:
-		if (tsk->mm && tsk->mm != &init_mm) {
-			unsigned long vsize = 0;
-			int size = 0, resident = 0, share = 0;
-			int trs = 0, lrs = 0, drs = 0, dt = 0;
-			struct vm_area_struct * vma = tsk->mm->mmap;
-
-			while (vma) {
-				pgd_t *pgd = pgd_offset(tsk->mm, vma->vm_start);
-				int pages = 0, shared = 0, dirty = 0, total = 0;
-
-				vsize += vma->vm_end - vma->vm_start;
-
-				statm_pgd_range (pgd, vma->vm_start, vma->vm_end,
-						 &pages, &shared, &dirty, &total);
-				resident += pages;
-				share += shared;
-				dt += dirty;
-				size += total;
-				if (vma->vm_flags & VM_EXECUTABLE)
-					trs += pages;	/* text */
-				else if (vma->vm_flags & VM_GROWSDOWN)
-					drs += pages;	/* stack */
-				else if (vma->vm_end > 0x60000000)
-					lrs += pages;	/* library */
-				else
-					drs += pages;
-				vma = vma->vm_next;
-			}
-
-			tbl.proc_segment.vsize = vsize;
-			tbl.proc_segment.size = size;
-			tbl.proc_segment.resident = resident;
-			tbl.proc_segment.shared = share;
-			tbl.proc_segment.trs = trs;
-			tbl.proc_segment.lrs = lrs;
-			tbl.proc_segment.dt = dt;
-		}
-		break;
-	case TABLE_PROC_TIME:
-		tbl.proc_time.utime = tsk->utime;
-		tbl.proc_time.stime = tsk->stime;
-		tbl.proc_time.cutime = tsk->cutime;
-		tbl.proc_time.cstime = tsk->cstime;
-
-		tbl.proc_time.start_time = tsk->start_time;
-		tbl.proc_time.timeout = tsk->timeout;
-		tbl.proc_time.policy = tsk->policy;
-		tbl.proc_time.rt_priority = tsk->rt_priority;
-
-		tbl.proc_time.it_real_value = tsk->it_real_value;
-		tbl.proc_time.it_prof_value = tsk->it_prof_value;
-		tbl.proc_time.it_virt_value = tsk->it_virt_value;
-		tbl.proc_time.it_real_incr = tsk->it_real_incr;
-		tbl.proc_time.it_prof_incr = tsk->it_prof_incr;
-		tbl.proc_time.it_virt_incr = tsk->it_virt_incr;
-		break;
-	case TABLE_PROC_KERNEL:
-		tbl.proc_kernel.min_flt = tsk->min_flt;
-		tbl.proc_kernel.cmin_flt = tsk->cmin_flt;
-		tbl.proc_kernel.maj_flt = tsk->maj_flt;
-		tbl.proc_kernel.cmaj_flt = tsk->cmaj_flt;
-
-		tbl.proc_kernel.kesp = tsk->kernel_stack_page ? KSTK_EIP(tsk) : 0;
-		tbl.proc_kernel.keip = tsk->kernel_stack_page ? KSTK_ESP(tsk) : 0;
-
-		tbl.proc_kernel.nswap = tsk->nswap;
-		tbl.proc_kernel.cnswap = tsk->cnswap;
-
-		tbl.proc_kernel.wchan = get_wchan (tsk);
-		break;
-	case TABLE_NETACCT:
-		for (chain = ip_fw_chains; chain; chain = chain->next) {
-			for (rule = chain->chain; rule; rule = rule->next) {
-				const char *name = rule->ipfw.fw_vianame;
-				int k;
-
-				if (name [0] && !strncmp (param, name, 5))
-					continue;
-
-				for (k = 0; k < NUM_SLOTS; k++) {
-					tbl.netacct.packets +=
-						rule->counters[k].pcnt;
-					tbl.netacct.bytes +=
-						rule->counters[k].bcnt;
-				}
-			}
-		}
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	err = verify_area (VERIFY_WRITE, buf, sizeof (struct table));
-	if (err)
-		return err;
-
-	memcpy_tofs (buf, &tbl, sizeof (union table));
-	return 0;
-}
--- a/kernel/table20/unistd-i386.h
+++ b/kernel/table20/unistd-i386.h
@@ -1,324 +0,0 @@
-#ifndef _ASM_I386_UNISTD_H_
-#define _ASM_I386_UNISTD_H_
-
-/*
- * This file contains the system call numbers.
- */
-
-#define __NR_setup		  0	/* used only by init, to get system going */
-#define __NR_exit		  1
-#define __NR_fork		  2
-#define __NR_read		  3
-#define __NR_write		  4
-#define __NR_open		  5
-#define __NR_close		  6
-#define __NR_waitpid		  7
-#define __NR_creat		  8
-#define __NR_link		  9
-#define __NR_unlink		 10
-#define __NR_execve		 11
-#define __NR_chdir		 12
-#define __NR_time		 13
-#define __NR_mknod		 14
-#define __NR_chmod		 15
-#define __NR_chown		 16
-#define __NR_break		 17
-#define __NR_oldstat		 18
-#define __NR_lseek		 19
-#define __NR_getpid		 20
-#define __NR_mount		 21
-#define __NR_umount		 22
-#define __NR_setuid		 23
-#define __NR_getuid		 24
-#define __NR_stime		 25
-#define __NR_ptrace		 26
-#define __NR_alarm		 27
-#define __NR_oldfstat		 28
-#define __NR_pause		 29
-#define __NR_utime		 30
-#define __NR_stty		 31
-#define __NR_gtty		 32
-#define __NR_access		 33
-#define __NR_nice		 34
-#define __NR_ftime		 35
-#define __NR_sync		 36
-#define __NR_kill		 37
-#define __NR_rename		 38
-#define __NR_mkdir		 39
-#define __NR_rmdir		 40
-#define __NR_dup		 41
-#define __NR_pipe		 42
-#define __NR_times		 43
-#define __NR_prof		 44
-#define __NR_brk		 45
-#define __NR_setgid		 46
-#define __NR_getgid		 47
-#define __NR_signal		 48
-#define __NR_geteuid		 49
-#define __NR_getegid		 50
-#define __NR_acct		 51
-#define __NR_phys		 52
-#define __NR_lock		 53
-#define __NR_ioctl		 54
-#define __NR_fcntl		 55
-#define __NR_mpx		 56
-#define __NR_setpgid		 57
-#define __NR_ulimit		 58
-#define __NR_oldolduname	 59
-#define __NR_umask		 60
-#define __NR_chroot		 61
-#define __NR_ustat		 62
-#define __NR_dup2		 63
-#define __NR_getppid		 64
-#define __NR_getpgrp		 65
-#define __NR_setsid		 66
-#define __NR_sigaction		 67
-#define __NR_sgetmask		 68
-#define __NR_ssetmask		 69
-#define __NR_setreuid		 70
-#define __NR_setregid		 71
-#define __NR_sigsuspend		 72
-#define __NR_sigpending		 73
-#define __NR_sethostname	 74
-#define __NR_setrlimit		 75
-#define __NR_getrlimit		 76
-#define __NR_getrusage		 77
-#define __NR_gettimeofday	 78
-#define __NR_settimeofday	 79
-#define __NR_getgroups		 80
-#define __NR_setgroups		 81
-#define __NR_select		 82
-#define __NR_symlink		 83
-#define __NR_oldlstat		 84
-#define __NR_readlink		 85
-#define __NR_uselib		 86
-#define __NR_swapon		 87
-#define __NR_reboot		 88
-#define __NR_readdir		 89
-#define __NR_mmap		 90
-#define __NR_munmap		 91
-#define __NR_truncate		 92
-#define __NR_ftruncate		 93
-#define __NR_fchmod		 94
-#define __NR_fchown		 95
-#define __NR_getpriority	 96
-#define __NR_setpriority	 97
-#define __NR_profil		 98
-#define __NR_statfs		 99
-#define __NR_fstatfs		100
-#define __NR_ioperm		101
-#define __NR_socketcall		102
-#define __NR_syslog		103
-#define __NR_setitimer		104
-#define __NR_getitimer		105
-#define __NR_stat		106
-#define __NR_lstat		107
-#define __NR_fstat		108
-#define __NR_olduname		109
-#define __NR_iopl		110
-#define __NR_vhangup		111
-#define __NR_idle		112
-#define __NR_vm86		113
-#define __NR_wait4		114
-#define __NR_swapoff		115
-#define __NR_sysinfo		116
-#define __NR_ipc		117
-#define __NR_fsync		118
-#define __NR_sigreturn		119
-#define __NR_clone		120
-#define __NR_setdomainname	121
-#define __NR_uname		122
-#define __NR_modify_ldt		123
-#define __NR_adjtimex		124
-#define __NR_mprotect		125
-#define __NR_sigprocmask	126
-#define __NR_create_module	127
-#define __NR_init_module	128
-#define __NR_delete_module	129
-#define __NR_get_kernel_syms	130
-#define __NR_quotactl		131
-#define __NR_getpgid		132
-#define __NR_fchdir		133
-#define __NR_bdflush		134
-#define __NR_sysfs		135
-#define __NR_personality	136
-#define __NR_afs_syscall	137 /* Syscall for Andrew File System */
-#define __NR_setfsuid		138
-#define __NR_setfsgid		139
-#define __NR__llseek		140
-#define __NR_getdents		141
-#define __NR__newselect		142
-#define __NR_flock		143
-#define __NR_msync		144
-#define __NR_readv		145
-#define __NR_writev		146
-#define __NR_getsid		147
-#define __NR_fdatasync		148
-#define __NR__sysctl		149
-#define __NR_mlock		150
-#define __NR_munlock		151
-#define __NR_mlockall		152
-#define __NR_munlockall		153
-#define __NR_sched_setparam		154
-#define __NR_sched_getparam		155
-#define __NR_sched_setscheduler		156
-#define __NR_sched_getscheduler		157
-#define __NR_sched_yield		158
-#define __NR_sched_get_priority_max	159
-#define __NR_sched_get_priority_min	160
-#define __NR_sched_rr_get_interval	161
-#define __NR_nanosleep		162
-#define __NR_mremap		163
-#define __NR_table		188
-
-/* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name)); \
-if (__res >= 0) \
-	return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
-#define _syscall1(type,name,type1,arg1) \
-type name(type1 arg1) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1))); \
-if (__res >= 0) \
-	return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name(type1 arg1,type2 arg2) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2))); \
-if (__res >= 0) \
-	return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type name(type1 arg1,type2 arg2,type3 arg3) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
-		  "d" ((long)(arg3))); \
-if (__res>=0) \
-	return (type) __res; \
-errno=-__res; \
-return -1; \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
-	  "d" ((long)(arg3)),"S" ((long)(arg4))); \
-if (__res>=0) \
-	return (type) __res; \
-errno=-__res; \
-return -1; \
-}
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-	  type5,arg5) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
-	  "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5))); \
-if (__res>=0) \
-	return (type) __res; \
-errno=-__res; \
-return -1; \
-}
-
-#ifdef __KERNEL_SYSCALLS__
-
-/*
- * we need this inline - forking from kernel space will result
- * in NO COPY ON WRITE (!!!), until an execve is executed. This
- * is no problem, but for the stack. This is handled by not letting
- * main() use the stack at all after fork(). Thus, no function
- * calls - which means inline code for fork too, as otherwise we
- * would use the stack upon exit from 'fork()'.
- *
- * Actually only pause and fork are needed inline, so that there
- * won't be any messing with the stack from main(), but we define
- * some others too.
- */
-#define __NR__exit __NR_exit
-static inline _syscall0(int,idle)
-static inline _syscall0(int,fork)
-static inline _syscall2(int,clone,unsigned long,flags,char *,esp)
-static inline _syscall0(int,pause)
-static inline _syscall0(int,setup)
-static inline _syscall0(int,sync)
-static inline _syscall0(pid_t,setsid)
-static inline _syscall3(int,write,int,fd,const char *,buf,off_t,count)
-static inline _syscall1(int,dup,int,fd)
-static inline _syscall3(int,execve,const char *,file,char **,argv,char **,envp)
-static inline _syscall3(int,open,const char *,file,int,flag,int,mode)
-static inline _syscall1(int,close,int,fd)
-static inline _syscall1(int,_exit,int,exitcode)
-static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
-
-static inline pid_t wait(int * wait_stat)
-{
-	return waitpid(-1,wait_stat,0);
-}
-
-/*
- * This is the mechanism for creating a new kernel thread.
- *
- * NOTE! Only a kernel-only process(ie the swapper or direct descendants
- * who haven't done an "execve()") should use this: it will work within
- * a system call from a "real" process, but the process memory space will
- * not be free'd until both the parent and the child have exited.
- */
-static inline pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
-{
-	long retval;
-
-	__asm__ __volatile__(
-		"movl %%esp,%%esi\n\t"
-		"int $0x80\n\t"		/* Linux/i386 system call */
-		"cmpl %%esp,%%esi\n\t"	/* child or parent? */
-		"je 1f\n\t"		/* parent - jump */
-		"pushl %3\n\t"		/* push argument */
-		"call *%4\n\t"		/* call fn */
-		"movl %2,%0\n\t"	/* exit */
-		"int $0x80\n"
-		"1:\t"
-		:"=a" (retval)
-		:"0" (__NR_clone), "i" (__NR_exit),
-		 "r" (arg), "r" (fn),
-		 "b" (flags | CLONE_VM)
-		:"si");
-	return retval;
-}
-
-#endif
-
-#endif /* _ASM_I386_UNISTD_H_ */
--- a/kernel/table20/version.h
+++ b/kernel/table20/version.h
@@ -1 +0,0 @@
-#define _TABLE_VERSION	1
--- a/kernel/table21/.cvsignore
+++ b/kernel/table21/.cvsignore
@@ -1,4 +0,0 @@
-kernel.patch
-.main.o.flags
-.table.o.flags
-.module.o.flags
--- a/kernel/table21/Makefile
+++ b/kernel/table21/Makefile
@@ -1,16 +0,0 @@
-#
-# Makefile for the linux system information tables.
-#
-# 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 := table.o
-OX_OBJS  := main.o
-
-M_TARGET := table_mod.o
-MX_OBJS  := module.o
-
-include $(TOPDIR)/Rules.make
--- a/kernel/table21/README
+++ b/kernel/table21/README
@@ -1,21 +0,0 @@
-This is a new system call `table ()' for the Linux table. It is faster
-than reading from /proc and can be used to fetch all information required
-for libgtop until whe have some other function (extended sysctl, ...) in
-standard kernels.
-
-I didn't want to change sysctl or some other function myself cause this may
-cause other applications relying upon those function to fail. This is
-something for the ``real'' kernel gurus ...
-
-To use this new system call for libgtop, do the following:
-
-* Copy this directory to /usr/src/linux/table
-* Make /usr/src/linux/include/linux/table.h symlink to /usr/src/linux/table/table.h
-* Apply the patch `kernel.patch' to the kernel, compile, install and reboot
-* Recompile libgtop (remove `config.cache' and run the `autogen.sh' again).
-
-If you want to change and/or add something - feel free to do so !
-
-Have fun,
-
-Martin
--- a/kernel/table21/entry-i386.S
+++ b/kernel/table21/entry-i386.S
@@ -1,571 +0,0 @@
-/*
- *  linux/arch/i386/entry.S
- *
- *  Copyright (C) 1991, 1992  Linus Torvalds
- */
-
-/*
- * entry.S contains the system-call and fault low-level handling routines.
- * This also contains the timer-interrupt handler, as well as all interrupts
- * and faults that can result in a task-switch.
- *
- * NOTE: This code handles signal-recognition, which happens every time
- * after a timer-interrupt and after each system call.
- *
- * I changed all the .align's to 4 (16 byte alignment), as that's faster
- * on a 486.
- *
- * Stack layout in 'ret_from_system_call':
- * 	ptrace needs to have all regs on the stack.
- *	if the order here is changed, it needs to be
- *	updated in fork.c:copy_process, signal.c:do_signal,
- *	ptrace.c and ptrace.h
- *
- *	 0(%esp) - %ebx
- *	 4(%esp) - %ecx
- *	 8(%esp) - %edx
- *       C(%esp) - %esi
- *	10(%esp) - %edi
- *	14(%esp) - %ebp
- *	18(%esp) - %eax
- *	1C(%esp) - %ds
- *	20(%esp) - %es
- *	24(%esp) - orig_eax
- *	28(%esp) - %eip
- *	2C(%esp) - %cs
- *	30(%esp) - %eflags
- *	34(%esp) - %oldesp
- *	38(%esp) - %oldss
- *
- * "current" is in register %ebx during any slow entries.
- */
-
-#include <linux/sys.h>
-#include <linux/linkage.h>
-#include <asm/segment.h>
-#define ASSEMBLY
-#include <asm/smp.h>
-
-EBX		= 0x00
-ECX		= 0x04
-EDX		= 0x08
-ESI		= 0x0C
-EDI		= 0x10
-EBP		= 0x14
-EAX		= 0x18
-DS		= 0x1C
-ES		= 0x20
-ORIG_EAX	= 0x24
-EIP		= 0x28
-CS		= 0x2C
-EFLAGS		= 0x30
-OLDESP		= 0x34
-OLDSS		= 0x38
-
-CF_MASK		= 0x00000001
-IF_MASK		= 0x00000200
-NT_MASK		= 0x00004000
-VM_MASK		= 0x00020000
-
-/*
- * these are offsets into the task-struct.
- */
-state		=  0
-flags		=  4
-sigpending	=  8
-addr_limit	= 12
-exec_domain	= 16
-need_resched	= 20
-
-ENOSYS = 38
-
-
-#define SAVE_ALL \
-	cld; \
-	pushl %es; \
-	pushl %ds; \
-	pushl %eax; \
-	pushl %ebp; \
-	pushl %edi; \
-	pushl %esi; \
-	pushl %edx; \
-	pushl %ecx; \
-	pushl %ebx; \
-	movl $(__KERNEL_DS),%edx; \
-	movl %dx,%ds; \
-	movl %dx,%es;
-
-#define RESTORE_ALL	\
-	popl %ebx;	\
-	popl %ecx;	\
-	popl %edx;	\
-	popl %esi;	\
-	popl %edi;	\
-	popl %ebp;	\
-	popl %eax;	\
-1:	popl %ds;	\
-2:	popl %es;	\
-3:	addl $4,%esp;	\
-	iret;		\
-.section fixup,"ax";	\
-4:	pushl $0;	\
-	popl %ds;	\
-	jmp 2b;		\
-5:	pushl $0;	\
-	popl %es;	\
-	jmp 3b;		\
-.previous;		\
-.section __ex_table,"a";\
-	.align 4;	\
-	.long 1b,4b;	\
-	.long 2b,5b;	\
-.previous
-
-#define GET_CURRENT(reg) \
-	movl %esp, reg; \
-	andl $-8192, reg;
-
-ENTRY(lcall7)
-	pushfl			# We get a different stack layout with call gates,
-	pushl %eax		# which has to be cleaned up later..
-	SAVE_ALL
-	movl EIP(%esp),%eax	# due to call gates, this is eflags, not eip..
-	movl CS(%esp),%edx	# this is eip..
-	movl EFLAGS(%esp),%ecx	# and this is cs..
-	movl %eax,EFLAGS(%esp)	#
-	movl %edx,EIP(%esp)	# Now we move them to their "normal" places
-	movl %ecx,CS(%esp)	#
-	movl %esp,%ebx
-	pushl %ebx
-	andl $-8192,%ebx	# GET_CURRENT
-	movl exec_domain(%ebx),%edx	# Get the execution domain
-	movl 4(%edx),%edx	# Get the lcall7 handler for the domain
-	call *%edx
-	popl %eax
-	jmp ret_from_sys_call
-
-
-#ifdef __SMP__
-	ALIGN
-	.globl	ret_from_smpfork
-ret_from_smpfork:
-	GET_CURRENT(%ebx)
-	btrl	$0, SYMBOL_NAME(scheduler_lock)
-	jmp	ret_from_sys_call
-#endif /* __SMP__ */
-
-/*
- * Return to user mode is not as complex as all this looks,
- * but we want the default path for a system call return to
- * go as quickly as possible which is why some of this is
- * less clear than it otherwise should be.
- */
-
-ENTRY(system_call)
-	pushl %eax			# save orig_eax
-	SAVE_ALL
-	GET_CURRENT(%ebx)
-	cmpl $(NR_syscalls),%eax
-	jae badsys
-	testb $0x20,flags(%ebx)		# PF_TRACESYS
-	jne tracesys
-	call *SYMBOL_NAME(sys_call_table)(,%eax,4)
-	movl %eax,EAX(%esp)		# save the return value
-	ALIGN
-	.globl ret_from_sys_call
-	.globl ret_from_intr
-ret_from_sys_call:
-	movl SYMBOL_NAME(bh_mask),%eax
-	andl SYMBOL_NAME(bh_active),%eax
-	jne handle_bottom_half
-ret_with_reschedule:
-	cmpl $0,need_resched(%ebx)
-	jne reschedule
-	cmpl $0,sigpending(%ebx)
-	jne signal_return
-	RESTORE_ALL
-	ALIGN
-signal_return:
-	testl $(VM_MASK),EFLAGS(%esp)
-	pushl %esp
-	jne v86_signal_return
-	pushl $0
-	call SYMBOL_NAME(do_signal)
-	addl $8,%esp
-	RESTORE_ALL
-	ALIGN
-v86_signal_return:
-	call SYMBOL_NAME(save_v86_state)
-	movl %eax,%esp
-	pushl %eax
-	pushl $0
-	call SYMBOL_NAME(do_signal)
-	addl $8,%esp
-	RESTORE_ALL
-	ALIGN
-tracesys:
-	movl $-ENOSYS,EAX(%esp)
-	call SYMBOL_NAME(syscall_trace)
-	movl ORIG_EAX(%esp),%eax
-	call *SYMBOL_NAME(sys_call_table)(,%eax,4)
-	movl %eax,EAX(%esp)		# save the return value
-	call SYMBOL_NAME(syscall_trace)
-	jmp ret_from_sys_call
-badsys:
-	movl $-ENOSYS,EAX(%esp)
-	jmp ret_from_sys_call
-
-	ALIGN
-ret_from_exception:
-	movl SYMBOL_NAME(bh_mask),%eax
-	andl SYMBOL_NAME(bh_active),%eax
-	jne handle_bottom_half
-	ALIGN
-ret_from_intr:
-	GET_CURRENT(%ebx)
-	movl EFLAGS(%esp),%eax		# mix EFLAGS and CS
-	movb CS(%esp),%al
-	testl $(VM_MASK | 3),%eax	# return to VM86 mode or non-supervisor?
-	jne ret_with_reschedule
-	RESTORE_ALL
-
-	ALIGN
-handle_bottom_half:
-	pushl $ret_from_intr
-	jmp SYMBOL_NAME(do_bottom_half)
-
-	ALIGN
-reschedule:
-	pushl $ret_from_sys_call
-	jmp SYMBOL_NAME(schedule)    # test
-
-
-ENTRY(divide_error)
-	pushl $0		# no error code
-	pushl $ SYMBOL_NAME(do_divide_error)
-	ALIGN
-error_code:
-	pushl %ds
-	pushl %eax
-	xorl %eax,%eax
-	pushl %ebp
-	pushl %edi
-	pushl %esi
-	pushl %edx
-	decl %eax			# eax = -1
-	pushl %ecx
-	pushl %ebx
-#if 1
-	xorl %ecx,%ecx			# zero ecx
-	cld
-	mov %es,%cx			# get the lower order bits of es
-#else
-	cld
-# Some older processors leave the top 16 bits of the 32 bit destination
-# register undefined, rather than zeroed in the following instruction.
-# This won't matter when restoring or loading a segment register from the
-# stack.  It may be a problem if any code reads the full 32 bit value.
-# dosemu? kernel?  Would somebody like to verify that this way is really OK?
-	movl %es,%cx
-#endif
-	xchgl %eax, ORIG_EAX(%esp)	# orig_eax (get the error code. )
-	movl %esp,%edx
-	xchgl %ecx, ES(%esp)		# get the address and save es.
-	pushl %eax			# push the error code
-	pushl %edx
-	movl $(__KERNEL_DS),%edx
-	movl %dx,%ds
-	movl %dx,%es
-	GET_CURRENT(%ebx)
-	call *%ecx
-	addl $8,%esp
-	jmp ret_from_exception
-
-ENTRY(coprocessor_error)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_coprocessor_error)
-	jmp error_code
-
-ENTRY(device_not_available)
-	pushl $-1		# mark this as an int
-	SAVE_ALL
-	GET_CURRENT(%ebx)
-	pushl $ret_from_exception
-	movl %cr0,%eax
-	testl $0x4,%eax			# EM (math emulation bit)
-	je SYMBOL_NAME(math_state_restore)
-	pushl $0		# temporary storage for ORIG_EIP
-	call  SYMBOL_NAME(math_emulate)
-	addl $4,%esp
-	ret
-
-ENTRY(debug)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_debug)
-	jmp error_code
-
-ENTRY(nmi)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_nmi)
-	jmp error_code
-
-ENTRY(int3)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_int3)
-	jmp error_code
-
-ENTRY(overflow)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_overflow)
-	jmp error_code
-
-ENTRY(bounds)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_bounds)
-	jmp error_code
-
-ENTRY(invalid_op)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_invalid_op)
-	jmp error_code
-
-ENTRY(coprocessor_segment_overrun)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_coprocessor_segment_overrun)
-	jmp error_code
-
-ENTRY(reserved)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_reserved)
-	jmp error_code
-
-ENTRY(double_fault)
-	pushl $ SYMBOL_NAME(do_double_fault)
-	jmp error_code
-
-ENTRY(invalid_TSS)
-	pushl $ SYMBOL_NAME(do_invalid_TSS)
-	jmp error_code
-
-ENTRY(segment_not_present)
-	pushl $ SYMBOL_NAME(do_segment_not_present)
-	jmp error_code
-
-ENTRY(stack_segment)
-	pushl $ SYMBOL_NAME(do_stack_segment)
-	jmp error_code
-
-ENTRY(general_protection)
-	pushl $ SYMBOL_NAME(do_general_protection)
-	jmp error_code
-
-ENTRY(alignment_check)
-	pushl $ SYMBOL_NAME(do_alignment_check)
-	jmp error_code
-
-ENTRY(page_fault)
-	pushl $ SYMBOL_NAME(do_page_fault)
-	jmp error_code
-
-ENTRY(spurious_interrupt_bug)
-	pushl $0
-	pushl $ SYMBOL_NAME(do_spurious_interrupt_bug)
-	jmp error_code
-
-.data
-ENTRY(sys_call_table)
-	.long SYMBOL_NAME(sys_setup)		/* 0 */
-	.long SYMBOL_NAME(sys_exit)
-	.long SYMBOL_NAME(sys_fork)
-	.long SYMBOL_NAME(sys_read)
-	.long SYMBOL_NAME(sys_write)
-	.long SYMBOL_NAME(sys_open)		/* 5 */
-	.long SYMBOL_NAME(sys_close)
-	.long SYMBOL_NAME(sys_waitpid)
-	.long SYMBOL_NAME(sys_creat)
-	.long SYMBOL_NAME(sys_link)
-	.long SYMBOL_NAME(sys_unlink)		/* 10 */
-	.long SYMBOL_NAME(sys_execve)
-	.long SYMBOL_NAME(sys_chdir)
-	.long SYMBOL_NAME(sys_time)
-	.long SYMBOL_NAME(sys_mknod)
-	.long SYMBOL_NAME(sys_chmod)		/* 15 */
-	.long SYMBOL_NAME(sys_lchown)
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old break syscall holder */
-	.long SYMBOL_NAME(sys_stat)
-	.long SYMBOL_NAME(sys_lseek)
-	.long SYMBOL_NAME(sys_getpid)		/* 20 */
-	.long SYMBOL_NAME(sys_mount)
-	.long SYMBOL_NAME(sys_umount)
-	.long SYMBOL_NAME(sys_setuid)
-	.long SYMBOL_NAME(sys_getuid)
-	.long SYMBOL_NAME(sys_stime)		/* 25 */
-	.long SYMBOL_NAME(sys_ptrace)
-	.long SYMBOL_NAME(sys_alarm)
-	.long SYMBOL_NAME(sys_fstat)
-	.long SYMBOL_NAME(sys_pause)
-	.long SYMBOL_NAME(sys_utime)		/* 30 */
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old stty syscall holder */
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old gtty syscall holder */
-	.long SYMBOL_NAME(sys_access)
-	.long SYMBOL_NAME(sys_nice)
-	.long SYMBOL_NAME(sys_ni_syscall)	/* 35 */		/* old ftime syscall holder */
-	.long SYMBOL_NAME(sys_sync)
-	.long SYMBOL_NAME(sys_kill)
-	.long SYMBOL_NAME(sys_rename)
-	.long SYMBOL_NAME(sys_mkdir)
-	.long SYMBOL_NAME(sys_rmdir)		/* 40 */
-	.long SYMBOL_NAME(sys_dup)
-	.long SYMBOL_NAME(sys_pipe)
-	.long SYMBOL_NAME(sys_times)
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old prof syscall holder */
-	.long SYMBOL_NAME(sys_brk)		/* 45 */
-	.long SYMBOL_NAME(sys_setgid)
-	.long SYMBOL_NAME(sys_getgid)
-	.long SYMBOL_NAME(sys_signal)
-	.long SYMBOL_NAME(sys_geteuid)
-	.long SYMBOL_NAME(sys_getegid)		/* 50 */
-	.long SYMBOL_NAME(sys_acct)
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old phys syscall holder */
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old lock syscall holder */
-	.long SYMBOL_NAME(sys_ioctl)
-	.long SYMBOL_NAME(sys_fcntl)		/* 55 */
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old mpx syscall holder */
-	.long SYMBOL_NAME(sys_setpgid)
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old ulimit syscall holder */
-	.long SYMBOL_NAME(sys_olduname)
-	.long SYMBOL_NAME(sys_umask)		/* 60 */
-	.long SYMBOL_NAME(sys_chroot)
-	.long SYMBOL_NAME(sys_ustat)
-	.long SYMBOL_NAME(sys_dup2)
-	.long SYMBOL_NAME(sys_getppid)
-	.long SYMBOL_NAME(sys_getpgrp)		/* 65 */
-	.long SYMBOL_NAME(sys_setsid)
-	.long SYMBOL_NAME(sys_sigaction)
-	.long SYMBOL_NAME(sys_sgetmask)
-	.long SYMBOL_NAME(sys_ssetmask)
-	.long SYMBOL_NAME(sys_setreuid)		/* 70 */
-	.long SYMBOL_NAME(sys_setregid)
-	.long SYMBOL_NAME(sys_sigsuspend)
-	.long SYMBOL_NAME(sys_sigpending)
-	.long SYMBOL_NAME(sys_sethostname)
-	.long SYMBOL_NAME(sys_setrlimit)	/* 75 */
-	.long SYMBOL_NAME(sys_getrlimit)
-	.long SYMBOL_NAME(sys_getrusage)
-	.long SYMBOL_NAME(sys_gettimeofday)
-	.long SYMBOL_NAME(sys_settimeofday)
-	.long SYMBOL_NAME(sys_getgroups)	/* 80 */
-	.long SYMBOL_NAME(sys_setgroups)
-	.long SYMBOL_NAME(old_select)
-	.long SYMBOL_NAME(sys_symlink)
-	.long SYMBOL_NAME(sys_lstat)
-	.long SYMBOL_NAME(sys_readlink)		/* 85 */
-	.long SYMBOL_NAME(sys_uselib)
-	.long SYMBOL_NAME(sys_swapon)
-	.long SYMBOL_NAME(sys_reboot)
-	.long SYMBOL_NAME(old_readdir)
-	.long SYMBOL_NAME(old_mmap)		/* 90 */
-	.long SYMBOL_NAME(sys_munmap)
-	.long SYMBOL_NAME(sys_truncate)
-	.long SYMBOL_NAME(sys_ftruncate)
-	.long SYMBOL_NAME(sys_fchmod)
-	.long SYMBOL_NAME(sys_fchown)		/* 95 */
-	.long SYMBOL_NAME(sys_getpriority)
-	.long SYMBOL_NAME(sys_setpriority)
-	.long SYMBOL_NAME(sys_ni_syscall)				/* old profil syscall holder */
-	.long SYMBOL_NAME(sys_statfs)
-	.long SYMBOL_NAME(sys_fstatfs)		/* 100 */
-	.long SYMBOL_NAME(sys_ioperm)
-	.long SYMBOL_NAME(sys_socketcall)
-	.long SYMBOL_NAME(sys_syslog)
-	.long SYMBOL_NAME(sys_setitimer)
-	.long SYMBOL_NAME(sys_getitimer)	/* 105 */
-	.long SYMBOL_NAME(sys_newstat)
-	.long SYMBOL_NAME(sys_newlstat)
-	.long SYMBOL_NAME(sys_newfstat)
-	.long SYMBOL_NAME(sys_uname)
-	.long SYMBOL_NAME(sys_iopl)		/* 110 */
-	.long SYMBOL_NAME(sys_vhangup)
-	.long SYMBOL_NAME(sys_idle)
-	.long SYMBOL_NAME(sys_vm86old)
-	.long SYMBOL_NAME(sys_wait4)
-	.long SYMBOL_NAME(sys_swapoff)		/* 115 */
-	.long SYMBOL_NAME(sys_sysinfo)
-	.long SYMBOL_NAME(sys_ipc)
-	.long SYMBOL_NAME(sys_fsync)
-	.long SYMBOL_NAME(sys_sigreturn)
-	.long SYMBOL_NAME(sys_clone)		/* 120 */
-	.long SYMBOL_NAME(sys_setdomainname)
-	.long SYMBOL_NAME(sys_newuname)
-	.long SYMBOL_NAME(sys_modify_ldt)
-	.long SYMBOL_NAME(sys_adjtimex)
-	.long SYMBOL_NAME(sys_mprotect)		/* 125 */
-	.long SYMBOL_NAME(sys_sigprocmask)
-	.long SYMBOL_NAME(sys_create_module)
-	.long SYMBOL_NAME(sys_init_module)
-	.long SYMBOL_NAME(sys_delete_module)
-	.long SYMBOL_NAME(sys_get_kernel_syms)	/* 130 */
-	.long SYMBOL_NAME(sys_quotactl)
-	.long SYMBOL_NAME(sys_getpgid)
-	.long SYMBOL_NAME(sys_fchdir)
-	.long SYMBOL_NAME(sys_bdflush)
-	.long SYMBOL_NAME(sys_sysfs)		/* 135 */
-	.long SYMBOL_NAME(sys_personality)
-	.long SYMBOL_NAME(sys_ni_syscall)	/* for afs_syscall */
-	.long SYMBOL_NAME(sys_setfsuid)
-	.long SYMBOL_NAME(sys_setfsgid)
-	.long SYMBOL_NAME(sys_llseek)		/* 140 */
-	.long SYMBOL_NAME(sys_getdents)
-	.long SYMBOL_NAME(sys_select)
-	.long SYMBOL_NAME(sys_flock)
-	.long SYMBOL_NAME(sys_msync)
-	.long SYMBOL_NAME(sys_readv)		/* 145 */
-	.long SYMBOL_NAME(sys_writev)
-	.long SYMBOL_NAME(sys_getsid)
-	.long SYMBOL_NAME(sys_fdatasync)
-	.long SYMBOL_NAME(sys_sysctl)
-	.long SYMBOL_NAME(sys_mlock)		/* 150 */
-	.long SYMBOL_NAME(sys_munlock)
-	.long SYMBOL_NAME(sys_mlockall)
-	.long SYMBOL_NAME(sys_munlockall)
-	.long SYMBOL_NAME(sys_sched_setparam)
-	.long SYMBOL_NAME(sys_sched_getparam)   /* 155 */
-	.long SYMBOL_NAME(sys_sched_setscheduler)
-	.long SYMBOL_NAME(sys_sched_getscheduler)
-	.long SYMBOL_NAME(sys_sched_yield)
-	.long SYMBOL_NAME(sys_sched_get_priority_max)
-	.long SYMBOL_NAME(sys_sched_get_priority_min)  /* 160 */
-	.long SYMBOL_NAME(sys_sched_rr_get_interval)
-	.long SYMBOL_NAME(sys_nanosleep)
-	.long SYMBOL_NAME(sys_mremap)
-	.long SYMBOL_NAME(sys_setresuid)
-	.long SYMBOL_NAME(sys_getresuid)	/* 165 */
-	.long SYMBOL_NAME(sys_vm86)
-	.long SYMBOL_NAME(sys_query_module)
-	.long SYMBOL_NAME(sys_poll)
-	.long SYMBOL_NAME(sys_nfsservctl)
-	.long SYMBOL_NAME(sys_setresgid)	/* 170 */
-	.long SYMBOL_NAME(sys_getresgid)
-	.long SYMBOL_NAME(sys_prctl)
-	.long SYMBOL_NAME(sys_rt_sigreturn)
-	.long SYMBOL_NAME(sys_rt_sigaction)
-	.long SYMBOL_NAME(sys_rt_sigprocmask)	/* 175 */
-	.long SYMBOL_NAME(sys_rt_sigpending)
-	.long SYMBOL_NAME(sys_rt_sigtimedwait)
-	.long SYMBOL_NAME(sys_rt_sigqueueinfo)
-	.long SYMBOL_NAME(sys_rt_sigsuspend)
-	.long SYMBOL_NAME(sys_pread)		/* 180 */
-	.long SYMBOL_NAME(sys_pwrite)
-	.long SYMBOL_NAME(sys_chown)
-	.long SYMBOL_NAME(sys_getcwd)
-	.long SYMBOL_NAME(sys_capget)
-	.long SYMBOL_NAME(sys_capset)           /* 185 */
-	.long SYMBOL_NAME(sys_sigaltstack)
-	.long SYMBOL_NAME(sys_sendfile)
-	.long SYMBOL_NAME(sys_ni_syscall)		/* streams1 */
-	.long SYMBOL_NAME(sys_ni_syscall)		/* streams2 */
-	.long SYMBOL_NAME(sys_table)		/* 190 */
-	
-	.rept NR_syscalls-190
-		.long SYMBOL_NAME(sys_ni_syscall)
-	.endr
--- a/kernel/table21/main.c
+++ b/kernel/table21/main.c
@@ -1,61 +0,0 @@
-/*
- * linux/table/table_impl.c
- * Copyright (C) 1998 Martin Baulig
- */
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/kernel_stat.h>
-#include <linux/tty.h>
-#include <linux/user.h>
-#include <linux/a.out.h>
-#include <linux/string.h>
-#include <linux/mman.h>
-#include <linux/proc_fs.h>
-#include <linux/ioport.h>
-#include <linux/config.h>
-#include <linux/mm.h>
-#include <linux/pagemap.h>
-#include <linux/swap.h>
-#include <linux/slab.h>
-#include <linux/smp.h>
-#include <linux/signal.h>
-
-#include <asm/uaccess.h>
-#include <asm/pgtable.h>
-#include <asm/io.h>
-
-#include <linux/module.h>
-#include <linux/table.h>
-
-#include "version.h"
-
-extern void scheduling_functions_start_here(void);
-extern void scheduling_functions_end_here(void);
-
-int (*table_function_ptr) (int, union table *, const void *) = 0;
-
-EXPORT_SYMBOL(table_function_ptr);
-
-EXPORT_SYMBOL(nr_running);
-EXPORT_SYMBOL(pidhash);
-EXPORT_SYMBOL(task);
-EXPORT_SYMBOL(si_swapinfo);
-EXPORT_SYMBOL(scheduling_functions_start_here);
-EXPORT_SYMBOL(scheduling_functions_end_here);
-EXPORT_SYMBOL(avenrun);
-EXPORT_SYMBOL(nr_tasks);
-EXPORT_SYMBOL(last_pid);
-EXPORT_SYMBOL(page_cache_size);
-EXPORT_SYMBOL(init_mm);
-
-asmlinkage int
-sys_table (int type, union table *buf, const void *param)
-{
-	if (table_function_ptr == 0)
-		return -ENOSYS;
-
-	return (*table_function_ptr) (type, buf, param);
-}
--- a/kernel/table21/module.c
+++ b/kernel/table21/module.c
@@ -1,607 +0,0 @@
-/*
- * linux/table/table_impl.c
- * Copyright (C) 1998 Martin Baulig
- */
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/kernel_stat.h>
-#include <linux/tty.h>
-#include <linux/user.h>
-#include <linux/a.out.h>
-#include <linux/string.h>
-#include <linux/mman.h>
-#include <linux/proc_fs.h>
-#include <linux/ioport.h>
-#include <linux/config.h>
-#include <linux/mm.h>
-#include <linux/pagemap.h>
-#include <linux/swap.h>
-#include <linux/slab.h>
-#include <linux/smp.h>
-#include <linux/signal.h>
-
-#include <asm/uaccess.h>
-#include <asm/pgtable.h>
-#include <asm/io.h>
-
-#include <linux/module.h>
-#include <linux/table.h>
-
-#include "version.h"
-
-extern int (*table_function_ptr) (int, union table *, const void *);
-
-int table_fkt (int, union table *, const void *);
-
-EXPORT_NO_SYMBOLS;
-
-int
-init_module(void)
-{
-	printk ("init_module () = %p - %d, %d\n",
-		table_fkt, sizeof (union table), sizeof (sigset_t));
-	table_function_ptr = table_fkt;
-	return 0;
-}
-
-void
-cleanup_module(void)
-{
-	table_function_ptr = 0;
-}
-
-#define LOAD_INT(x) ((x) >> FSHIFT)
-#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
-
-#ifdef CONFIG_DEBUG_MALLOC
-int get_malloc(char * buffer);
-#endif
-
-static void collect_sigign_sigcatch(struct task_struct *p, sigset_t *ign,
-				    sigset_t *catch)
-{
-	struct k_sigaction *k;
-	int i;
-
-	sigemptyset(ign);
-	sigemptyset(catch);
-
-#if 0
-	printk ("collect_sigign_sigcatch: %p - %p\n",
-		p, p->sig);
-#endif
-
-	if (p->sig) {
-		k = p->sig->action;
-		for (i = 1; i <= _NSIG; ++i, ++k) {
-#if 0
-			printk ("signal: %d - %p (%p, %p)\n",
-				i, k->sa.sa_handler, SIG_IGN, SIG_DFL);
-#endif
-			if (k->sa.sa_handler == SIG_IGN)
-				sigaddset(ign, i);
-			else if (k->sa.sa_handler != SIG_DFL)
-				sigaddset(catch, i);
-		}
-	}
-}
-
-/*
- * These bracket the sleeping functions..
- */
-extern void scheduling_functions_start_here(void);
-extern void scheduling_functions_end_here(void);
-#define first_sched	((unsigned long) scheduling_functions_start_here)
-#define last_sched	((unsigned long) scheduling_functions_end_here)
-
-static unsigned long get_wchan(struct task_struct *p)
-{
-	if (!p || p == current || p->state == TASK_RUNNING)
-		return 0;
-#if defined(__i386__)
-	{
-		unsigned long ebp, eip;
-		unsigned long stack_page;
-		int count = 0;
-
-		stack_page = 4096 + (unsigned long)p;
-		if (!stack_page)
-			return 0;
-		ebp = p->tss.ebp;
-		do {
-			if (ebp < stack_page || ebp >= 4092+stack_page)
-				return 0;
-			eip = *(unsigned long *) (ebp+4);
-			if (eip < first_sched || eip >= last_sched)
-				return eip;
-			ebp = *(unsigned long *) ebp;
-		} while (count++ < 16);
-	}
-#elif defined(__alpha__)
-	/*
-	 * This one depends on the frame size of schedule().  Do a
-	 * "disass schedule" in gdb to find the frame size.  Also, the
-	 * code assumes that sleep_on() follows immediately after
-	 * interruptible_sleep_on() and that add_timer() follows
-	 * immediately after interruptible_sleep().  Ugly, isn't it?
-	 * Maybe adding a wchan field to task_struct would be better,
-	 * after all...
-	 */
-	{
-	    unsigned long schedule_frame;
-	    unsigned long pc;
-
-	    pc = thread_saved_pc(&p->tss);
-	    if (pc >= first_sched && pc < last_sched) {
-		schedule_frame = ((unsigned long *)p->tss.ksp)[6];
-		return ((unsigned long *)schedule_frame)[12];
-	    }
-	    return pc;
-	}
-#elif defined(__mc68000__)
-	{
-	    unsigned long fp, pc;
-	    unsigned long stack_page;
-	    int count = 0;
-	    extern int sys_pause (void);
-
-	    stack_page = p->kernel_stack_page;
-	    if (!stack_page)
-		    return 0;
-	    fp = ((struct switch_stack *)p->tss.ksp)->a6;
-	    do {
-		    if (fp < stack_page || fp >= 4088+stack_page)
-			    return 0;
-		    pc = ((unsigned long *)fp)[1];
-		/* FIXME: This depends on the order of these functions. */
-		    if (pc < first_sched || pc >= last_sched)
-		      return pc;
-		    fp = *(unsigned long *) fp;
-	    } while (count++ < 16);
-	}
-#elif defined(__powerpc__)
-	return (p->tss.wchan);
-#elif defined (CONFIG_ARM)
-	{
-		unsigned long fp, lr;
-		unsigned long stack_page;
-		int count = 0;
-
-		stack_page = 4096 + (unsigned long)p;
-		fp = get_css_fp (&p->tss);
-		do {
-			if (fp < stack_page || fp > 4092+stack_page)
-				return 0;
-			lr = pc_pointer (((unsigned long *)fp)[-1]);
-			if (lr < first_sched || lr > last_sched)
-				return lr;
-			fp = *(unsigned long *) (fp - 12);
-		} while (count ++ < 16);
-	}
-#endif
-	return 0;
-}
-
-#if defined(__i386__)
-# define KSTK_EIP(tsk)	(((unsigned long *)(4096+(unsigned long)(tsk)))[1019])
-# define KSTK_ESP(tsk)	(((unsigned long *)(4096+(unsigned long)(tsk)))[1022])
-#elif defined(__alpha__)
-  /*
-   * See arch/alpha/kernel/ptrace.c for details.
-   */
-# define PT_REG(reg)		(PAGE_SIZE - sizeof(struct pt_regs)	\
-				 + (long)&((struct pt_regs *)0)->reg)
-# define KSTK_EIP(tsk) \
-    (*(unsigned long *)(PT_REG(pc) + PAGE_SIZE + (unsigned long)(tsk)))
-# define KSTK_ESP(tsk)	((tsk) == current ? rdusp() : (tsk)->tss.usp)
-#elif defined(CONFIG_ARM)
-# define KSTK_EIP(tsk)	(((unsigned long *)(4096+(unsigned long)(tsk)))[1022])
-# define KSTK_ESP(tsk)	(((unsigned long *)(4096+(unsigned long)(tsk)))[1020])
-#elif defined(__mc68000__)
-#define	KSTK_EIP(tsk)	\
-    ({			\
-	unsigned long eip = 0;	 \
- 	if ((tsk)->tss.esp0 > PAGE_SIZE && \
-	    MAP_NR((tsk)->tss.esp0) < max_mapnr) \
-	      eip = ((struct pt_regs *) (tsk)->tss.esp0)->pc;	 \
-        eip; })
-#define	KSTK_ESP(tsk)	((tsk) == current ? rdusp() : (tsk)->tss.usp)
-#elif defined(__powerpc__)
-#define KSTK_EIP(tsk)	((tsk)->tss.regs->nip)
-#define KSTK_ESP(tsk)	((tsk)->tss.regs->gpr[1])
-#elif defined (__sparc_v9__)
-# define KSTK_EIP(tsk)  ((tsk)->tss.kregs->tpc)
-# define KSTK_ESP(tsk)  ((tsk)->tss.kregs->u_regs[UREG_FP])
-#elif defined(__sparc__)
-# define KSTK_EIP(tsk)  ((tsk)->tss.kregs->pc)
-# define KSTK_ESP(tsk)  ((tsk)->tss.kregs->u_regs[UREG_FP])
-#endif
-
-/* Gcc optimizes away "strlen(x)" for constant x */
-#define ADDBUF(buffer, string) \
-do { memcpy(buffer, string, strlen(string)); \
-     buffer += strlen(string); } while (0)
-
-static inline void statm_pte_range(pmd_t * pmd, unsigned long address, unsigned long size,
-	int * pages, int * shared, int * dirty, int * total)
-{
-	pte_t * pte;
-	unsigned long end;
-
-	if (pmd_none(*pmd))
-		return;
-	if (pmd_bad(*pmd)) {
-		printk("statm_pte_range: bad pmd (%08lx)\n", pmd_val(*pmd));
-		pmd_clear(pmd);
-		return;
-	}
-	pte = pte_offset(pmd, address);
-	address &= ~PMD_MASK;
-	end = address + size;
-	if (end > PMD_SIZE)
-		end = PMD_SIZE;
-	do {
-		pte_t page = *pte;
-
-		address += PAGE_SIZE;
-		pte++;
-		if (pte_none(page))
-			continue;
-		++*total;
-		if (!pte_present(page))
-			continue;
-		++*pages;
-		if (pte_dirty(page))
-			++*dirty;
-		if (MAP_NR(pte_page(page)) >= max_mapnr)
-			continue;
-		if (atomic_read(&mem_map[MAP_NR(pte_page(page))].count) > 1)
-			++*shared;
-	} while (address < end);
-}
-
-static inline void statm_pmd_range(pgd_t * pgd, unsigned long address, unsigned long size,
-	int * pages, int * shared, int * dirty, int * total)
-{
-	pmd_t * pmd;
-	unsigned long end;
-
-	if (pgd_none(*pgd))
-		return;
-	if (pgd_bad(*pgd)) {
-		printk("statm_pmd_range: bad pgd (%08lx)\n", pgd_val(*pgd));
-		pgd_clear(pgd);
-		return;
-	}
-	pmd = pmd_offset(pgd, address);
-	address &= ~PGDIR_MASK;
-	end = address + size;
-	if (end > PGDIR_SIZE)
-		end = PGDIR_SIZE;
-	do {
-		statm_pte_range(pmd, address, end - address, pages, shared, dirty, total);
-		address = (address + PMD_SIZE) & PMD_MASK;
-		pmd++;
-	} while (address < end);
-}
-
-static void statm_pgd_range(pgd_t * pgd, unsigned long address, unsigned long end,
-	int * pages, int * shared, int * dirty, int * total)
-{
-	while (address < end) {
-		statm_pmd_range(pgd, address, end - address, pages, shared, dirty, total);
-		address = (address + PGDIR_SIZE) & PGDIR_MASK;
-		pgd++;
-	}
-}
-
-int
-table_fkt (int type, union table *buf, const void *param)
-{
-	union table tbl;
-	struct sysinfo i;
-	struct task_struct *tsk = NULL;
-	struct proclist_args plistargs;
-	int index, tindex, err, tty;
-	sigset_t sigign, sigcatch;
-	pid_t pid;
-
-	if (type == TABLE_VERSION)
-		return _TABLE_VERSION;
-
-	if (!buf)
-		return -EFAULT;
-
-	memset (&tbl, 0, sizeof (union table));
-
-	/* For TABLE_PROC_*, read pid and get task_struct */
-
-	switch (type) {
-	case TABLE_PROC_UID:
-	case TABLE_PROC_MEM:
-	case TABLE_PROC_SEGMENT:
-	case TABLE_PROC_TIME:
-	case TABLE_PROC_STATE:
-	case TABLE_PROC_SIGNAL:
-	case TABLE_PROC_KERNEL:
-		err = verify_area (VERIFY_READ, param, sizeof (pid_t));
-		if (err)
-			return err;
-		copy_from_user (&pid, param, sizeof (pid_t));
-
-		read_lock (&tasklist_lock);
-		tsk = find_task_by_pid (pid);
-		/* FIXME!! This should be done after the last use */
-		read_unlock(&tasklist_lock);
-
-		if (tsk == NULL)
-			return -ESRCH;
-		break;
-	case TABLE_PROCLIST:
-		err = verify_area (VERIFY_READ, param,
-				   sizeof (struct proclist_args));
-		if (err)
-			return err;
-		copy_from_user (&plistargs, param,
-				sizeof (struct proclist_args));
-		break;
-	}
-
-	/* Main function dispatcher */
-
-	switch (type) {
-	case TABLE_PROCLIST:
-		tsk = task [0];
-		read_lock (&tasklist_lock);
-		for (index = tindex = 0; index < nr_tasks;
-		     index++, tsk = tsk->next_task) {
-			if (tsk->pid == 0) continue;
-			switch (plistargs.which & TABLE_KERN_PROC_MASK) {
-			case TABLE_KERN_PROC_PID:
-				if (tsk->pid != plistargs.arg) continue;
-				break;
-			case TABLE_KERN_PROC_PGRP:
-				if (tsk->pgrp != plistargs.arg) continue;
-				break;
-			case TABLE_KERN_PROC_SESSION:
-				if (tsk->session != plistargs.arg) continue;
-			case TABLE_KERN_PROC_TTY:
-				tty = tsk->tty ?
-					kdev_t_to_nr (tsk->tty->device) : 0;
-				if (tty != plistargs.arg) continue;
-				break;
-			case TABLE_KERN_PROC_UID:
-				if (tsk->uid != plistargs.arg) continue;
-				break;
-			case TABLE_KERN_PROC_RUID:
-				if (tsk->euid != plistargs.arg) continue;
-				break;
-			}
-
-			if ((plistargs.which & TABLE_EXCLUDE_IDLE) &&
-			    (tsk->state != 0))
-				continue;
-
-			if ((plistargs.which & TABLE_EXCLUDE_NOTTY) &&
-			    (tsk->tty == NULL))
-				continue;
-
-			tbl.proclist.pids [tindex++] = tsk->pid;
-		}
-		tbl.proclist.nr_running = nr_running;
-		tbl.proclist.last_pid = last_pid;
-		tbl.proclist.nr_tasks = tindex;
-		read_unlock(&tasklist_lock);
-		break;
-	case TABLE_CPU:
-		tbl.cpu.total = jiffies;
-		tbl.cpu.user  = kstat.cpu_user;
-		tbl.cpu.nice  = kstat.cpu_nice;
-		tbl.cpu.sys   = kstat.cpu_system;
-		tbl.cpu.idle  = tbl.cpu.total -
-			(tbl.cpu.user + tbl.cpu.nice + tbl.cpu.sys);
-		tbl.cpu.frequency = HZ;
-		break;
-	case TABLE_MEM:
-		si_meminfo (&i);
-		tbl.mem.total  = i.totalram;
-		tbl.mem.used   = i.totalram - i.freeram;
-		tbl.mem.free   = i.freeram;
-		tbl.mem.shared = i.sharedram;
-		tbl.mem.buffer = i.bufferram;
-		tbl.mem.cached = page_cache_size << PAGE_SHIFT;
-		break;
-	case TABLE_SWAP:
-		si_swapinfo (&i);
-		tbl.swap.total = i.totalswap;
-		tbl.swap.used  = i.totalswap - i.freeswap;
-		tbl.swap.free  = i.freeswap;
-		break;
-	case TABLE_LOADAVG:
-		tbl.loadavg.loadavg [0] = (double) avenrun [0] / (1 << FSHIFT);
-		tbl.loadavg.loadavg [1] = (double) avenrun [1] / (1 << FSHIFT);
-		tbl.loadavg.loadavg [2] = (double) avenrun [2] / (1 << FSHIFT);
-		tbl.loadavg.nr_running = nr_running;
-		tbl.loadavg.nr_tasks = nr_tasks;
-		tbl.loadavg.last_pid = last_pid;
-		break;
-	case TABLE_UPTIME:
-		tbl.uptime.uptime = jiffies;
-		tbl.uptime.idle   = task[0]->times.tms_utime +
-			task[0]->times.tms_stime;
-		break;
-	case TABLE_PROC_STATE:
-		tbl.proc_state.uid = tsk->uid;
-		tbl.proc_state.gid = tsk->gid;
-		tbl.proc_state.state = tsk->state;
-		tbl.proc_state.flags = tsk->flags;
-		memcpy (tbl.proc_state.comm, tsk->comm,
-			sizeof (tbl.proc_state.comm));
-		break;
-	case TABLE_PROC_UID:
-		tbl.proc_uid.uid = tsk->uid;
-		tbl.proc_uid.euid = tsk->euid;
-		tbl.proc_uid.suid = tsk->suid;
-		tbl.proc_uid.fsuid = tsk->fsuid;
-
-		tbl.proc_uid.gid = tsk->gid;
-		tbl.proc_uid.egid = tsk->egid;
-		tbl.proc_uid.sgid = tsk->sgid;
-		tbl.proc_uid.fsgid = tsk->fsgid;
-
-		tbl.proc_uid.pid = tsk->pid;
-		tbl.proc_uid.pgrp = tsk->pgrp;
-		tbl.proc_uid.ppid = tsk->p_pptr->pid;
-
-		tbl.proc_uid.session = tsk->session;
-	        tbl.proc_uid.tty = tsk->tty ?
-			kdev_t_to_nr (tsk->tty->device) : 0;
-		tbl.proc_uid.tpgid = tsk->tty ? tsk->tty->pgrp : -1;
-
-		tbl.proc_uid.priority = tsk->priority;
-		tbl.proc_uid.counter = tsk->counter;
-		tbl.proc_uid.def_priority = DEF_PRIORITY;
-		break;
-	case TABLE_PROC_SIGNAL:
-		memcpy (&tbl.proc_signal.signal, &tsk->signal,
-			sizeof (tbl.proc_signal.signal));
-
-		memcpy (&tbl.proc_signal.blocked, &tsk->blocked,
-			sizeof (tbl.proc_signal.blocked));
-
-		collect_sigign_sigcatch (tsk, &sigign, &sigcatch);
-
-		memcpy (&tbl.proc_signal.ignored, &sigign,
-			sizeof (tbl.proc_signal.ignored));
-
-		memcpy (&tbl.proc_signal.caught, &sigcatch,
-			sizeof (tbl.proc_signal.caught));
-
-#if 0
-		printk ("PROC_SIGNAL: (%lu, %lu) - (%lu, %lu)\n",
-			tbl.proc_signal.ignored.sig [0],
-			tbl.proc_signal.ignored.sig [1],
-			tbl.proc_signal.caught.sig [0],
-			tbl.proc_signal.caught.sig [1]);
-#endif
-		break;
-	case TABLE_PROC_MEM:
-		if (tsk->mm && tsk->mm != &init_mm) {
-			tbl.proc_mem.context = tsk->mm->context;
-			tbl.proc_mem.start_code = tsk->mm->start_code;
-			tbl.proc_mem.end_code = tsk->mm->end_code;
-			tbl.proc_mem.start_data = tsk->mm-> start_data;
-			tbl.proc_mem.end_data = tsk->mm->end_data;
-			tbl.proc_mem.start_brk = tsk->mm->start_brk;
-			tbl.proc_mem.brk = tsk->mm->brk;
-			tbl.proc_mem.start_stack = tsk->mm->start_stack;
-			tbl.proc_mem.start_mmap = tsk->mm->mmap ?
-				tsk->mm->mmap->vm_start : 0;
-			tbl.proc_mem.arg_start = tsk->mm->arg_start;
-			tbl.proc_mem.arg_end = tsk->mm->arg_end;
-			tbl.proc_mem.env_start = tsk->mm->env_start;
-			tbl.proc_mem.env_end = tsk->mm->env_end;
-			tbl.proc_mem.rss = tsk->mm->rss << PAGE_SHIFT;
-			tbl.proc_mem.total_vm = tsk->mm->total_vm;
-			tbl.proc_mem.locked_vm = tsk->mm->locked_vm;
-		}
-		tbl.proc_mem.rlim = tsk->rlim ? tsk->rlim[RLIMIT_RSS].rlim_cur : 0;
-		break;
-	case TABLE_PROC_SEGMENT:
-		if (tsk->mm && tsk->mm != &init_mm) {
-			unsigned long vsize = 0;
-			int size = 0, resident = 0, share = 0;
-			int trs = 0, lrs = 0, drs = 0, srs = 0, dt = 0;
-			struct vm_area_struct * vma = tsk->mm->mmap;
-
-			while (vma) {
-				pgd_t *pgd = pgd_offset(tsk->mm, vma->vm_start);
-				int pages = 0, shared = 0, dirty = 0, total = 0;
-
-				vsize += vma->vm_end - vma->vm_start;
-
-				statm_pgd_range (pgd, vma->vm_start, vma->vm_end,
-
-						 &pages, &shared, &dirty, &total);
-
-				resident += pages;
-				share += shared;
-				dt += dirty;
-				size += total;
-
-				/* Well, shared library seem to get mapped
-				 * above 0x40000000 and are executable,
-				 * so I use this hack to get their size.
-				 */
-
-				if (vma->vm_flags & VM_GROWSDOWN)
-					srs += pages;	/* stack */
-				else if ((vma->vm_flags & VM_EXEC) &&
-					 (vma->vm_start > 0x40000000))
-					lrs += pages;	/* library */
-				else if (vma->vm_flags & VM_EXECUTABLE)
-					trs += pages;	/* text */
-				else
-					drs += pages;
-
-				vma = vma->vm_next;
-			}
-
-			tbl.proc_segment.vsize = vsize;
-			tbl.proc_segment.size = size << PAGE_SHIFT;
-			tbl.proc_segment.resident = resident << PAGE_SHIFT;
-			tbl.proc_segment.shared = share << PAGE_SHIFT;
-			tbl.proc_segment.trs = trs << PAGE_SHIFT;
-			tbl.proc_segment.lrs = lrs << PAGE_SHIFT;
-			tbl.proc_segment.drs = drs << PAGE_SHIFT;
-			tbl.proc_segment.srs = srs << PAGE_SHIFT;
-			tbl.proc_segment.dt = dt << PAGE_SHIFT;
-		}
-		break;
-	case TABLE_PROC_TIME:
-		tbl.proc_time.utime = tsk->times.tms_utime;
-		tbl.proc_time.stime = tsk->times.tms_stime;
-		tbl.proc_time.cutime = tsk->times.tms_cutime;
-		tbl.proc_time.cstime = tsk->times.tms_cstime;
-
-		tbl.proc_time.start_time = tsk->start_time;
-		tbl.proc_time.timeout = tsk->timeout;
-		tbl.proc_time.policy = tsk->policy;
-		tbl.proc_time.rt_priority = tsk->rt_priority;
-
-		tbl.proc_time.it_real_value = tsk->it_real_value;
-		tbl.proc_time.it_prof_value = tsk->it_prof_value;
-		tbl.proc_time.it_virt_value = tsk->it_virt_value;
-		tbl.proc_time.it_real_incr = tsk->it_real_incr;
-		tbl.proc_time.it_prof_incr = tsk->it_prof_incr;
-		tbl.proc_time.it_virt_incr = tsk->it_virt_incr;
-		break;
-	case TABLE_PROC_KERNEL:
-		tbl.proc_kernel.min_flt = tsk->min_flt;
-		tbl.proc_kernel.cmin_flt = tsk->cmin_flt;
-		tbl.proc_kernel.maj_flt = tsk->maj_flt;
-		tbl.proc_kernel.cmaj_flt = tsk->cmaj_flt;
-
-		tbl.proc_kernel.kesp = KSTK_ESP(tsk);
-		tbl.proc_kernel.keip = KSTK_EIP(tsk);
-
-		tbl.proc_kernel.nswap = tsk->nswap;
-		tbl.proc_kernel.cnswap = tsk->cnswap;
-
-		tbl.proc_kernel.wchan = get_wchan (tsk);
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	err = verify_area (VERIFY_WRITE, buf, sizeof (struct table));
-	if (err)
-		return err;
-
-	copy_to_user (buf, &tbl, sizeof (union table));
-
-	return 0;
-}
--- a/kernel/table21/unistd-i386.h
+++ b/kernel/table21/unistd-i386.h
@@ -1,344 +0,0 @@
-#ifndef _ASM_I386_UNISTD_H_
-#define _ASM_I386_UNISTD_H_
-
-/*
- * This file contains the system call numbers.
- */
-
-#define __NR_setup		  0	/* used only by init, to get system going */
-#define __NR_exit		  1
-#define __NR_fork		  2
-#define __NR_read		  3
-#define __NR_write		  4
-#define __NR_open		  5
-#define __NR_close		  6
-#define __NR_waitpid		  7
-#define __NR_creat		  8
-#define __NR_link		  9
-#define __NR_unlink		 10
-#define __NR_execve		 11
-#define __NR_chdir		 12
-#define __NR_time		 13
-#define __NR_mknod		 14
-#define __NR_chmod		 15
-#define __NR_lchown		 16
-#define __NR_break		 17
-#define __NR_oldstat		 18
-#define __NR_lseek		 19
-#define __NR_getpid		 20
-#define __NR_mount		 21
-#define __NR_umount		 22
-#define __NR_setuid		 23
-#define __NR_getuid		 24
-#define __NR_stime		 25
-#define __NR_ptrace		 26
-#define __NR_alarm		 27
-#define __NR_oldfstat		 28
-#define __NR_pause		 29
-#define __NR_utime		 30
-#define __NR_stty		 31
-#define __NR_gtty		 32
-#define __NR_access		 33
-#define __NR_nice		 34
-#define __NR_ftime		 35
-#define __NR_sync		 36
-#define __NR_kill		 37
-#define __NR_rename		 38
-#define __NR_mkdir		 39
-#define __NR_rmdir		 40
-#define __NR_dup		 41
-#define __NR_pipe		 42
-#define __NR_times		 43
-#define __NR_prof		 44
-#define __NR_brk		 45
-#define __NR_setgid		 46
-#define __NR_getgid		 47
-#define __NR_signal		 48
-#define __NR_geteuid		 49
-#define __NR_getegid		 50
-#define __NR_acct		 51
-#define __NR_phys		 52
-#define __NR_lock		 53
-#define __NR_ioctl		 54
-#define __NR_fcntl		 55
-#define __NR_mpx		 56
-#define __NR_setpgid		 57
-#define __NR_ulimit		 58
-#define __NR_oldolduname	 59
-#define __NR_umask		 60
-#define __NR_chroot		 61
-#define __NR_ustat		 62
-#define __NR_dup2		 63
-#define __NR_getppid		 64
-#define __NR_getpgrp		 65
-#define __NR_setsid		 66
-#define __NR_sigaction		 67
-#define __NR_sgetmask		 68
-#define __NR_ssetmask		 69
-#define __NR_setreuid		 70
-#define __NR_setregid		 71
-#define __NR_sigsuspend		 72
-#define __NR_sigpending		 73
-#define __NR_sethostname	 74
-#define __NR_setrlimit		 75
-#define __NR_getrlimit		 76
-#define __NR_getrusage		 77
-#define __NR_gettimeofday	 78
-#define __NR_settimeofday	 79
-#define __NR_getgroups		 80
-#define __NR_setgroups		 81
-#define __NR_select		 82
-#define __NR_symlink		 83
-#define __NR_oldlstat		 84
-#define __NR_readlink		 85
-#define __NR_uselib		 86
-#define __NR_swapon		 87
-#define __NR_reboot		 88
-#define __NR_readdir		 89
-#define __NR_mmap		 90
-#define __NR_munmap		 91
-#define __NR_truncate		 92
-#define __NR_ftruncate		 93
-#define __NR_fchmod		 94
-#define __NR_fchown		 95
-#define __NR_getpriority	 96
-#define __NR_setpriority	 97
-#define __NR_profil		 98
-#define __NR_statfs		 99
-#define __NR_fstatfs		100
-#define __NR_ioperm		101
-#define __NR_socketcall		102
-#define __NR_syslog		103
-#define __NR_setitimer		104
-#define __NR_getitimer		105
-#define __NR_stat		106
-#define __NR_lstat		107
-#define __NR_fstat		108
-#define __NR_olduname		109
-#define __NR_iopl		110
-#define __NR_vhangup		111
-#define __NR_idle		112
-#define __NR_vm86old		113
-#define __NR_wait4		114
-#define __NR_swapoff		115
-#define __NR_sysinfo		116
-#define __NR_ipc		117
-#define __NR_fsync		118
-#define __NR_sigreturn		119
-#define __NR_clone		120
-#define __NR_setdomainname	121
-#define __NR_uname		122
-#define __NR_modify_ldt		123
-#define __NR_adjtimex		124
-#define __NR_mprotect		125
-#define __NR_sigprocmask	126
-#define __NR_create_module	127
-#define __NR_init_module	128
-#define __NR_delete_module	129
-#define __NR_get_kernel_syms	130
-#define __NR_quotactl		131
-#define __NR_getpgid		132
-#define __NR_fchdir		133
-#define __NR_bdflush		134
-#define __NR_sysfs		135
-#define __NR_personality	136
-#define __NR_afs_syscall	137 /* Syscall for Andrew File System */
-#define __NR_setfsuid		138
-#define __NR_setfsgid		139
-#define __NR__llseek		140
-#define __NR_getdents		141
-#define __NR__newselect		142
-#define __NR_flock		143
-#define __NR_msync		144
-#define __NR_readv		145
-#define __NR_writev		146
-#define __NR_getsid		147
-#define __NR_fdatasync		148
-#define __NR__sysctl		149
-#define __NR_mlock		150
-#define __NR_munlock		151
-#define __NR_mlockall		152
-#define __NR_munlockall		153
-#define __NR_sched_setparam		154
-#define __NR_sched_getparam		155
-#define __NR_sched_setscheduler		156
-#define __NR_sched_getscheduler		157
-#define __NR_sched_yield		158
-#define __NR_sched_get_priority_max	159
-#define __NR_sched_get_priority_min	160
-#define __NR_sched_rr_get_interval	161
-#define __NR_nanosleep		162
-#define __NR_mremap		163
-#define __NR_setresuid		164
-#define __NR_getresuid		165
-#define __NR_vm86		166
-#define __NR_query_module	167
-#define __NR_poll		168
-#define __NR_nfsservctl		169
-#define __NR_setresgid		170
-#define __NR_getresgid		171
-#define __NR_prctl              172
-#define __NR_rt_sigreturn	173
-#define __NR_rt_sigaction	174
-#define __NR_rt_sigprocmask	175
-#define __NR_rt_sigpending	176
-#define __NR_rt_sigtimedwait	177
-#define __NR_rt_sigqueueinfo	178
-#define __NR_rt_sigsuspend	179
-#define __NR_pread		180
-#define __NR_pwrite		181
-#define __NR_chown		182
-#define __NR_getcwd		183
-#define __NR_capget		184
-#define __NR_capset		185
-#define __NR_sigaltstack	186
-#define __NR_sendfile		187
-#define __NR_streams1		188	/* some people actually want it */
-#define __NR_streams2		189	/* some people actually want it */
-#define __NR_table		190
-
-/* user-visible error numbers are in the range -1 - -122: see <asm-i386/errno.h> */
-
-#define __syscall_return(type, res) \
-do { \
-	if ((unsigned long)(res) >= (unsigned long)(-125)) { \
-		errno = -(res); \
-		res = -1; \
-	} \
-	return (type) (res); \
-} while (0)
-
-/* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name)); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall1(type,name,type1,arg1) \
-type name(type1 arg1) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1))); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name(type1 arg1,type2 arg2) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2))); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type name(type1 arg1,type2 arg2,type3 arg3) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
-		  "d" ((long)(arg3))); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
-	  "d" ((long)(arg3)),"S" ((long)(arg4))); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-	  type5,arg5) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-	: "=a" (__res) \
-	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
-	  "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5))); \
-__syscall_return(type,__res); \
-}
-
-#ifdef __KERNEL_SYSCALLS__
-
-/*
- * we need this inline - forking from kernel space will result
- * in NO COPY ON WRITE (!!!), until an execve is executed. This
- * is no problem, but for the stack. This is handled by not letting
- * main() use the stack at all after fork(). Thus, no function
- * calls - which means inline code for fork too, as otherwise we
- * would use the stack upon exit from 'fork()'.
- *
- * Actually only pause and fork are needed inline, so that there
- * won't be any messing with the stack from main(), but we define
- * some others too.
- */
-#define __NR__exit __NR_exit
-static inline _syscall0(int,idle)
-static inline _syscall0(int,pause)
-static inline _syscall1(int,setup,int,magic)
-static inline _syscall0(int,sync)
-static inline _syscall0(pid_t,setsid)
-static inline _syscall3(int,write,int,fd,const char *,buf,off_t,count)
-static inline _syscall3(int,read,int,fd,char *,buf,off_t,count)
-static inline _syscall3(off_t,lseek,int,fd,off_t,offset,int,count)
-static inline _syscall1(int,dup,int,fd)
-static inline _syscall3(int,execve,const char *,file,char **,argv,char **,envp)
-static inline _syscall3(int,open,const char *,file,int,flag,int,mode)
-static inline _syscall1(int,close,int,fd)
-static inline _syscall1(int,_exit,int,exitcode)
-static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
-static inline _syscall1(int,delete_module,const char *,name)
-
-static inline pid_t wait(int * wait_stat)
-{
-	return waitpid(-1,wait_stat,0);
-}
-
-/*
- * This is the mechanism for creating a new kernel thread.
- *
- * NOTE! Only a kernel-only process(ie the swapper or direct descendants
- * who haven't done an "execve()") should use this: it will work within
- * a system call from a "real" process, but the process memory space will
- * not be free'd until both the parent and the child have exited.
- */
-static inline pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
-{
-	long retval;
-
-	__asm__ __volatile__(
-		"movl %%esp,%%esi\n\t"
-		"int $0x80\n\t"		/* Linux/i386 system call */
-		"cmpl %%esp,%%esi\n\t"	/* child or parent? */
-		"je 1f\n\t"		/* parent - jump */
-		"pushl %3\n\t"		/* push argument */
-		"call *%4\n\t"		/* call fn */
-		"movl %2,%0\n\t"	/* exit */
-		"int $0x80\n"
-		"1:\t"
-		:"=a" (retval)
-		:"0" (__NR_clone), "i" (__NR_exit),
-		 "r" (arg), "r" (fn),
-		 "b" (flags | CLONE_VM)
-		:"si");
-	return retval;
-}
-
-#endif
-
-#endif /* _ASM_I386_UNISTD_H_ */
--- a/kernel/table21/version.h
+++ b/kernel/table21/version.h
@@ -1 +0,0 @@
-#define _TABLE_VERSION	1
--- a/kernel/version.h
+++ b/kernel/version.h
@@ -1 +0,0 @@
-#define _TABLE_VERSION	1
--- a/lib/lib.pl
+++ b/lib/lib.pl
@@ -106,6 +106,8 @@ sub output {

    if ($param_def eq 'string') {
 	$call_param = ', ' . $line_fields[5];
+	$param_buf = '';
+	$buf_set = '';
 	$param_decl = ",\n            " . $space . '    const char *' .

 	  $line_fields[5];
@@ -119,7 +121,12 @@ sub output {
 	$param_decl = '';
 	$send_size = '';
 	$send_ptr = '';
+	$param_buf = '';
+	$buf_set = '';
 	$nr_params = (@params = split(/:/, $param_def, 9999));
+	if ($nr_params) {
+	    $param_buf = "\n\tstruct {\n";
+	}
 	for ($param = 1; $param <= $nr_params; $param++) {
 	    $list = $params[$param];
 	    $type = $params[$param];
@@ -127,6 +134,14 @@ sub output {
 	    $list =~ s/^.*\(//;
 	    $list =~ s/\)$//;
 	    $count = (@fields = split(/,/, $list, 9999));
+
+	    if ($count > 0) {
+		for ($field = 1; $field <= $count; $field++) {
+		    $param_buf .= "\t\t$convert{$type} buf_$fields[$field];\n";
+		    $buf_set .= "\tparam_buf.buf_$fields[$field] = $fields[$field];\n";
+		}
+	    }
+
 	    for ($field = 1; $field <= $count; $field++) {
 		if ($param_decl eq '') {
 		    $param_decl = ",\n            " . $space . '    ';
@@ -139,21 +154,13 @@ sub output {
 		  $fields[$field];
 		$call_param = $call_param . ', ' . $fields[$field];
 		if ($send_ptr eq '') {
-		    $send_ptr = "\n\tconst void *send_ptr = &" .
-
-		      $fields[$field] . ';';
+		    $send_ptr = "\n\tconst void *send_ptr = &param_buf;";
 		}
-		if ($send_size eq '') {
-		    $send_size = "\n\tconst size_t send_size =\n\t\t";
-		}
-		else {
-		    $send_size = $send_size . ' + ';
-		}
-		$send_size = $send_size . 'sizeof (' . $fields[$field] . ')';
 	    }
 	}
-	if ($send_size ne '') {
-	    $send_size = $send_size . ';';
+	if ($nr_params) {
+	    $param_buf .= "\t} param_buf;";
+	    $send_size  = "\n\tconst size_t send_size = sizeof param_buf;";
 	}
 	else {
 	    $send_size = "\n\tconst size_t send_size = 0;";
@@ -167,11 +174,13 @@ sub output {

      $feature . ' *buf' . $param_decl . ')';

-    print '{' . $send_ptr . '' . $send_size;
+    print "{" . $param_buf;
+
+    print $send_ptr . '' . $send_size;
    if ($retval !~ /^void$/) {
 	print "\t" . $retval . ' retval = (' . $retval . ') 0;';
    }
-    print '';
+    print $buf_set;

    print "\tglibtop_init_r (&server, (1 << GLIBTOP_SYSDEPS_" .

--- a/lib/parameter.c
+++ b/lib/parameter.c
@@ -32,9 +32,9 @@

 #define _check_data(size)	\
 	if ((data_ptr == NULL) || (data_size != size)) { \
-		glibtop_warn_r (server, "glibtop_set_parameter (%d): " \
+		glibtop_warn_r (server, "glibtop_set_parameter (%u): " \
 				"Expected %lu bytes but got %lu.", \
-				parameter, size, data_size); \
+				(unsigned) parameter, (unsigned long) size, (unsigned long) data_size); \
 		return; \
 	}

@@ -82,7 +82,7 @@ glibtop_set_parameter_l (glibtop *server, const unsigned parameter,
 		break;
 	case GLIBTOP_PARAM_FEATURES:
 		/* You should not be allowed to set this field. */
-		glibtop_warn_r (server, "glibtop_set_parameter (%d): " \
+		glibtop_warn_r (server, "glibtop_set_parameter (%u): " \
 				"Cannot modify read-only value.",
 				parameter);
 		break;
--- a/lib/read_data.c
+++ b/lib/read_data.c
@@ -38,7 +38,8 @@ glibtop_read_data_l (glibtop *server)
 	glibtop_init_r (&server, 0, 0);

 #ifdef DEBUG
-	fprintf (stderr, "LIBRARY: reading %d data bytes.\n", sizeof (size_t));
+	fprintf (stderr, "LIBRARY: reading %lu data bytes.\n",
+		 (unsigned long) sizeof (size_t));
 #endif

 	if (server->socket) {
@@ -51,7 +52,8 @@ glibtop_read_data_l (glibtop *server)
 		glibtop_error_io_r (server, _("read data size"));

 #ifdef DEBUG
-	fprintf (stderr, "LIBRARY: really reading %d data bytes (ret = %d).\n", size, ret);
+	fprintf (stderr, "LIBRARY: really reading %lu data bytes (ret = %d).\n",
+		 (unsigned long) size, ret);
 #endif

 	if (!size) return NULL;
@@ -65,7 +67,10 @@ glibtop_read_data_l (glibtop *server)
 	}

 	if (ret < 0)
-		glibtop_error_io_r (server, ngettext ("read data %d byte", "read data %d bytes", size));
+		glibtop_error_io_r (server,
+				    ngettext ("read %lu byte of data",
+					      "read %lu bytes of data",
+					      (unsigned long) size));

 	return ptr;
 }
--- a/lib/write.c
+++ b/lib/write.c
@@ -48,5 +48,5 @@ glibtop_write_l (glibtop *server, size_t size, void *buf)
 	}

 	if (ret < 0)
-		glibtop_error_io_r (server, ngettext ("write %d byte", "write %d bytes", size), size);
+		glibtop_error_io_r (server, ngettext ("wrote %d byte", "wrote %d bytes", size), size);
 }
--- a/libgtop-mirror.sh
+++ b/libgtop-mirror.sh
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-AUTODIR=/home/norwegen/auto
-CVSROOT=/pub/master/home-of-linux
-CVSHOST=cvs:
-MODULE=libgtop
-
-rm -rf $AUTODIR || exit 1
-mkdir $AUTODIR || exit 1
-cd $AUTODIR || exit 1
-
-echo "Making cpio archive out of $CVSROOT/$MODULE ..."
-
-find $CVSROOT/$MODULE | cpio -o --format=crc | gzip -9f > $MODULE-current-cvs.cpio.gz || exit 1
-
-echo "Checking out $MODULE"
-
-cvs -d $CVSHOST$CVSROOT co $MODULE || exit 1
-
-echo "Making cpio archive out of checked out sources ..."
-
-find $MODULE | cpio -o --format=crc | gzip -9f > $MODULE-current.cpio.gz || exit 1
-
-for file in README LIESMICH NEWS ChangeLog ; do
-  if [ -s $MODULE/$file ] ; then
-    cp $MODULE/$file . || exit 1
-  fi
-done
-
-tar cvf - $MODULE | gzip -9f > $MODULE-current.tar.gz || exit 1
-
-find $MODULE/doc -maxdepth 1 -type f -exec cp {} . \;
-
-# echo "Making documentation ..."
-# jade -D /usr/lib/sgml/jade_dsl -d libgtop.dsl -t sgml -V %no-make-index% libgtop.sgml > /dev/null || exit 1
-
-# echo "Making TeX documentation ..."
-# jade -D /usr/lib/sgml/jade_dsl -D /usr/lib/sgml/stylesheets -d docbook.dsl -t tex libgtop.sgml || exit 1
-# jadetex libgtop.tex || exit 1
-# jadetex libgtop.tex || exit 1
-# dvips libgtop || exit 1
-
-echo "Cleaning up ..."
-
-rm -rf $MODULE
-
-echo "Done."
--- a/libgtop-sysdeps.m4
+++ b/libgtop-sysdeps.m4
@@ -10,54 +10,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])
-
-	case "$host_os" in
-	linux*)
-	  AC_ARG_WITH(linux-table,
-	  [  --with-linux-table      Use the table () function from Martin Baulig],[
-	  linux_table="$withval"],[linux_table=auto])
-	  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
-	  AM_CONDITIONAL(LINUX_TABLE, test $linux_table = yes)
-	  ;;
-	esac
-])
-
 AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	AC_REQUIRE([AC_CANONICAL_HOST])

@@ -111,14 +63,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*)
--- a/libgtopconfig.h.in
+++ b/libgtopconfig.h.in
@@ -0,0 +1,8 @@
+#ifndef LIBGTOPCONFIG_H
+#define LIBGTOPCONFIG_H
+
+#define LIBGTOP_MAJOR_VERSION @LIBGTOP_MAJOR_VERSION@
+#define LIBGTOP_MINOR_VERSION @LIBGTOP_MINOR_VERSION@
+#define LIBGTOP_MICRO_VERSION @LIBGTOP_MICRO_VERSION@
+
+#endif /* LIBGTOPCONFIG_H */
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -1,13 +1,14 @@
-Makefile
-Makefile.in
-POTFILES
-cat-id-tbl.c
 *.gmo
 *.mo
-libgtop.pot
-libgtop-2.0.pot
+*.pot
+Makefile
+Makefile.in
 Makefile.in.in
+POTFILES
+cat-id-tbl.c
 messages
-stamp-cat-id
-po2tbl.sed
 missing
+notexist
+po2tbl.sed
+po2tbl.sed.in
+stamp-cat-id
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,132 @@
+2005-02-06  Ole Laursen  <olau@hardworking.dk>
+
+	* da.po: Updated Danish translation.
+
+2005-02-06  Pauli Virtanen <pauli.virtanen@hut.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2005-02-04  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Tõivo Leedjärv.
+
+2005-01-30  Žygimantas Beručka  <uid0@akl.lt>
+
+	* lt.po: Updated Lithuanian translation.
+
+2005-01-28  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Update
+	* no.po: Update
+
+2005-01-27  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Iassen Pramatarov <turin@fsa-bg.org>
+
+2005-01-26  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2005-01-24  Funda Wang  <fundawang@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation.
+
+2005-01-24  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Vladimir Petkov <vpetkov@i-space.org>
+
+2005-01-24  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* POTFILES.in:
+	* POTFILES.skip: Removed lib/lib.c as it is generated.
+	Closes #165038.
+
+2005-01-17  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* POTFILES.in: Updated.
+
+2005-01-16  Hendrik Richter  <hendrik@gnome-de.org>
+
+	* de.po: Updated German translation.
+
+2005-01-16  Takeshi AIHANA <aihana@gnome.gr.jp>
+
+	* ja.po: Updated Japanese translation.
+
+2005-01-13  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* POTFILES.in:
+	* POTFILES.skip: Don't translate examples/smp.c.
+
+2005-01-13  Christian Rose  <menthos@menthos.com>
+
+	* POTFILES.in: Added missing file.
+
+2005-01-02  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2004-12-29  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2004-12-29  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
+2004-12-29  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
+2004-12-29  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
+2004-12-29  Pawan Chitrakar  <pawan@nplinux.org>
+
+	* ne.po: Added Nepali Translation
+
+2004-12-29  Benoît Dejean  <tazforever@dlfp.org>
+
+	* POTFILES.in: Removed a bunch of strings. 
+
+2004-12-28  Christian Rose  <menthos@menthos.com>
+
+	* POTFILES.in: Added comment and missing file.
+	* .cvsignore: Added entries and cleaned up.
+	* sv.po: Updated Swedish translation.
+
+2004-12-28  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Update
+	* no.po: Update
+
+2004-12-28  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
+2004-12-27  Benoît Dejean  <tazforever@dlfp.org>
+
+	* POTFILES.in: Removed a lot of unused/useless files.
+
+2004-12-26  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
+2004-12-25  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2004-12-04  Žygimantas Beručka  <uid0@akl.lt>
+
+	* lt.po: Updated Lithuanian translation.
+
+2004-11-23  Martin Willemoes Hansen  <mwh@sysrq.dk>
+
+	* da.po: Updated Danish translation.
+
 2004-09-26  Adam Weinberger  <adamw@gnome.org>

 	* en_CA.po: Updated Canadian English translation.
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,40 +1,5 @@
-examples/smp.c
-include/glibtop/close.h
-include/glibtop/command.h
-include/glibtop/cpu.h
-include/glibtop/error.h
-include/glibtop/fsusage.h
-include/glibtop/global.h
-include/glibtop/gnuserv.h
-include/glibtop/inodedb.h
-include/glibtop/loadavg.h
-include/glibtop/mem.h
-include/glibtop/mountlist.h
-include/glibtop/msg_limits.h
-include/glibtop/open.h
-include/glibtop/parameter.h
-include/glibtop/prockernel.h
-include/glibtop/proclist.h
-include/glibtop/procmap.h
-include/glibtop/procmem.h
-include/glibtop/procsegment.h
-include/glibtop/procsignal.h
-include/glibtop/procstate.h
-include/glibtop/proctime.h
-include/glibtop/procuid.h
-include/glibtop/read_data.h
-include/glibtop/read.h
-include/glibtop/sem_limits.h
-include/glibtop/shm_limits.h
-include/glibtop/signal.h
-include/glibtop/swap.h
-include/glibtop/sysdeps.h
-include/glibtop/sysinfo.h
-include/glibtop/types.h
-include/glibtop/union.h
-include/glibtop/uptime.h
-include/glibtop/version.h
-include/glibtop/write.h
+# List of source files containing translatable strings.
+# Please keep this file sorted alphabetically.
 lib/close.c
 lib/command.c
 lib/init.c
@@ -52,57 +17,6 @@ src/daemon/slave.c
 src/daemon/version.c
 src/inodedb/file_by_inode2.c
 src/inodedb/mkinodedb2.c
-sysdeps/common/error.c
-sysdeps/common/fsusage.c
-sysdeps/common/gnuslib.c
-sysdeps/common/inodedb.c
-sysdeps/common/mountlist.c
-sysdeps/common/sysdeps_suid.c
-sysdeps/linux/close.c
-sysdeps/linux/cpu.c
-sysdeps/linux/glibtop_machine.h
-sysdeps/linux/glibtop_server.h
-sysdeps/linux/loadavg.c
-sysdeps/linux/mem.c
-sysdeps/linux/msg_limits.c
-sysdeps/linux/open.c
-sysdeps/linux/prockernel.c
-sysdeps/linux/proclist.c
-sysdeps/linux/procmap.c
-sysdeps/linux/procmem.c
-sysdeps/linux/procsegment.c
-sysdeps/linux/procsignal.c
-sysdeps/linux/procstate.c
-sysdeps/linux/proctime.c
-sysdeps/linux/procuid.c
-sysdeps/linux/sem_limits.c
-sysdeps/linux/shm_limits.c
 sysdeps/linux/siglist.c
-sysdeps/linux/swap.c
-sysdeps/linux/sysinfo.c
-sysdeps/linux/uptime.c
-sysdeps/names/cpu.c
-sysdeps/names/fsusage.c
-sysdeps/names/loadavg.c
-sysdeps/names/mem.c
-sysdeps/names/mountlist.c
-sysdeps/names/msg_limits.c
-sysdeps/names/netload.c
-sysdeps/names/ppp.c
-sysdeps/names/procargs.c
-sysdeps/names/prockernel.c
-sysdeps/names/proclist.c
-sysdeps/names/procmap.c
-sysdeps/names/procmem.c
-sysdeps/names/procsegment.c
-sysdeps/names/procsignal.c
-sysdeps/names/procstate.c
-sysdeps/names/proctime.c
-sysdeps/names/procuid.c
-sysdeps/names/sem_limits.c
-sysdeps/names/shm_limits.c
-sysdeps/names/swap.c
-sysdeps/names/sysdeps.c
-sysdeps/names/uptime.c
 sysdeps/osf1/siglist.c
 sysdeps/sun4/siglist.c
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -2,3 +2,5 @@ support/error.c
 support/getopt.c
 support/popt.c
 support/popthelp.c
+examples/smp.c
+lib/lib.c
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/en_CA.po
+++ b/po/en_CA.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/et.po
+++ b/po/et.po
@@ -2,18 +2,19 @@
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libgtop package.
 # Tõivo Leedjärv <toivo@linux.ee>, 2003.
-#
+
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-03 14:09+0200\n"
+"POT-Creation-Date: 2004-08-06 12:07+0200\n"
 "PO-Revision-Date: 2003-02-25 01:05+0200\n"
 "Last-Translator: Tõivo Leedjärv <toivo@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"

 #: examples/smp.c:76
 #, c-format
@@ -100,8 +101,8 @@ msgstr ""
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "loetud %d bait"
+msgstr[1] "loetud %d baiti"

 #: lib/read_data.c:51
 msgid "read data size"
@@ -111,8 +112,8 @@ msgstr ""
 #, c-format
 msgid "read data %d byte"
 msgid_plural "read data %d bytes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "andmeid loetud %d bait"
+msgstr[1] "andmeid loetud %d baiti"

 #: lib/write.c:51
 #, c-format
@@ -411,14 +412,12 @@ msgid "MTU"
 msgstr ""

 #: sysdeps/names/netload.c:48 sysdeps/names/netload.c:69
-#, fuzzy
 msgid "IPv4 Subnet"
-msgstr "Alamvõrk"
+msgstr "IPv4 alamvõrk"

 #: sysdeps/names/netload.c:49 sysdeps/names/netload.c:70
-#, fuzzy
 msgid "IPv4 Address"
-msgstr "Aadress"
+msgstr "IPv4 aadress"

 #: sysdeps/names/netload.c:50 sysdeps/names/netload.c:71
 msgid "Packets In"
@@ -461,9 +460,8 @@ msgid "Collisions"
 msgstr "Põrkumisi"

 #: sysdeps/names/netload.c:60 sysdeps/names/netload.c:81
-#, fuzzy
 msgid "IPv6 Address"
-msgstr "Aadress"
+msgstr "IPv6 aadress"

 #: sysdeps/names/netload.c:61 sysdeps/names/netload.c:82
 msgid "IPv6 Prefix"
@@ -1004,9 +1002,8 @@ msgid "Set Group ID"
 msgstr ""

 #: sysdeps/names/procuid.c:62
-#, fuzzy
 msgid "Filesystem User ID"
-msgstr "Failisüsteemide kasutus"
+msgstr "Failisüsteemi kasutaja ID"

 #: sysdeps/names/procuid.c:63
 msgid "Filesystem Group ID"
@@ -1261,9 +1258,8 @@ msgid "Time in seconds the system spent in the idle task since system boot"
 msgstr "Kui kaua on protsessor käivitamisest alates jõude seisnud (sekundites)"

 #: sysdeps/names/uptime.c:48
-#, fuzzy
 msgid "Time of last system boot in seconds since the epoch"
-msgstr "Aega süsteemi käivitamisest (sekundites)"
+msgstr "Aega viimasest süsteemi alglaadimisest (sekundites aasta 1970 algusest)"

 #: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
@@ -1299,7 +1295,7 @@ msgstr ""

 #: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
-msgstr ""
+msgstr "Kõrvaldamine"

 #: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Benoît Dejean	3d21fd97f6	Released 2.9.91. * NEWS: * configure.in: Released 2.9.91.	2005-02-06 18:46:05 +00:00
Ole Laursen	666a347f25	Updated Danish translation. 2005-02-06 Ole Laursen <olau@hardworking.dk> * da.po: Updated Danish translation.	2005-02-06 15:47:24 +00:00
Pauli Virtanen	68db204d6a	Updated Finnish translation. 2005-02-06 Pauli Virtanen <pauli.virtanen@hut.fi> * fi.po: Updated Finnish translation.	2005-02-06 01:14:53 +00:00
Priit Laes	fbe5c8da8e	Translation updated by Tõivo Leedjärv. 2005-02-04 Priit Laes <plaes@cvs.gnome.org> * et.po: Translation updated by Tõivo Leedjärv.	2005-02-04 08:52:01 +00:00
Benoît Dejean	a354ca2635	Fixed typo. Closes #166090 * procopenfiles.c: Fixed typo. Closes #166090	2005-02-02 21:30:27 +00:00
Žygimantas Beručka	639ea4870c	Updated Lithuanian translation. 2005-01-30 Žygimantas Beručka <uid0@akl.lt> * lt.po: Updated Lithuanian translation.	2005-01-30 01:52:45 +00:00
Kjartan Maraas	702d9a1501	Update Update 2005-01-28 Kjartan Maraas <kmaraas@gnome.org> * nb.po: Update * no.po: Update	2005-01-28 16:05:47 +00:00
Alexander Shopov	ea1a6dbaca	Updated Bulgarian translation by Iassen Pramatarov <turin@fsa-bg.org> 2005-01-27 Alexander Shopov <ash@contact.bg> * bg.po: Updated Bulgarian translation by Iassen Pramatarov <turin@fsa-bg.org>	2005-01-27 10:05:43 +00:00
Tomasz Kłoczko	bb60753844	fixed format string specification bugs in translations.	2005-01-26 08:03:07 +00:00
Duarte Loreto	d9781917c5	Updated Portuguese translation. 2005-01-26 Duarte Loreto <happyguy_pt@hotmail.com> * pt.po: Updated Portuguese translation.	2005-01-26 01:08:31 +00:00
Funda Wang	bd119a72e2	Updated Simplified Chinese translation	2005-01-24 15:04:04 +00:00
Benoît Dejean	78c10bca9b	Released 2.9.90. * NEWS: * configure.in: Released 2.9.90.	2005-01-24 14:41:20 +00:00
Benoît Dejean	270ec235c1	UTF-8-ified. * include/glibtop/procopenfiles.h: * sysdeps/linux/procopenfiles.c: * sysdeps/stub/procopenfiles.c: UTF-8-ified.	2005-01-24 14:27:19 +00:00
Alexander Shopov	2362be986b	Updated Bulgarian translation by Vladimir Petkov <vpetkov@i-space.org> 2005-01-24 Alexander Shopov <ash@contact.bg> * bg.po: Updated Bulgarian translation by Vladimir Petkov <vpetkov@i-space.org>	2005-01-24 10:33:28 +00:00
Benoît Dejean	8a1e1cff91	Removed lib/lib.c as it is generated. Closes #165038 . * POTFILES.in: * POTFILES.skip: Removed lib/lib.c as it is generated. Closes #165038.	2005-01-24 08:31:22 +00:00
Benoît Dejean	46380bf655	Total rewrite. socket/localsocket should be much faster. * procopenfiles.c: (parse_file), (get_all), (inet_socket_parser), (get_all_inet_sockets), (local_socket_parser), (get_all_local_sockets), (glibtop_get_proc_open_files_s): Total rewrite. socket/localsocket should be much faster.	2005-01-21 23:30:54 +00:00
Benoît Dejean	91dda5b70d	Updated. * openfiles.c: (show_open_files): Updated.	2005-01-21 23:29:38 +00:00
Benoît Dejean	9b263e0fbb	added localsock { name } to glibtop_open_files_entry. Should not break * examples/openfiles.c: (show_open_files): * include/glibtop/procopenfiles.h: added localsock { name } to glibtop_open_files_entry. Should not break ABI.	2005-01-21 23:28:47 +00:00
Benoît Dejean	793807b07e	Re-worked with bsearch. * mountlist.c: (ignore_mount_entry): Re-worked with bsearch.	2005-01-18 21:57:52 +00:00
Benoît Dejean	9898e7ee58	Updated. * POTFILES.in: Updated.	2005-01-17 12:32:26 +00:00
Hendrik Richter	7ecdcd712d	Updated German translation.	2005-01-16 16:02:30 +00:00
Benoît Dejean	703a17f3f0	Uninlined. * glibtop_private.c: (skip_token): * glibtop_private.h: Uninlined.	2005-01-16 11:16:19 +00:00
Updated ja.po. T.Aihana	92a9e7d937	2005-01-16 Updated ja.po. T.Aihana <aihana@jcom.home.ne.jp>	2005-01-16 05:29:47 +00:00
Benoît Dejean	01c7e99aa6	Don't translate examples/smp.c. * POTFILES.in: * POTFILES.skip: Don't translate examples/smp.c.	2005-01-13 21:15:05 +00:00
Christian Rose	6fe16f1d91	Added missing file. 2005-01-13 Christian Rose <menthos@menthos.com> * POTFILES.in: Added missing file.	2005-01-13 17:54:11 +00:00
Benoît Dejean	fcb83e637d	Reworked. Should works with IDE, SCSI. DM support is ready, but i don't * fsusage.c: (get_partition), (get_sys_path), (linux_2_6_0): Reworked. Should works with IDE, SCSI. DM support is ready, but i don't know why their /stat is empty ...	2005-01-13 08:56:54 +00:00
Benoît Dejean	50e4e07013	2.9.5. * configure.in: 2.9.5.	2005-01-12 22:40:43 +00:00
Benoît Dejean	ab40c94db3	Parses /proc/net/tcp only once. * procopenfiles.c: (get_all_sockets), (glibtop_get_proc_open_files_s): Parses /proc/net/tcp only once.	2005-01-12 22:39:31 +00:00
Tomasz Kłoczko	fee415ecd8	Fixed format string bug in plural forms: use in all forms %lu.	2005-01-11 02:09:50 +00:00
Benoît Dejean	647a313d5b	Released 2.9.4. * NEWS: Released 2.9.4.	2005-01-10 17:18:27 +00:00
Benoît Dejean	70ac398a44	Fixed. * procopenfiles.c: (get_socket_endpoint): Fixed.	2005-01-10 17:04:50 +00:00
Benoît Dejean	48056f7d8a	Disabled. * glibtop_server.h: * procopenfiles.c: (get_socket_endpoint): Disabled. (glibtop_get_proc_open_files_s): Secured -> g_snprintf.	2005-01-10 12:05:13 +00:00
Benoît Dejean	7ca4171652	New feature by nick@reloco.com.ar (Nicolás Lichtmaier). * configure.in: * examples/.cvsignore: * examples/Makefile.am: * examples/openfiles.c: (show_open_files), (main): * features.def: * include/glibtop/Makefile.am: * include/glibtop/command.h: * include/glibtop/procopenfiles.h: * include/glibtop/sysdeps.h: * include/glibtop/union.h: * structures.def: * sysdeps/linux/Makefile.am: * sysdeps/linux/procopenfiles.c: (glibtop_init_proc_open_files_s), (get_socket_endpoint), (glibtop_get_proc_open_files_s): * sysdeps/stub/Makefile.am: * sysdeps/stub/procopenfiles.c: (glibtop_init_proc_open_files_s), (glibtop_get_proc_open_files_s): New feature by nick@reloco.com.ar (Nicolás Lichtmaier). glibtop_get_open_files(pid) -> list of files by process. TODO: Add documentation.	2005-01-10 08:43:04 +00:00
Ivan Stojmirov	1537eea7e5	done	2005-01-09 16:05:26 +00:00
Benoît Dejean	0a425e4e41	Added I/O and IRQ wait time to glibtop_cpu. Closes #160443 . * examples/pprint.c: (pprint_get_cpu): * features.def: * include/glibtop/cpu.h: * sysdeps/linux/cpu.c: (glibtop_init_cpu_s), (glibtop_get_cpu_s): Added I/O and IRQ wait time to glibtop_cpu. Closes #160443. * configure.in: Post-release bump 2.9.4	2005-01-03 09:17:45 +00:00
Benoît Dejean	0fa9c9bc61	Updated. * reference.texi: Updated.	2005-01-03 09:07:07 +00:00
Miloslav Trmac	9561cf34b2	Updated Czech translation. 2005-01-02 Miloslav Trmac <mitr@volny.cz> * cs.po: Updated Czech translation.	2005-01-02 14:18:48 +00:00
Francisco Javier F. Serrador	be721ca476	Updated Spanish translation. 2004-12-29 Francisco Javier F. Serrador <serrador@cvs.gnome.org> * es.po: Updated Spanish translation.	2004-12-29 19:29:51 +00:00
Marcel Telka	265da513de	Updated Slovak translation. 2004-12-29 Marcel Telka <marcel@telka.sk> * sk.po: Updated Slovak translation.	2004-12-29 09:23:33 +00:00
Christian Rose	a180cb5b10	Updated Swedish translation. 2004-12-29 Christian Rose <menthos@menthos.com> * sv.po: Updated Swedish translation.	2004-12-29 08:24:47 +00:00
Adam Weinberger	c517f20195	Updated Canadian English translation. * en_CA.po: Updated Canadian English translation.	2004-12-29 08:14:58 +00:00
Pawan Chitrakar	e4ad12fd93	Added Nepali translation 2004-12-29 Pawan Chitrakar <pawan@nplinux.org> * ne.po: Added Nepali translation * configure.in: Added ne "Nepali" in ALL_LINGUAS	2004-12-29 03:32:02 +00:00
Benoît Dejean	c22300d109	Fixed error messages. Closes #162406 . * lib/read_data.c: (glibtop_read_data_l): * lib/write.c: (glibtop_write_l): Fixed error messages. Closes #162406.	2004-12-29 00:14:29 +00:00
Benoît Dejean	bffc09b594	Removed a bunch of strings. * POTFILES.in: Removed a bunch of strings.	2004-12-29 00:09:14 +00:00
Christian Rose	b7fd73bc5c	Added comment and missing file. Added entries and cleaned up. Updated 2004-12-28 Christian Rose <menthos@menthos.com> * POTFILES.in: Added comment and missing file. * .cvsignore: Added entries and cleaned up. * sv.po: Updated Swedish translation.	2004-12-28 22:57:32 +00:00
Kjartan Maraas	15904773f3	Update Update 2004-12-28 Kjartan Maraas <kmaraas@gnome.org> * nb.po: Update * no.po: Update	2004-12-28 10:40:30 +00:00
Marcel Telka	b76ae7b1ca	Updated Slovak translation. 2004-12-28 Marcel Telka <marcel@telka.sk> * sk.po: Updated Slovak translation.	2004-12-28 00:10:28 +00:00
Benoît Dejean	006eddb5fe	Removed a lot of unused/useless files. * POTFILES.in: Removed a lot of unused/useless files.	2004-12-27 16:23:19 +00:00
Adam Weinberger	7566ccf311	Updated Canadian English translation. * en_CA.po: Updated Canadian English translation.	2004-12-26 08:35:44 +00:00
Miloslav Trmac	cde49f488c	Updated Czech translation. 2004-12-25 Miloslav Trmac <mitr@volny.cz> * cs.po: Updated Czech translation.	2004-12-25 15:03:54 +00:00
Benoît Dejean	ce9ce223ca	Turned all macros to functions. Marked everything as G_GNUC_PRINTF and * include/glibtop/error.h: * lib/parameter.c: (glibtop_set_parameter_l): * lib/read_data.c: (glibtop_read_data_l): * sysdeps/common/error.c: (print_server_name), (glibtop_error_vr), (glibtop_error_io_vr), (glibtop_warn_vr), (glibtop_warn_io_vr), (glibtop_error_r), (glibtop_warn_r), (glibtop_error_io_r), (glibtop_warn_io_r), (glibtop_error), (glibtop_warn), (glibtop_error_io), (glibtop_warn_io): Turned all macros to functions. Marked everything as G_GNUC_PRINTF and fixed format bugs. * sysdeps/common/fsusage.c: Marked some functions as G_GNUC_INTERNAL	2004-12-23 21:50:41 +00:00
Benoît Dejean	71900c0e30	s/glibtop_error/g_error/g * netload.c: (main): * procmap.c: (main): s/glibtop_error/g_error/g	2004-12-23 15:58:34 +00:00
Benoît Dejean	817057bc3c	Marked private functions G_GNUC_INTERNAL. * fsusage.c: (_glibtop_linux_get_fsusage_read_write): * glibtop_private.h: Marked private functions G_GNUC_INTERNAL.	2004-12-23 15:56:51 +00:00
Benoît Dejean	9fe6dadcec	Fixed. * netlist.c: (glibtop_get_netlist_s): Fixed.	2004-12-23 15:44:24 +00:00
Benoît Dejean	3e06f95c84	Added dummy glibtop_get_netlist. * netlist.c: * Makefile.am: Added dummy glibtop_get_netlist.	2004-12-23 15:43:35 +00:00
Benoît Dejean	2ca1905547	Released 2.9.3. * NEWS: * configure.in: Released 2.9.3.	2004-12-20 10:53:57 +00:00
Benoît Dejean	65d2d61d41	Fixed Argument passing between library and server. Thanks everyone. Closes * lib/lib.pl: Fixed Argument passing between library and server. Thanks everyone. Closes #139809.	2004-12-10 22:05:17 +00:00
Benoît Dejean	8a4fd3c971	Ignores unkown file system type. * mountlist.c: (ignore_mount_entry): Ignores unkown file system type.	2004-12-09 15:57:44 +00:00
Benoît Dejean	c09e2fdead	Removed libgtop_names :) * acconfig.h: * configure.in: * debian/libgtop-dev.files.in: * doc/Makefile.am: * examples/Makefile.am: * examples/third.c: * include/glibtop/cpu.h: * include/glibtop/fsusage.h: * include/glibtop/loadavg.h: * include/glibtop/mem.h: * include/glibtop/mountlist.h: * include/glibtop/msg_limits.h: * include/glibtop/netlist.h: * include/glibtop/netload.h: * include/glibtop/ppp.h: * include/glibtop/procargs.h: * include/glibtop/prockernel.h: * include/glibtop/proclist.h: * include/glibtop/procmap.h: * include/glibtop/procmem.h: * include/glibtop/procsegment.h: * include/glibtop/procsignal.h: * include/glibtop/procstate.h: * include/glibtop/proctime.h: * include/glibtop/procuid.h: * include/glibtop/sem_limits.h: * include/glibtop/shm_limits.h: * include/glibtop/swap.h: * include/glibtop/sysdeps.h: * include/glibtop/uptime.h: * po/POTFILES.in: * sysdeps/Makefile.am: * sysdeps/names/.cvsignore: * sysdeps/names/Makefile.am: * sysdeps/names/cpu.c: * sysdeps/names/fsusage.c: * sysdeps/names/loadavg.c: * sysdeps/names/mem.c: * sysdeps/names/mountlist.c: * sysdeps/names/msg_limits.c: * sysdeps/names/netlist.c: * sysdeps/names/netload.c: * sysdeps/names/ppp.c: * sysdeps/names/procargs.c: * sysdeps/names/prockernel.c: * sysdeps/names/proclist.c: * sysdeps/names/procmap.c: * sysdeps/names/procmem.c: * sysdeps/names/procsegment.c: * sysdeps/names/procsignal.c: * sysdeps/names/procstate.c: * sysdeps/names/proctime.c: * sysdeps/names/procuid.c: * sysdeps/names/sem_limits.c: * sysdeps/names/shm_limits.c: * sysdeps/names/swap.c: * sysdeps/names/sysdeps.c: * sysdeps/names/uptime.c: Removed libgtop_names :)	2004-12-06 14:44:11 +00:00
Benoît Dejean	fe5bb1c39c	Added glibtop_get_netlist. Patch from marcus@freebsd.org (Joe Marcus * Makefile.am: * netlist.c: (glibtop_init_netlist_s), (glibtop_get_netlist_s): Added glibtop_get_netlist. Patch from marcus@freebsd.org (Joe Marcus Clarke).	2004-12-05 12:01:43 +00:00
Benoît Dejean	4b310d26f7	Updated. * reference.texi: Updated.	2004-12-04 19:21:08 +00:00
Žygimantas Beručka	83759b2a4a	Updated Lithuanian translation. 2004-12-04 Žygimantas Beručka <uid0@akl.lt> * lt.po: Updated Lithuanian translation.	2004-12-04 06:56:10 +00:00
Benoît Dejean	209219d5ce	post-release bump to 2.9.1. * configure.in: post-release bump to 2.9.1.	2004-11-30 12:22:57 +00:00
Benoît Dejean	8ce468228a	released 2.9.0 * NEWS: * configure.in: released 2.9.0	2004-11-30 12:06:46 +00:00
Benoît Dejean	e9e2b7c09b	Glibified. g_array_free which returns a char* ! If you want to change * proclist.c: (glibtop_get_proclist_s): Glibified. g_array_free which returns a char* ! If you want to change this, please tell them http://bugzilla.gnome.org/show_bug.cgi?id=145767 .	2004-11-29 23:55:03 +00:00
Benoît Dejean	2fa0dc1cd8	Added Added Removed * Makefile.am: * cpu.c: * fsusage.c: * glibtop_private.c: (get_scaled), (try_file_to_buffer), (file_to_buffer): Added * glibtop_private.h: Added * glibtop_server.c: Removed * glibtop_server.h: * loadavg.c: * mem.c: * netload.c: * open.c: * prockernel.c: * procmem.c: * procsegment.c: * procsignal.c: * procstate.c: * proctime.c: * procuid.c: * swap.c: * sysinfo.c: * uptime.c: Moved linux impl utils function from glibtop_server.* to glibtob_private.* because glibtop_server.h is a public header.	2004-11-28 01:32:55 +00:00
Martin Willemoes Hansen	faa80b7b24	Updated Danish translation. * da.po: Updated Danish translation.	2004-11-23 12:36:48 +00:00
Benoît Dejean	7ff2372249	UTF-8-ified. * AUTHORS: * MAINTAINERS: UTF-8-ified. * acconfig.h: * acinclude.m4: * configure.in: * kernel/ChangeLog: * kernel/sysctl/.cvsignore: * kernel/sysctl/Makefile: * kernel/sysctl/libgtop.c: * kernel/sysctl/libgtop.h: * kernel/sysctl/libgtop_syms.c: * kernel/sysctl/main.c: * kernel/sysctl/patch-2.2.1: * kernel/sysctl/patch-2.2.x: * kernel/table.h: * kernel/table20/Makefile: * kernel/table20/README: * kernel/table20/entry-i386.S: * kernel/table20/kernel.patch: * kernel/table20/main.c: * kernel/table20/unistd-i386.h: * kernel/table20/version.h: * kernel/table21/.cvsignore: * kernel/table21/Makefile: * kernel/table21/README: * kernel/table21/entry-i386.S: * kernel/table21/main.c: * kernel/table21/module.c: * kernel/table21/unistd-i386.h: * kernel/table21/version.h: * kernel/version.h: * libgtop-sysdeps.m4: * sysdeps/Makefile.am: * sysdeps/kernel/.cvsignore: * sysdeps/kernel/ChangeLog: * sysdeps/kernel/Makefile.am: * sysdeps/kernel/close.c: * sysdeps/kernel/cpu.c: * sysdeps/kernel/glibtop_private.h: * sysdeps/kernel/glibtop_server.h: * sysdeps/kernel/kernel.h: * sysdeps/kernel/kernel.s: * sysdeps/kernel/loadavg.c: * sysdeps/kernel/mem.c: * sysdeps/kernel/msg_limits.c: * sysdeps/kernel/netload.c: * sysdeps/kernel/open.c: * sysdeps/kernel/ppp.c: * sysdeps/kernel/procargs.c: * sysdeps/kernel/procdata.c: * sysdeps/kernel/prockernel.c: * sysdeps/kernel/proclist.c: * sysdeps/kernel/procmap.c: * sysdeps/kernel/procmem.c: * sysdeps/kernel/procsegment.c: * sysdeps/kernel/procsignal.c: * sysdeps/kernel/procstate.c: * sysdeps/kernel/proctime.c: * sysdeps/kernel/procuid.c: * sysdeps/kernel/sem_limits.c: * sysdeps/kernel/shm_limits.c: * sysdeps/kernel/siglist.c: * sysdeps/kernel/swap.c: * sysdeps/kernel/sysinfo.c: * sysdeps/kernel/uptime.c: Removed kernel patch and implementation.	2004-11-22 11:13:24 +00:00
Benoît Dejean	f378a263b0	Forgot to ship libgtopconfig.h. * Makefile.am: Forgot to ship libgtopconfig.h.	2004-11-19 08:32:16 +00:00
Benoît Dejean	77b892ebf7	Removed unused files. * LIBGTOP-VERSION: * libgtop-mirror.sh: Removed unused files. * libgtopconfig.h.in: Added. * Makefile.am: * configure.in: * glibtop.h: Added libgtopconfig.h and LIBGTOP_VERSION_CHECK(X, Y, Z). This can be used in build tests.	2004-11-18 21:25:22 +00:00
Benoît Dejean	db2fed4da3	Added myself. * copyright.txt: Added myself.	2004-11-15 21:50:35 +00:00
Benoît Dejean	160bdeaecd	Updated. * netload.c: (hwaddress_format_for_display), (main): Updated.	2004-11-15 16:07:23 +00:00
Benoît Dejean	1d6debfa56	Added a check for NULL pointer when wlaking though interfaces (though i * netload.c: (get_ipv6), (glibtop_get_netload_s): Added a check for NULL pointer when wlaking though interfaces (though i don't understand why some interface don't have an ifa_addr). Move all ipv6 code into a separate function. Added a paranoid check on getifaddrs.	2004-11-15 14:58:06 +00:00
Benoît Dejean	bbb6cbaa87	Updated. * pprint.c: (pprint_get_fsusage), (pprint_get_mountlist), (pprint_get_netload), (pprint_get_netlist), (main): Updated.	2004-11-13 21:06:08 +00:00
Benoît Dejean	ce229a4e19	Added stub for glibtop_get_netlist. * Makefile.am: * netlist.c: (glibtop_init_netlist_s), (glibtop_get_netlist_s): Added stub for glibtop_get_netlist.	2004-11-13 12:43:28 +00:00
Benoît Dejean	544aff2f18	Removed SUID wrappers because glibtop_proc_argv_l is a client-side * include/glibtop/procargs.h: * sysdeps/common/procargs.c: (glibtop_get_proc_argv_l): Removed SUID wrappers because glibtop_proc_argv_l is a client-side function that wraps glibtop_get_proc_args.	2004-11-13 11:42:48 +00:00
Benoît Dejean	74f20ca469	Removed old functions. OMG, everything is really broken here :/ * structures.def: Removed old functions. OMG, everything is really broken here :/	2004-11-13 11:14:33 +00:00
Benoît Dejean	edd5156ca0	Killed warning. * netlist.c: (glibtop_get_netlist_s): Killed warning.	2004-11-13 11:10:57 +00:00
Benoît Dejean	7e5ccec8bf	Bumped to 2.9.0 * configure.in: Bumped to 2.9.0 * configure.in: * examples/.cvsignore: * examples/Makefile.am: * examples/netlist.c: (main): * features.def: * include/glibtop/Makefile.am: * include/glibtop/command.h: * include/glibtop/netlist.h: * include/glibtop/sysdeps.h: * include/glibtop/union.h: * include/glibtop/version.h: * src/daemon/version.c: * sysdeps/linux/Makefile.am: * sysdeps/linux/netlist.c: (glibtop_init_netlist_s), (glibtop_get_netlist_s): * sysdeps/names/Makefile.am: * sysdeps/names/netlist.c: * sysdeps/solaris/Makefile.am: * sysdeps/solaris/netlist.c: (glibtop_init_netlist_s), (glibtop_get_netlist_s): Added new function glibtop_get_netlist(). Implemented for linux and solaris. Doc needed.	2004-11-13 00:53:20 +00:00