Importing `stub' sysdeps code here.

1999-03-21  Martin Baulig  <martin@home-of-linux.org>

	Added a new sysctl () interface to the Linux Kernel.

	* kernel/sysctl: Imported.

	* libgtop-sysdeps.m4: If `--enable-hacker-mode' is given, check
	for my new sysctl () interface.

.cvsignore

@@ -29,3 +29,11 @@ alpha-dec-osf3.0
 i686-pc-linux-gnu-linux
 libgtop-config
 ABOUT-NLS
+libgtop.spec
+libgtop-0.99.*.tar.gz
+libgtop-0.99.*
+install-sh
+mkinstalldirs
+missing
+INSTALL
+COPYING

ANNOUNCE

@@ -1,95 +0,0 @@
-Hi all,
-
-I just uploaded the first working draft alpha version 0.01 to my website:
-
-  http://www.home-of-linux.org/gnome/libgtop/
-
-Libgtop is a library that fetches information about the running system such as cpu and
-memory usage, active processes etc. On Linux systems, these information are taken directly
-from the /proc filesystem. For other systems such as Solaris, where such programs need to be
-suid root (or only setgid kmem/mem on some systems), it provides a suid/setgid server that
-fetches those information and a client-side library that talks to this server. Main idea
-was to have the same interface for all operating systems, thus all system dependent details
-are hidden in the implementation of that server.
-
-Currently, it only works for Linux, documentation on how to port it to other systems is on
-the way. I'm planning to keep this site an up-to-date mirror of my local machine (which is
-connected to the internet over some expensive dialup connection, so I'll upload it about
-once every day I made significant changes) so that you can always find the latest version
-of the software here.
-
-I've written a simple guile interface for the library to show which information it can
-already fetch. See examples/third for details.
-
-===========================================================================================
-
-#include <glibtop.h>
-#include <glibtop/open.h>
-#include <glibtop/close.h>
-
-#include <glibtop/cpu.h>
-
-int
-main (int argc, char *argv [])
-{
-        glibtop server;
-        glibtop_cpu cpu;
-        unsigned i, *ptr;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, GTOPLOCALEDIR);
-        textdomain (PACKAGE);
-
-        glibtop_open (&server, argv [0]);
-
-        glibtop_get_cpu (&server, &cpu);
-
-        fprintf (stderr, "CPU: %lu, %lu, %lu, %lu, %lu\n",
-                 cpu.total, cpu.user, cpu.nice, cpu.sys, cpu.idle);
-
-        glibtop_close (&server);
-
-        exit (0);
-}
-
-===========================================================================================
-
-The following scheme code is used in examples/third to show all information that is
-currently available:
-
-        (display (get-cpu)) (newline)
-        (display (get-mem)) (newline)
-        (display (get-swap)) (newline)
-        (display (get-uptime)) (newline)
-        (display (get-loadavg)) (newline)
-        (display (get-shm_limits)) (newline)
-        (display (get-msg_limits)) (newline)
-        (display (get-sem_limits)) (newline)
-        (display (get-sysdeps)) (newline)
-        (display (get-proclist)) (newline)
-
-On my system, this yields:
-
-(3796245 348706 66 89999 3357474)
-(31715328 31354880 360448 13385728 401408 7237632 17567744)
-(133885952 42160128 91725824)
-(37962.49 33574.74)
-(0.01 0.02 0.0)
-(33554432 1 128 128 4194304)
-(2048 16384 4056 16384 128 16 16384)
-(4096 128 4096 4096 32 32 32 20 32767 16383)
-(31 127 7 3 1 31 127 1023 3)
-(71 4 284 1 2 3 246 247 210 8 48 81 83 153 157 167 170 171 172 173 174 175 178 181 195 191 200 203 207 248 215 216 217 220 222 227 245 249 250 251 253 254 315 267 331 373 338 334 335 345 337 372 374 342 343 344 375 14445 13119 6438 14555 13118 13801 6439 17362 18411 18455 6521 6522 6523 23979 23980 7905 7906)
-
-===========================================================================================
-
-Better documentation is on the way! There's still a little bit under the URL above.
-
-Enjoy it!
-
-Martin <martin@home-of-linux.org>
-
-
-
-
-

ANNOUNCE-0.25

@@ -1,241 +0,0 @@
-[Posted to the Gnome Mailing List on Fri Aug 21 1998]
-
-About this release:
-------------------
-
-LibGTop 0.25 is a stable release.
-
-Of cause it has its bug like any software has, I'm planning
-to fix as many bugs as possible in _this_ release and then
-re-release it as libgtop-0.26 or even libgtop-0.30.
-
-Especially portings to new operating systems should be made
-in this release.
-
-This also means that we can safely use this version of LibGTop
-all over the GNOME project.
-
-Currently LibGTop-Apps is still a little bit under development -
-especially the LibGTop-Apps GTop does not yet have the full
-functionallity of the real GTop.
-
-We should test this extensively and then decide whether to continue
-with the `libgtop-apps' module or whether to merge all its code
-back into the modules it came from. I'd like to hear some comments
-about this from you !
-
-Please look at the release notes below for more details about this
-release.
-
-Where to get the sources
-------------------------
-
-The sources can be found at:
-
-	ftp://ftp.home-of-linux.org/pub/
-
-Tarballs:
-
-	libgtop-0.25.0.tar.gz
-	libgtop-apps-0.25.0.tar.gz
-
-Source RPM:
-
-	libgtop-0.25.0-REL.src.rpm
-	libgtop-apps-0.25.0-REL.src.rpm
-
-Binary RPMS:
-
-	libgtop-0.25.0-REL.i386.rpm
-	libgtop-devel-0.25.0-REL.i386.rpm
-	libgtop-examples-0.25.0-REL.i386.rpm
-	libgtop-apps-0.25.0-REL.i386.rpm
-
-There is some little problem with the binary RPMS of `libgtop-apps':
-
-Most of its files will conflict with ones from `gnome-core' and `gnome-utils',
-so you'll need to use the `--force' parameter to install it.
-
-Getting the sources from CVS:
-----------------------------
-
-You can also fetch the sources from the GNOME CVS tree
-(see http://www.gnome.org/ for details).
-
-To get the latest sources:
-
-$ cvs checkout libgtop
-$ cvs checkout libgtop-apps
-
-To get the sources of *this* release:
-
-$ cvs checkout -r LIBGTOP_0_25 libgtop
-$ cvs checkout -r LIBGTOP_0_25 libgtop-apps
-
-To get the sources of this release with all bug-fixes applied:
-
-$ cvs checkout -r LIBGTOP_0_25_PATCHES libgtop
-$ cvs checkout -r LIBGTOP_0_25_PATCHES libgtop-apps
-
-To get a patch to apply to the tarballs to get all bug-fixes:
-
-$ cvs rdiff -r LIBGTOP_0_25 -r LIBGTOP_0_25_PATCHES libgtop
-$ cvs rdiff -r LIBGTOP_0_25 -r LIBGTOP_0_25_PATCHES libgtop-apps
-
-[Note for people having write access to the GNOME CVS tree:
-
- Please apply bug fixes to the `LIBGTOP_0_25_PATCHES' branch and
- merge them into the main trunk.
-
- After merging, please re-tag the branch `libgtop_0_25_after_merge'.
-
- This will help us to re-release this package when all bugs are
- fixed.
-]
-
-RELEASE NOTES FOR LIBGTOP 0.25 STABLE
-=====================================
-
-OVERVIEW
---------
-
-LibGTop is a library that read information about processes and the running
-systems. This information include:
-
-General System Information
-
-cpu		- CPU Usage
-mem		- Memory Usage
-swap		- Swap Usage (including paging activity)
-loadavg		- Load average (including nr_running, nr_tasks, last_pid)
-uptime		- Uptime and Idle time, can be calculated from CPU usage
-
-SYS V IPC Limits:
-
-shm_limits	- Shared Memory Limits
-msg_limits	- Message Queue Limits
-sem_limits	- Semaphore Set Limits
-
-Process List:
-
-proclist	- List of processes
-
-Process information:
-
-proc_state	- cmd, state, uid, gid
-proc_uid	- uid,euid,gid,egid,pid,ppid,pgrp
-		  session,tty,tpgid,priority,nice
-proc_mem	- size,vsize,resident,share,rss,rss_rlim
-proc_time	- start_time,rtime,utime,stime,cutime,cstime
-		  timeout,it_real_value,frequency
-proc_signal	- signal,blocked,sigignore,sigcatch
-proc_kernel	- k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt
-		  kstk_esp,kstk_eip,nwchan,wchan
-proc_segment	- text_rss,shlib_rss,data_rss,stack_rss,dirty_size
-		  start_code,end_code,start_stack
-
-Process maps:
-
-proc_map	- Process map (/proc/<pid>/maps under Linux)
-
-File system usage:
-
-mountlist	- List of currently mounted filesystems
-fsusage		- File system usage
-
-PORTABILITY:
------------
-
-LibGtop is designed to be as portable as possible. None of the functions
-and retrieved information should be specific to a specific operating
-system. So you only need to port the system dependent part of the library
-to a new system and all application programs can then use libgtop on this
-new system.
-
-CLIENT/SERVER MODEL:
--------------------
-
-Some systems like DEC OSF/1 or BSD require special priviledges for the calling
-proces to fetch the required information (SUID root/SGID kmem). To solve this
-problem, I designed a client/server model which makes a call to a SUID/SGID
-server which fetches the required information whenever it is required. This
-server is only called for features that really require priviledges, otherwise
-the sysdeps code is called directory (every user can get the CPU usage on
-DEC OSF/1, but only root can get information about processes other than the
-current one).
-
-There is also some kind of daemon which can be used to fetch information from
-remote systems (still experimental). This daemon normally runs as nobody and
-calls the SUID/SGID itself when needed.
-
-GNOME APPLETS:
---------------
-
-There are some applets and applications which already use LibGTop. They can
-be found in the `libgtop-apps' module in the GNOME CVS tree:
-
-* Applets:  cpuload, cpumemusage - they need LibGTop to get their information
-                                   on all systems other than Linux.
-
-* Applets:  diskusage - just uses the mountlist/fsusage features of LibGTop,
-                        the one in gnome-core also works on other systems.
-
-* Applets:  multiload - I enhanced the cpuload applet a little bit, it is
-                        now a multi applet and can display CPU, Memory and
-                        Swap usages.
-
-GTOP:
-----
-
-This cool GNOME app has been ported to use LibGTop. It can be found in
-`libgtop-apps/gtop' in the GNOME CVS tree.
-
-You can now use nearly the full functionality of GTop on FreeBSD !
-
-
-PLATTFORM SPECIFIC NOTES FOR LINUX:
-==================================
-
-Under Linux, LibGTop should work without problems and read everything
-from /proc.
-
-There is also an experimental kernel interface to read this information
-directly from the kernel with a system call - but this is still experimental
-and not well tested while I made this release.
-
-PLATTFORM SPECIFIC NOTES FOR FREEBSD:
-====================================
-
-LibGTop should now work under FreeBSD and give you the full functionality
-of GTop.
-
-There are a few caveats:
-
-* You need to manually make the `$(prefix)/bin/libgtop_server' SGID to kmem
-  after installation and mount the /proc filesystem of FreeBSD
-  (/proc/<pid>/mem is used withing kvm_uread ()).
-
-* To get the filenames of the process maps displayed in GTop, you need to
-  configure with the `--with-libgtop-inodedb' option (you need GDBM for this
-  to work).
-
-* You have then to create an inode database which is used to look up to
-  filenames. This is done using the `mkinodedb' program which comes along
-  with libgtop.
-
-  See the file src/inodedb/README for details:
-
-  The `mkinodedb' program which is build in this directory takes two
-  command line arguments: the full pathname of the database to be created
-  and the name of a configuration file consisting of directory and file names
-  each on a line by itself - see `/etc/ld.so.conf' for an example.
-
-  Putting a directory name in this file means all regular files found in this
-  directory are included in the database, but it will not recursively descend
-  into subdirectories (for instance, we want everythink in `/usr/lib' but not
-  every single file in `/usr/lib/sgml'). You can also use filenames to include
-  a single file.
-
-Have fun,
-
-Martin <martin@home-of-linux.org>

ChangeLog

@@ -1,3 +1,228 @@
+1999-03-21  Martin Baulig  <martin@home-of-linux.org>
+
+	Added a new sysctl () interface to the Linux Kernel.
+	
+	* kernel/sysctl: Imported.
+	
+	* libgtop-sysdeps.m4: If `--enable-hacker-mode' is given, check
+	for my new sysctl () interface.
+
+1999-03-20  Martin Baulig  <martin@home-of-linux.org>
+
+	Removed all traces of my old table () Linux kernel hack.
+
+	* kernel: Removed.
+	* sysdeps/kernel: Removed.
+	* libgtop-sysdeps.m4: Don't check for table (); it does not
+	exist any longer.
+
+1999-03-19  Martin Baulig  <martin@home-of-linux.org>
+
+	This is *untested* - please read "sysdeps/freebsd/ChangeLog" !
+
+	* libgtop-sysdeps.m4: Use the `freebsd' sysdeps directory for
+	BSDI as well if the `--enable-hacker-mode' parameter was given.
+
+1999-03-18  Martin Baulig  <martin@home-of-linux.org>
+
+	* LIBGTOP-VERSION: Set version number to 1.0.2 binary age 1,
+	intergace age 1.
+
+1999-03-17  Martin Baulig  <martin@home-of-linux.org>
+
+	Imported first version of my Solaris port.
+
+	* configure.in: Check for `kstat_open' in `-lkstat'.
+
+	* libgtop-sysdeps.m4: Recognize the `solaris' sysdeps directory
+	when the `--enable-hacker-mode' parameter was given.
+
+1999-03-01  Martin Baulig  <martin@home-of-linux.org>
+
+	Released LibGTop 1.0.1.
+
+	* LIBGTOP-VERSION: Set version number to 1.0.1 binary age 0,
+	interface age 0.
+
+1999-03-01  Martin Baulig  <martin@home-of-linux.org>
+
+	* configure.in (LIBGTOP_LIBS): Move `-lgtop_common' last to
+	make it work with static-only libs. Thanks to Roderik Muit
+	for pointing this out.
+	(PERL): First check for `perl5', then for `perl'. Thanks again
+	to Roderik Muit.
+
+1999-02-24  Martin Baulig  <martin@home-of-linux.org>
+
+	Released LibGTop 1.0.0.
+
+	* LIBGTOP-VERSION: Set version number to 1.0.0 binary age 0,
+	interface age 0.
+
+	* configure.in: Require GLIB >= 1.2.0.
+
+1999-02-23  Martin Baulig  <martin@home-of-linux.org>
+
+	Released LibGTop 0.100.0.
+
+	Make the copyright of LibGTop be the GNU General Public License.
+
+	* LIBGTOP-VERSION: Set version number to 0.100.0 binary age 0,
+	interface age 0.
+
+	* copyright.txt: Set the year to 1998-99 and pretty-format it a
+	little bit. Same in all C source and header files.
+
+1999-02-21  Martin Baulig  <martin@home-of-linux.org>
+
+	* configure.in (LIBGTOP_*_INCS): Define `HAVE_GLIBTOP_MACHINE_H'
+	if appropriate.
+
+1999-02-19  Martin Baulig  <martin@home-of-linux.org>
+
+	Released LibGTop 0.99.9.
+
+	* LIBGTOP-VERSION: Set version number to 0.99.9 binary age 0,
+	interface age 0.
+
+	* include/glibtop/error.h: Don't include <glib.h>.
+	* sysdeps/common/error.c: Use `int' not `gint'.
+
+	* misc/porting-libgtop.txt: Added a few instructions on how
+	to port LibGTop to Solaris.
+
+	* Replace all __BEGIN_DELCS with LIBGTOP_BEGIN_DECLS and all
+	__END_DECLS with LIBGTOP_END_DECLS; remove all __P macros and
+	use real function prototypes.
+
+1999-02-18  Martin Baulig  <martin@home-of-linux.org>
+
+	* include/glibtop/*.h: Use glib-like function prototypes
+	instead of "extern <function> __P((args))".
+
+	* sysdeps/common/error.h: Replaced inline with static.
+
+1999-02-18  Martin Baulig  <martin@home-of-linux.org>
+
+	* */*.awk: Replaced all awk scripts with perl scripts since it is
+	more likely that people have a working perl interpreter than GNU
+	awk on their system.
+
+1999-02-18  Martin Baulig  <martin@home-of-linux.org>
+
+	* sysdeps/common/error.c (glibtop_error_r, glibtop_warn_r): Define
+	them as G_INLINE_FUNC in <glibtop/errno.h> if possible.
+	(glibtop_error_io_r, glibtop_warn_io_r): Likewise.
+	(glibtop_error_vr, glibtop_warn_vr): New functions taking a va_list.
+	(glibtop_error_io_vr, glibtop_warn_io_vr): New functions taking an
+	errno an a va_list.
+
+1999-02-17  Martin Baulig  <martin@home-of-linux.org>
+
+	Released LibGTop 0.99.8.
+
+1999-02-16  Martin Baulig  <martin@home-of-linux.org>
+
+	* examples/Makefile.am, lib/Makefile.am, src/daemon/Makefile.am,
+	  sysdeps/common/Makefile.am, sysdeps/guile/Makefile.am,
+	  sysdeps/guile/names/Makefile.am, sysdeps/kernel/Makefile.am,
+	  sysdeps/linux/Makefile.am, sysdeps/names/Makefile.am,
+	  sysdeps/osf1/Makefile.am, sysdeps/stub/Makefile.am,
+	  sysdeps/stub_suid/Makefile.am, sysdeps/sun4/Makefile.am:
+	Initialize INCLUDES to `@INCLUDES@' to make it clear that it is
+	set in configure.in. It is ok to add things there, but you must
+	not remove the `@INCLUDES@'.
+
+1999-02-15  Jeff Garzik  <jgarzik@pobox.com>
+
+	* examples/Makefile.am, lib/Makefile.am, src/daemon/Makefile.am,
+	  sysdeps/common/Makefile.am, sysdeps/guile/Makefile.am,
+	  sysdeps/guile/names/Makefile.am, sysdeps/kernel/Makefile.am,
+	  sysdeps/linux/Makefile.am, sysdeps/names/Makefile.am,
+	  sysdeps/osf1/Makefile.am, sysdeps/stub/Makefile.am,
+	  sysdeps/stub_suid/Makefile.am, sysdeps/sun4/Makefile.am:
+	Removed hardcoded gcc arguments from CFLAGS.
+
+	* include/glibtop/error.h:
+	Added FIXME comment about varargs macros breaking Sun cc
+	compilation.
+
+1999-02-12  Martin Baulig  <martin@home-of-linux.org>
+
+	Thanks to Frederic Devernay for pointing out that we need to define
+	__BEGIN_DECLS and __END_DECLS when not using GNOME.
+
+	* configure.in: Define `WITHOUT_GNOME' if appropriate.
+
+	* include/glibtop/global.h: Define __BEGIN_DECLS and __END_DECLS
+	when WITHOUT_GNOME not when _IN_LIBGTOP.
+
+1999-02-12  Martin Baulig  <martin@home-of-linux.org>
+
+	* include/glibtop/global.h: Applied patch from Frederic Devernay;
+	__BEGIN_DECLS and __END_DECLS are only defined inside _IN_LIBGTOP.
+
+1999-02-10  Martin Baulig  <martin@home-of-linux.org>
+
+	* configure.in (program_invocation_name): Check whether we need
+ 	to declare this; some libc5 systems define that symbol but do
+	not declare it in any header file.
+
+1999-02-10  Martin Baulig  <martin@home-of-linux.org>
+
+	* libgtop.spec.in, libgtop.spec: Replaced libgtop.spec with
+	with libgtop.spec.in, so libgtop.spec is now a generated file.
+
+1999-02-05  Martin Baulig  <martin@home-of-linux.org>
+
+	* include/glibtop/global.h: Enclose some of the stuff in this
+	file in `#ifdef _IN_LIBGTOP'.
+
+1999-02-04  Martin Baulig  <martin@home-of-linux.org>
+
+	* include/glibtop/global.h (_): Use dgettext (), not gettext ().
+
+1999-01-23  Martin Baulig  <martin@home-of-linux.org>
+
+	* libgtopConf.sh.in (LIBGTOP_DATADIR): New variable.
+
+1999-01-06  Martin Baulig  <martin@home-of-linux.org>
+
+	* libgtop-sysdeps.m4: Always enable SMP support for Linux.
+
+1999-01-03  Martin Baulig  <martin@home-of-linux.org>
+
+	Released LibGTop 0.99.2.
+
+1999-01-05  Martin Baulig  <martin@home-of-linux.org>
+
+	* libgtop.spec: Always build SMP support; binary packages should
+	contain all possible features.
+
+	* configure.in: LibGTop will now require GLIB >= 1.1.12.
+	
+1999-01-05  Martin Baulig  <martin@home-of-linux.org>
+
+	* configure.in: Make it abort if the `dc' utility is not installed.
+
+1999-01-03  Martin Baulig  <martin@home-of-linux.org>
+
+	Released LibGTop 0.99.1.
+
+1998-12-25  Martin Baulig  <martin@home-of-linux.org>
+
+	* configure.in (LIBGTOP_INCS): Define `HAVE_LIBGTOP_SMP' if SMP
+	support was enabled.
+
+1998-12-22  Yukihiro Nakai  <Nakai@TokyoNet.AD.JP>
+
+	* configure.in (ALL_LINGUAS): Added `ja'.
+
+1998-12-18  Martin Baulig  <martin@home-of-linux.org>
+
+	* Makefile.am: Applied patch from Edward Jason Riedy to use '#'
+	as separator in sed commands.
+
 1998-12-15  Martin Baulig  <martin@home-of-linux.org>
 
 	Released LibGTop 0.99.0 which is a feature-freezed version

LIBGTOP-VERSION

@@ -6,15 +6,15 @@
 # if backwards compatibility has been broken,
 # set LIBGTOP_BINARY_AGE and LIBGTOP_INTERFACE_AGE to 0.
 #
-LIBGTOP_MAJOR_VERSION=0
+LIBGTOP_MAJOR_VERSION=1
-LIBGTOP_MINOR_VERSION=99
+LIBGTOP_MINOR_VERSION=0
-LIBGTOP_MICRO_VERSION=0
+LIBGTOP_MICRO_VERSION=2
 
-LIBGTOP_INTERFACE_AGE=0
+LIBGTOP_INTERFACE_AGE=1
-LIBGTOP_BINARY_AGE=0
+LIBGTOP_BINARY_AGE=1
 
 # Increase each time you change the client/server protocol.
-LIBGTOP_SERVER_VERSION=3
+LIBGTOP_SERVER_VERSION=5
 
 # Don't change this
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION

Makefile.am

@@ -15,9 +15,12 @@ SUBDIRS = po intl $(support) macros misc include sysdeps lib src \
 
 include_HEADERS = glibtop.h
 
-EXTRA_DIST = autogen.sh libgtop.spec copyright.txt libgtopConf.sh.in \
+EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in \
 	LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 \
-	libgtop-sysdeps.m4
+	RELNOTES-1.0 libgtop-sysdeps.m4 README NEWS.old libgtop-mirror.sh
+
+dist-hook:
+	cp libgtop.spec $(distdir)
 
 release:
 	$(MAKE) dist distdir=$(PACKAGE)-$(VERSION)
@@ -44,35 +47,36 @@ bin_SCRIPTS = $(top_builddir)/libgtop-config
 ## is an autoconf feature, not a bug).
 libgtopConf.sh: libgtopConf.sh.in Makefile
 ## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's,\@LIBGTOP_LIBDIR\@,$(libdir),g' \
+	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
-	    -e 's,\@LIBGTOP_INCLUDEDIR\@,$(includedir),g' \
+	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)#g' \
-	    -e 's,\@LIBGTOP_EXTRA_LIBS\@,$(LIBGTOP_EXTRA_LIBS),g' \
+	  -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \
-	    -e 's,\@LIBGTOP_LIBS\@,$(LIBGTOP_LIBS),g' \
+	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
-	    -e 's,\@LIBGTOP_INCS\@,$(LIBGTOP_INCS),g' \
+	  -e 's#\@LIBGTOP_LIBS\@#$(LIBGTOP_LIBS)#g' \
-	    -e 's,\@LIBGTOP_NAMES_LIBS\@,$(LIBGTOP_NAMES_LIBS),g' \
+	  -e 's#\@LIBGTOP_INCS\@#$(LIBGTOP_INCS)#g' \
-	    -e 's,\@LIBGTOP_NAMES_INCS\@,$(LIBGTOP_NAMES_INCS),g' \
+	  -e 's#\@LIBGTOP_NAMES_LIBS\@#$(LIBGTOP_NAMES_LIBS)#g' \
-	    -e 's,\@LIBGTOP_GUILE_LIBS\@,$(LIBGTOP_GUILE_LIBS),g' \
+	  -e 's#\@LIBGTOP_NAMES_INCS\@#$(LIBGTOP_NAMES_INCS)#g' \
-	    -e 's,\@LIBGTOP_GUILE_INCS\@,$(LIBGTOP_GUILE_INCS),g' \
+	  -e 's#\@LIBGTOP_GUILE_LIBS\@#$(LIBGTOP_GUILE_LIBS)#g' \
-	    -e 's,\@LIBGTOP_GUILE_NAMES_LIBS\@,$(LIBGTOP_GUILE_NAMES_LIBS),g' \
+	  -e 's#\@LIBGTOP_GUILE_INCS\@#$(LIBGTOP_GUILE_INCS)#g' \
-	    -e 's,\@LIBGTOP_GUILE_NAMES_INCS\@,$(LIBGTOP_GUILE_NAMES_INCS),g' \
+	  -e 's#\@LIBGTOP_GUILE_NAMES_LIBS\@#$(LIBGTOP_GUILE_NAMES_LIBS)#g' \
-	    -e 's,\@LIBGTOP_BINDIR\@,$(LIBGTOP_BINDIR),g' \
+	  -e 's#\@LIBGTOP_GUILE_NAMES_INCS\@#$(LIBGTOP_GUILE_NAMES_INCS)#g' \
-	    -e 's,\@LIBGTOP_SERVER\@,$(LIBGTOP_SERVER),g' \
+	  -e 's#\@LIBGTOP_BINDIR\@#$(LIBGTOP_BINDIR)#g' \
-	    -e 's,\@LIBGTOP_MAJOR_VERSION\@,$(LIBGTOP_MAJOR_VERSION),g' \
+	  -e 's#\@LIBGTOP_SERVER\@#$(LIBGTOP_SERVER)#g' \
-	    -e 's,\@LIBGTOP_MINOR_VERSION\@,$(LIBGTOP_MINOR_VERSION),g' \
+	  -e 's#\@LIBGTOP_MAJOR_VERSION\@#$(LIBGTOP_MAJOR_VERSION)#g' \
-	    -e 's,\@LIBGTOP_MICRO_VERSION\@,$(LIBGTOP_MICRO_VERSION),g' \
+	  -e 's#\@LIBGTOP_MINOR_VERSION\@#$(LIBGTOP_MINOR_VERSION)#g' \
-	    -e 's,\@LIBGTOP_VERSION\@,$(LIBGTOP_VERSION),g' \
+	  -e 's#\@LIBGTOP_MICRO_VERSION\@#$(LIBGTOP_MICRO_VERSION)#g' \
-	    -e 's,\@LIBGTOP_VERSION_CODE\@,$(LIBGTOP_VERSION_CODE),g' \
+	  -e 's#\@LIBGTOP_VERSION\@#$(LIBGTOP_VERSION)#g' \
-	    -e 's,\@LIBGTOP_SERVER_VERSION\@,$(LIBGTOP_SERVER_VERSION),g' \
+	  -e 's#\@LIBGTOP_VERSION_CODE\@#$(LIBGTOP_VERSION_CODE)#g' \
-	    -e 's,\@libgtop_sysdeps_dir\@,$(libgtop_sysdeps_dir),g' \
+	  -e 's#\@LIBGTOP_SERVER_VERSION\@#$(LIBGTOP_SERVER_VERSION)#g' \
-	    -e 's,\@libgtop_need_server\@,$(libgtop_need_server),g' \
+	  -e 's#\@libgtop_sysdeps_dir\@#$(libgtop_sysdeps_dir)#g' \
-	    -e 's,\@libgtop_use_machine_h\@,$(libgtop_use_machine_h),g' \
+	  -e 's#\@libgtop_need_server\@#$(libgtop_need_server)#g' \
-	    -e 's,\@libgtop_guile_found\@,$(libgtop_guile_found),g' \
+	  -e 's#\@libgtop_use_machine_h\@#$(libgtop_use_machine_h)#g' \
-	    -e 's,\@libgtop_want_examples\@,$(libgtop_want_examples),g' \
+	  -e 's#\@libgtop_guile_found\@#$(libgtop_guile_found)#g' \
+	  -e 's#\@libgtop_want_examples\@#$(libgtop_want_examples)#g' \
 	      < $(srcdir)/libgtopConf.sh.in > libgtopConf.tmp \
 	  && mv libgtopConf.tmp libgtopConf.sh
 
 libgtop-config: libgtop-config.in Makefile
-	sed -e 's,\@LIBGTOP_LIBDIR\@,$(libdir),g' \
+	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
 	      < $(srcdir)/libgtop-config.in > libgtop-config.tmp \
 	  && mv libgtop-config.tmp libgtop-config && \
 		chmod 755 libgtop-config

NEWS

@@ -1,244 +0,0 @@
-$Id$
-
-Jun/01/1998
-===========
-
-	* We have some new ``suffix rules'':
-
-	  '__l' is a function defined in the client part;
-	  '__s' is a function defined in the sysdeps part and
-	  '__p' is a function that needs special priviledges.
-	  '__r' is mapped either on '__p' or on '__s'.
-	  the function without suffix is mapped on '__l'.
-
-	* We now decide at runtime whether or not using the server
-	is required for a particular function. All user programs
-	now call the '__l' function defined in '-lgtop' (in the lib
-	subdir). These functions either use 'glibtop_call__l' to
-	call the server or call the '__r' function.
-
-	* A function in the sysdeps directory now has the '__s' suffix
-	if it do not need any priviledges (and thus can be called directly
-	from client code) and the '__p' suffix otherwise (when it has to
-	be called from the server).
-
-	* If you call one of these functions:
-
-	  -> use the '__p' suffix to be sure to get the SUID-safe one
-	     (used in the server).
-	  -> use the '__s' suffix to be sure to get a function that
-	     doesn't need any priviledges.
-	  -> use the '__r' suffix otherwise (it is mapped either on the
-	     '__p' or on the '__s' one).
-
-	Only use the '__p' and '__s' functions in a 'GLIBTOP_SUID_<feature>'
-	conditional, otherwise you'll get undefined symbols !
-
-	* The server is now started from 'glibtop_init__r', but only when
-	it's really needed; for instance on DEC OSF/1 you only need it
-	for the proc* features - if you program only fetches the CPU usage,
-	now server will be started.
-
-	* Sorry, at the moment everything is a little bit unstable, I'm doing
-	heavy changes. I've just some great ideas which still need some work:
-
-	  -> I want to have a SUID server that only implements those features
-	     that need to be SUID; everything else uses the sysdeps code directly.
-
-	  -> If a program only uses stuff that do not need the server, the
-	     server will not be started at all.
-
-	  -> I'm working on some kind of proxy server that can be used on a remote
-	     host; in feature one can then use the MDI stuff from ghex in gtop to
-	     have notebook pages displaying processes from different hosts.
-
-	* Well it is as much unstable that it only works under Linux at the moment.
-
-1998-06-01  Martin Baulig  <martin@home-of-linux.org>
-
-	* sysdeps/common/sysdeps.c: now using '__r' functions,
-	they are #defined either as the '__p' or the '__s' ones.
-
-	* sysdeps/linux/*.c: changed call of 'glibtop_init__r',
-	it now takes two additional arguments.
-
-	* examples/{first.c, second.c}: now using 'glibtop_init'
-	instead of 'glibtop_init__r'.
-
-	* include/glibtop/sysdeps.h: added 'dummy' member so
-	'GLIBTOP_SYSDEPS_<feature>' now start with 1.
-
-	* include/glibtop/*.h: we now #define 'glibtop_get_<feature>'
-	as 'glibtop_get_<feature>__l' and 'glibtop_get_<feature>__r'
-	either as the '__p' or the '__s' function.
-
-	* lib/*.c: removed #if's - we now decide at runtime
-	whether to use the server or to call the appropriate
-	function for the sysdeps directory.
-
-1998-05-28  Martin Baulig  <baulig@merkur.uni-trier.de>
-
-	* src/server/main.c: we now use the '__p' functions,
-	but only if the appropriate 'GLIBTOP_SUID_<feature>'
-	has a non-zero value.
-	
-	* configure.in (@machine_incs@): always use 
-	`-I$(top_srcdir)/sysdeps/@sysdeps_dir@'; it's no
-	longer conditional.
-
-	* examples/Makefile.am: removed the '_linux' examples.
-	
-	* sysdeps/linux/*.c: renamed all functions implementing
-	features to '__s'.
-	
-	* lib/*.c: renamed all functions implementing features
-	to '__l'; we only emit code for those functions if the
- 	corresponding 'GLIBTOP_SUID_<feature>' has a positive value.
-	
-	* include/glibtop/*.h: added some new function suffixes:
-	'__l' is a function defined in the client part;
-	'__s' is a function defined in the sysdeps part and
-	'__p' is a function that needs special priviledges.
-	'__r' is mapped either on '__l' or on '__s'.
-	
-	* sysdeps/linux/glibtop_server.h: New file -
-	defines system dependent constants 'GLIBTOP_SUID_<feature>'
-	being either 'GLIBTOP_SYSDEPS_<feature>'+1 depending upon
- 	whether or not this feature requires using the server.
-
-	* lib/sysdeps.c: removed that file; it is no longer
-	needed.
-
-
-
-May/21/1998
-===========
-
-* doc/gnome-hackers.sgml: This is a short intro on how to use libgtop
-  in the GNOME project. It covers especially the use of its 'configure'
-  script and the automatically generated 'gtopConf.sh'.
-
-May/20/1998
-===========
-
-* 'gtopConf.sh' now defines 'GTOP_LIBS' and 'GTOP_INCS' in a manner
-  that they contain everything that is needed to link some program with
-  libgtop. It will use '-lgtop' only if the server is really needed and
-  '-lgtop_sysdeps' otherwise;
-
-* 'gtopConf.sh' additionally defines 'GTOP_GUILE_LIBS' and 'GTOP_GUILE_INCS'
-  containing everything that is needed to link some program both with
-  libgtop and its guile interface. They are identically to 'GTOP_LIBS'
-  and 'GTOP_INCS' if building the guile interface is disabled or guile
-  cannot be found on the system.
-
-* 'configure' takes additional arguments '--enable-libgtop-server' and
-  '--disable-libgtop-server' to use the server even when it's not needed
-  or to disable it's use where it's needed.
-
-* 'configure' takes an argument '--without-libgtop-guile' to disable
-  guile support.
-
-* 'configure takes an argument '--without-libgtop-names' to remove
-  '-lgtop_names' (and '-lgtop_guile_names' when we have guile) from
-  'GTOP_LIBS'; in this case these libraries are not even built.
-
-May/19/1998
-===========
-
-* Libgtop is now in the GNOME CVS Repository.
-
-May/17/1998
-===========
-
-* we have now 'const char *glibtop_types_* []' consisting
-  of the C types of the corresponding files of '_glibtop_*'.
-
-* added guile function '(glibtop-types-*)' and '(glibtop-descriptions-*)'.
-
-May/10/1998
-===========
-
-* Port to DEC OSF1 3.0 has been made:
-
-  cpu		(total, user, nice, sys, idle)
-  mem		(total, used, free)
-
-  loadavg	(loadavg)
-  uptime	(uptime)
-
-  msg_limits	(map, max, mnb, mni, tql)
-  sem_limits	(mni, msl, opm, vmx, aem)
-  shm_limits	(max, min, mni, seg)
-
-  The following need the server to be SUID root:
-
-  proclist	(total, number, size)
-  procdata	(cmd, state, uid, pid, ppid, pgrp, tty, k_flags,
-		 session, tpgid, sigignore, sigcatch, signal, nice, 
-		 priority, resident, rss, vsize, utime, stime,
-		 cutime, cstime, trs, drs)
-
-May/07/1998
-===========
-
-* 'flags' member of sysdeps/linux/procdata.c is now
-  'unsigned long flags [2]'.
-
-* When we give glibtop_get_procdata () a pid of zero, only
-  the flags are returned.
-
-* We now use static constants instead of #defines for sysdeps flags.
-
-May/03/1998
-===========
-
-* VPATH-Build now working; sometimes it's necessary to copy
-  $(top_srcdir)/po/cat-id-tbl.c to $(top_builddir)/po.
-
-* The library has been tested on the following systems:
-
-  - i686-pc-linux-gnu
-  - sparc-sun-sunos4.1.1
-  - alpha-dec-osf1 (that's DEC OSF1 3.0 and 3.2)
-
-* Compilation has been tested on the following systems (I have no root
-  access there and cannot test the library because of this):
-
-  - sparc-sun-solaris2
-  - i386-bsdi
-
-* Does no longer require Gnome.
-
-* Guile-Parts are compiled only if guile can be found.
-
-* Some of the executables are statically linked to copy them more easily
-  between machines.
-
-May/02/1998
-===========
-
- * Global changes to the interfaces, all functions except glibtop_open()
-   and glibtop_close() that took a server argument have now a '__r' suffix;
-   the original name is now a macro that uses glibtop_global_server.
-
-Apr/10/1998
-===========
-Added new directory sysdeps/guile/names. It is the guile interface
-to the gtop_names library found in sysdeps/names. Changed
-GLIBTOP_DESCRIPTIONS to GLIBTOP_NAMES and added GLIBTOP_GUILE_NAMES
-to the header files.
-
-Apr/09/1998
-===========
-Added new directories guile and names to sysdeps. In names are
-some string constants about the data stored in the structures.
-guile is a guile interface for the library. It is used in
-examples/third (which has been completely rewritten).
-The header files define things from names when GLIBTOP_DESCRIPTIONS
-if defined and/or from guile when HAVE_GUILE is defined.
-
-Apr/08/1998
-===========
-
-Added guile wrapper for the library (see examples/third).

NEWS.old

@@ -0,0 +1,244 @@
+$Id$
+
+Jun/01/1998
+===========
+
+	* We have some new ``suffix rules'':
+
+	  '__l' is a function defined in the client part;
+	  '__s' is a function defined in the sysdeps part and
+	  '__p' is a function that needs special priviledges.
+	  '__r' is mapped either on '__p' or on '__s'.
+	  the function without suffix is mapped on '__l'.
+
+	* We now decide at runtime whether or not using the server
+	is required for a particular function. All user programs
+	now call the '__l' function defined in '-lgtop' (in the lib
+	subdir). These functions either use 'glibtop_call__l' to
+	call the server or call the '__r' function.
+
+	* A function in the sysdeps directory now has the '__s' suffix
+	if it do not need any priviledges (and thus can be called directly
+	from client code) and the '__p' suffix otherwise (when it has to
+	be called from the server).
+
+	* If you call one of these functions:
+
+	  -> use the '__p' suffix to be sure to get the SUID-safe one
+	     (used in the server).
+	  -> use the '__s' suffix to be sure to get a function that
+	     doesn't need any priviledges.
+	  -> use the '__r' suffix otherwise (it is mapped either on the
+	     '__p' or on the '__s' one).
+
+	Only use the '__p' and '__s' functions in a 'GLIBTOP_SUID_<feature>'
+	conditional, otherwise you'll get undefined symbols !
+
+	* The server is now started from 'glibtop_init__r', but only when
+	it's really needed; for instance on DEC OSF/1 you only need it
+	for the proc* features - if you program only fetches the CPU usage,
+	now server will be started.
+
+	* Sorry, at the moment everything is a little bit unstable, I'm doing
+	heavy changes. I've just some great ideas which still need some work:
+
+	  -> I want to have a SUID server that only implements those features
+	     that need to be SUID; everything else uses the sysdeps code directly.
+
+	  -> If a program only uses stuff that do not need the server, the
+	     server will not be started at all.
+
+	  -> I'm working on some kind of proxy server that can be used on a remote
+	     host; in feature one can then use the MDI stuff from ghex in gtop to
+	     have notebook pages displaying processes from different hosts.
+
+	* Well it is as much unstable that it only works under Linux at the moment.
+
+1998-06-01  Martin Baulig  <martin@home-of-linux.org>
+
+	* sysdeps/common/sysdeps.c: now using '__r' functions,
+	they are #defined either as the '__p' or the '__s' ones.
+
+	* sysdeps/linux/*.c: changed call of 'glibtop_init__r',
+	it now takes two additional arguments.
+
+	* examples/{first.c, second.c}: now using 'glibtop_init'
+	instead of 'glibtop_init__r'.
+
+	* include/glibtop/sysdeps.h: added 'dummy' member so
+	'GLIBTOP_SYSDEPS_<feature>' now start with 1.
+
+	* include/glibtop/*.h: we now #define 'glibtop_get_<feature>'
+	as 'glibtop_get_<feature>__l' and 'glibtop_get_<feature>__r'
+	either as the '__p' or the '__s' function.
+
+	* lib/*.c: removed #if's - we now decide at runtime
+	whether to use the server or to call the appropriate
+	function for the sysdeps directory.
+
+1998-05-28  Martin Baulig  <baulig@merkur.uni-trier.de>
+
+	* src/server/main.c: we now use the '__p' functions,
+	but only if the appropriate 'GLIBTOP_SUID_<feature>'
+	has a non-zero value.
+	
+	* configure.in (@machine_incs@): always use 
+	`-I$(top_srcdir)/sysdeps/@sysdeps_dir@'; it's no
+	longer conditional.
+
+	* examples/Makefile.am: removed the '_linux' examples.
+	
+	* sysdeps/linux/*.c: renamed all functions implementing
+	features to '__s'.
+	
+	* lib/*.c: renamed all functions implementing features
+	to '__l'; we only emit code for those functions if the
+ 	corresponding 'GLIBTOP_SUID_<feature>' has a positive value.
+	
+	* include/glibtop/*.h: added some new function suffixes:
+	'__l' is a function defined in the client part;
+	'__s' is a function defined in the sysdeps part and
+	'__p' is a function that needs special priviledges.
+	'__r' is mapped either on '__l' or on '__s'.
+	
+	* sysdeps/linux/glibtop_server.h: New file -
+	defines system dependent constants 'GLIBTOP_SUID_<feature>'
+	being either 'GLIBTOP_SYSDEPS_<feature>'+1 depending upon
+ 	whether or not this feature requires using the server.
+
+	* lib/sysdeps.c: removed that file; it is no longer
+	needed.
+
+
+
+May/21/1998
+===========
+
+* doc/gnome-hackers.sgml: This is a short intro on how to use libgtop
+  in the GNOME project. It covers especially the use of its 'configure'
+  script and the automatically generated 'gtopConf.sh'.
+
+May/20/1998
+===========
+
+* 'gtopConf.sh' now defines 'GTOP_LIBS' and 'GTOP_INCS' in a manner
+  that they contain everything that is needed to link some program with
+  libgtop. It will use '-lgtop' only if the server is really needed and
+  '-lgtop_sysdeps' otherwise;
+
+* 'gtopConf.sh' additionally defines 'GTOP_GUILE_LIBS' and 'GTOP_GUILE_INCS'
+  containing everything that is needed to link some program both with
+  libgtop and its guile interface. They are identically to 'GTOP_LIBS'
+  and 'GTOP_INCS' if building the guile interface is disabled or guile
+  cannot be found on the system.
+
+* 'configure' takes additional arguments '--enable-libgtop-server' and
+  '--disable-libgtop-server' to use the server even when it's not needed
+  or to disable it's use where it's needed.
+
+* 'configure' takes an argument '--without-libgtop-guile' to disable
+  guile support.
+
+* 'configure takes an argument '--without-libgtop-names' to remove
+  '-lgtop_names' (and '-lgtop_guile_names' when we have guile) from
+  'GTOP_LIBS'; in this case these libraries are not even built.
+
+May/19/1998
+===========
+
+* Libgtop is now in the GNOME CVS Repository.
+
+May/17/1998
+===========
+
+* we have now 'const char *glibtop_types_* []' consisting
+  of the C types of the corresponding files of '_glibtop_*'.
+
+* added guile function '(glibtop-types-*)' and '(glibtop-descriptions-*)'.
+
+May/10/1998
+===========
+
+* Port to DEC OSF1 3.0 has been made:
+
+  cpu		(total, user, nice, sys, idle)
+  mem		(total, used, free)
+
+  loadavg	(loadavg)
+  uptime	(uptime)
+
+  msg_limits	(map, max, mnb, mni, tql)
+  sem_limits	(mni, msl, opm, vmx, aem)
+  shm_limits	(max, min, mni, seg)
+
+  The following need the server to be SUID root:
+
+  proclist	(total, number, size)
+  procdata	(cmd, state, uid, pid, ppid, pgrp, tty, k_flags,
+		 session, tpgid, sigignore, sigcatch, signal, nice, 
+		 priority, resident, rss, vsize, utime, stime,
+		 cutime, cstime, trs, drs)
+
+May/07/1998
+===========
+
+* 'flags' member of sysdeps/linux/procdata.c is now
+  'unsigned long flags [2]'.
+
+* When we give glibtop_get_procdata () a pid of zero, only
+  the flags are returned.
+
+* We now use static constants instead of #defines for sysdeps flags.
+
+May/03/1998
+===========
+
+* VPATH-Build now working; sometimes it's necessary to copy
+  $(top_srcdir)/po/cat-id-tbl.c to $(top_builddir)/po.
+
+* The library has been tested on the following systems:
+
+  - i686-pc-linux-gnu
+  - sparc-sun-sunos4.1.1
+  - alpha-dec-osf1 (that's DEC OSF1 3.0 and 3.2)
+
+* Compilation has been tested on the following systems (I have no root
+  access there and cannot test the library because of this):
+
+  - sparc-sun-solaris2
+  - i386-bsdi
+
+* Does no longer require Gnome.
+
+* Guile-Parts are compiled only if guile can be found.
+
+* Some of the executables are statically linked to copy them more easily
+  between machines.
+
+May/02/1998
+===========
+
+ * Global changes to the interfaces, all functions except glibtop_open()
+   and glibtop_close() that took a server argument have now a '__r' suffix;
+   the original name is now a macro that uses glibtop_global_server.
+
+Apr/10/1998
+===========
+Added new directory sysdeps/guile/names. It is the guile interface
+to the gtop_names library found in sysdeps/names. Changed
+GLIBTOP_DESCRIPTIONS to GLIBTOP_NAMES and added GLIBTOP_GUILE_NAMES
+to the header files.
+
+Apr/09/1998
+===========
+Added new directories guile and names to sysdeps. In names are
+some string constants about the data stored in the structures.
+guile is a guile interface for the library. It is used in
+examples/third (which has been completely rewritten).
+The header files define things from names when GLIBTOP_DESCRIPTIONS
+if defined and/or from guile when HAVE_GUILE is defined.
+
+Apr/08/1998
+===========
+
+Added guile wrapper for the library (see examples/third).

README

@@ -1,57 +1,8 @@
-Hi all,
+$Id$
 
-[PLEASE READ THE FILE ``README.LATEST'' FOR LATEST NEWS]
+LATEST NEWS:
-
-this is the latest alpha version of libgtop, a library that fetches
-information about the running system such as cpu and memory usage,
-active processes etc. On Linux systems, these information are taken
-directly from the /proc filesystem. For other systems such as Solaris,
-where such programs need to be suid root (or only setgid kmem/mem on
-some systems), it provides a suid/setgid server that fetches those
-information and a client-side library that talks to this server.
-
-Main idea was to have the same interface for all operating systems,
-thus all system dependent details are hidden in the implementation
-of that server.
-
-Currently, it only works for Linux, documentation on how to port it
-to other systems is on the way. I'm planning to keep this site an
-up-to-date mirror of my local machine (which is connected to the
-internet over some expensive dialup connection, so I'll upload it about
-once every day I made significant changes) so that you can always find
-the latest version of the software here.
-
-I've written a simple guile interface for the library to show which
-information it can already fetch. See examples/third for details.
-
-Source Code:
 ===========
 
-   libgtop-current-cvs.cpio.gz     is a cpio archive from the CVS repository
+Please look also in the file 'NEWS' for latest news.
-   libgtop-current.cpio.gz         contains the lates checked out sources
-   libgtop-stable.cpio.gz          if present, it contains the last stable release
  
-Documentation:
+Martin
-=============
-
-   libgtop.sgml                    is the SGML source of the (DocBook) documentation
-
-The next three files are only provided until they get too big to upload.
-
-   libgtop.tex                     TEX file of the documentation
-   libgtop.dvi                     DVI file of the documentation
-   libgtop.ps                      Postscript file of the documentation
-
-HTML-Documentation:
-==================
-
-   libgtop.shtml                   Start here to browse the HTML documentation
-
-Other stuff:
-===========
-
-   README, NEWS, ChangeLog         copied from the sources
-
-Enjoy it!
-
-Martin (martin@home-of-linux.org - baulig@merkur.uni-trier.de)

README.LATEST

@@ -1,8 +0,0 @@
-$Id$
-
-LATEST NEWS:
-===========
-
-Please look also in the file 'NEWS' for latest news.
- 
-Martin

RELNOTES-1.0

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

TODO

@@ -1,4 +1,4 @@
-This is LibGTop 0.30.0,
+This is LibGTop 0.99.2,
 
 a feature-freezed version of LibGTop for GNOME 1.0.
 
@@ -15,9 +15,7 @@ NOTE:  LibGTop is already feature-freezed for GNOME 1.0, so only bug fixes
 Sysdeps directory 'linux':
 ==========================
 
-* Add implementation `netload' and `ppp' with modems.
+* Add implementation for `ppp' with modems.
-
-* Add implementation for `proc_args'.
 
 Sysdeps directory 'freebsd':
 ============================
@@ -43,6 +41,6 @@ Everything except sysdeps directories:
 
 * Ready for Gnome 1.0. [ALREADY FEATURE FREEZED]
 
-December 15, 1998
+January 5, 1999
 
 Martin

acconfig.h

@@ -11,6 +11,9 @@
 /* Define if getpagesize () must be declared. */
 #undef NEED_DECLARATION_GETPAGESIZE
 
+/* Define if program_invocation_name must be declared. */
+#undef NEED_DECLARATION_PROGRAM_INVOCATION_NAME
+
 @TOP@
 
 #undef ENABLE_NLS
@@ -135,7 +138,7 @@
 
 #undef NEED_LIBGTOP
 
-#undef HAVE_LINUX_TABLE
+#undef HAVE_LINUX_SYSCTL
 #undef HAVE_LIBGTOP_SMP
 
 #undef HAVE_XAUTH
@@ -152,3 +155,7 @@
  * the running kernel (if we don't have configured kernel sources).
  */
 #undef GLIBTOP_LINUX_VERSION_CODE
+
+/* Define if you want to use LibGTop without GNOME. */
+#undef WITHOUT_GNOME
+

configure.in

@@ -6,6 +6,16 @@ AC_INIT(copyright.txt)
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
 
+dnl This is required at several places
+AC_CHECK_PROG(ac_dc_found, dc, yes, no)
+if test x$ac_dc_found != xyes ; then
+AC_MSG_ERROR([
+*** The "dc" utility was not found on your system.
+***
+*** When using RedHat Linux, you need to install the "bc" package.
+***])
+fi
+
 . $srcdir/LIBGTOP-VERSION
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 
@@ -42,6 +52,10 @@ dnl does not work for libgtop.
 AC_CHECK_PROGS(AWK, gawk awk, )
 test -z "$AWK" && AC_MSG_ERROR([Sorry, you need a working awk interpreter.])
 
+dnl Most people should have a working perl interpreter on their system
+AC_CHECK_PROGS(PERL, perl5 perl)
+test -z "$PERL" && AC_MSG_ERROR([You need to have a working perl interpreter.])
+
 AC_CHECK_TOOL(CC,gcc)
 AC_CHECK_TOOL(RANLIB,ranlib)
 AC_CHECK_TOOL(AS,as)
@@ -72,6 +86,8 @@ if test "x$gnome_found" != xyes; then
 *** If you want to use LibGTop without GNOME, you need
 *** to give configure the --without-gnome parameter.
 ])
+  else
+    AC_DEFINE(WITHOUT_GNOME)
   fi
   GNOME_SUPPORT_CHECKS
 else
@@ -143,7 +159,7 @@ AC_SUBST(guile_subdirs)
 
 AM_PROG_LIBTOOL
 
-AM_PATH_GLIB(1.1.3,,AC_MSG_ERROR(GLIB >= 1.1.3 is required for LibGTop))
+AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop))
 
 dnl You need to uncomment the following line if you want to use
 dnl libGTop without Gnome.
@@ -167,9 +183,23 @@ AC_CHECK_HEADERS(string.h strings.h, break)
 AC_REPLACE_FUNCS(strerror)
 AC_CHECK_LIB(kvm, kvm_open)
 
+dnl Solaris 7
+AC_CHECK_LIB(kstat, kstat_open)
+
 dnl For DEC OSF1
 AC_CHECK_LIB(mach, vm_statistics)
 
+dnl For some broken libc5 systems (Debian 1.3)                                                           
+saved_CFLAGS=$CFLAGS                                                                                     
+CFLAGS="$CFLAGS -D_GNU_SOURCE"                                                                           
+GCC_NEED_DECLARATION(program_invocation_name, [                           
+#include <errno.h>                                                                                       
+#include <stdio.h>                                                                                       
+#include <stdlib.h>                                                                                      
+#include <string.h>                                                                                      
+])                                                                                                       
+CFLAGS=$saved_CFLAGS                                                                                     
+                                                                                                         
 dnl Check for Internet sockets.
 AC_CHECK_FUNC(socket,
  [AC_CHECK_HEADER(netinet/in.h,
@@ -193,7 +223,7 @@ AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
 
 dnl ## all 'es_??' are only needed for format numbers different of 'es'
-ALL_LINGUAS="de es es_DO es_GT es_HN es_MX es_PA es_PE es_SV fr ko no"
+ALL_LINGUAS="de es es_DO es_GT es_HN es_MX es_PA es_PE es_SV fr ko no ja"
 AM_GNOME_GETTEXT
 
 AC_PATH_XTRA
@@ -256,10 +286,18 @@ dnl These definitions are expanded in make.
 LIBGTOP_LIBS='-L$(libdir)'
 LIBGTOP_INCS='-I$(includedir)'
 
+if test x$libgtop_use_machine_h = xyes ; then
+  LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_GLIBTOP_MACHINE_H"
+fi
+
 if test x$build_inodedb = xyes ; then
   LIBGTOP_INCS="$LIBGTOP_INCS -DGLIBTOP_INODEDB"
 fi
 
+if test x$libgtop_smp = xyes ; then
+  LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SMP"
+fi
+
 if test x$libgtop_have_sysinfo = xyes ; then
   LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SYSINFO"
 fi
@@ -291,8 +329,8 @@ fi
 
 LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"
 
-LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_common -lgtop -lgtop_sysdeps"
+LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop -lgtop_sysdeps -lgtop_common"
-LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_common -lgtop -lgtop_sysdeps"
+LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop -lgtop_sysdeps -lgtop_common"
 
 LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names"
 LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile_names -lgtop_names"
@@ -348,6 +386,7 @@ AC_SUBST(server_programs)
 
 AC_OUTPUT([
 Makefile
+libgtop.spec
 po/Makefile.in
 intl/Makefile
 misc/Makefile
@@ -363,8 +402,8 @@ sysdeps/stub_suid/Makefile
 sysdeps/sun4/Makefile
 sysdeps/osf1/Makefile
 sysdeps/linux/Makefile
-sysdeps/kernel/Makefile
 sysdeps/freebsd/Makefile
+sysdeps/solaris/Makefile
 src/Makefile
 src/daemon/Makefile
 src/inodedb/Makefile

copyright.txt

@@ -1,21 +1,23 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 

examples/.cvsignore

@@ -11,3 +11,5 @@ third_linux
 third_static
 second_static
 second_linux
+smp_static sysdeps_static netload_static procmap_static mountlist_static
+smp sysdeps netload procmap mountlist

examples/ChangeLog

@@ -1,3 +1,8 @@
+1999-03-17  Martin Baulig  <martin@home-of-linux.org>
+
+	* first.c, second.c: Fixed a bug that caused a core dump when
+	the sysdeps code does not return all data.
+
 1998-11-22  Martin Baulig  <baulig@taurus.uni-trier.de>
 
 	* netload.c: Call inet_ntoa () to get address and subnet

examples/Makefile.am

@@ -2,7 +2,7 @@
 
 LINK			= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-CFLAGS			= -Wall -W @CFLAGS@ -O0
+INCLUDES		= @INCLUDES@
 
 DEFS			= @DEFS@
 
@@ -24,7 +24,7 @@ first_SOURCES		= first.c
 first_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@
+			  @LIBSUPPORT@ @INTLLIBS@
 
 first_static_SOURCES	= $(first_SOURCES)
 first_static_LDADD	= $(first_LDADD)
@@ -34,7 +34,7 @@ second_SOURCES		= second.c
 second_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@
+			  @LIBSUPPORT@ @INTLLIBS@
 
 second_static_SOURCES	= $(second_SOURCES)
 second_static_LDADD	= $(second_LDADD)
@@ -44,7 +44,7 @@ procmap_SOURCES		= procmap.c
 procmap_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@
+			  @LIBSUPPORT@ @INTLLIBS@
 
 
 
@@ -56,7 +56,7 @@ netload_SOURCES		= netload.c
 netload_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@
+			  @LIBSUPPORT@ @INTLLIBS@
 
 netload_static_SOURCES	= $(netload_SOURCES)
 netload_static_LDADD	= $(netload_LDADD)
@@ -66,7 +66,7 @@ sysdeps_SOURCES		= sysdeps.c
 sysdeps_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@
+			  @LIBSUPPORT@ @INTLLIBS@
 
 sysdeps_static_SOURCES	= $(sysdeps_SOURCES)
 sysdeps_static_LDADD	= $(sysdeps_LDADD)
@@ -81,7 +81,7 @@ third_LDADD		= $(top_builddir)/sysdeps/guile/libgtop_guile.la \
 			  $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @GUILE_LIBS@ @INTLLIBS@ @LIBSUPPORT@
+			  @GUILE_LIBS@ @LIBSUPPORT@ @INTLLIBS@
 
 third_static_SOURCES	= $(third_SOURCES)
 third_static_LDADD	= $(third_LDADD)
@@ -91,7 +91,7 @@ mountlist_SOURCES	= mountlist.c
 mountlist_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@
+			  @LIBSUPPORT@ @INTLLIBS@
 
 mountlist_static_SOURCES= $(mountlist_SOURCES)
 mountlist_static_LDADD	= $(mountlist_LDADD)
@@ -102,7 +102,7 @@ smp_SOURCES		= smp.c
 smp_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@
+			  @LIBSUPPORT@ @INTLLIBS@
 
 smp_static_SOURCES	= $(smp_SOURCES)
 smp_static_LDADD	= $(smp_LDADD)

examples/first.c

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #include <locale.h>
 
@@ -342,7 +344,7 @@ main (int argc, char *argv [])
 	printf ("Proc_Args    PID  %5d (0x%08lx): %lu - '%s'\n", (int) pid,
 		(unsigned long) data.proc_args.flags,
 		(unsigned long) data.proc_args.size,
-		args);
+		args ? args : "");
 
 	glibtop_free (args);
 
@@ -452,7 +454,7 @@ main (int argc, char *argv [])
 	printf ("Proc_Args    PID  %5d (0x%08lx): %lu - '%s'\n", (int) ppid,
 		(unsigned long) data.proc_args.flags,
 		(unsigned long) data.proc_args.size,
-		args);
+		args ? args : "");
 
 	glibtop_free (args);
 
@@ -563,7 +565,7 @@ main (int argc, char *argv [])
 	printf ("Proc_Args    PID  %5d (0x%08lx): %lu - '%s'\n", 1,
 		(unsigned long) data.proc_args.flags,
 		(unsigned long) data.proc_args.size,
-		args);
+		args ? args : "");
 
 	glibtop_free (args);
 

examples/mountlist.c

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #include <locale.h>
 

examples/netload.c

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #include <locale.h>
 

examples/procmap.c

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #include <locale.h>
 

examples/second.c

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #include <locale.h>
 
@@ -148,7 +150,7 @@ output (pid_t pid)
 	printf ("Proc_Args    PID  %5d (0x%08lx): %lu - '%s'\n", (int) pid,
 		(unsigned long) data.proc_args.flags,
 		(unsigned long) data.proc_args.size,
-		args);
+		args ? args : "");
 
 	glibtop_free (args);
 

examples/smp.c

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, September 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #include <locale.h>
 

examples/sysdeps.c

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #include <locale.h>
 

examples/third.c

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #include <locale.h>
 

glibtop.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_H__
 #define __GLIBTOP_H__
@@ -72,14 +74,21 @@ extern const unsigned long glibtop_server_features;
 
 #define glibtop_close()	glibtop_close_r(glibtop_global_server);
 
-extern glibtop *glibtop_init_r __P((glibtop **, unsigned long, unsigned));
+glibtop *
-extern glibtop *glibtop_init_s __P((glibtop **, unsigned long, unsigned));
+glibtop_init_r (glibtop **server_ptr,
+		unsigned long features,
+		unsigned flags);
+
+glibtop *
+glibtop_init_s (glibtop **server_ptr,
+		unsigned long features,
+		unsigned flags);
 
 #ifdef GLIBTOP_GUILE
 
 /* You need to link with -lgtop_guile to get this stuff here. */
 
-extern void glibtop_boot_guile __P((void));
+void glibtop_boot_guile (void);
 
 #endif
 
@@ -87,7 +96,7 @@ extern void glibtop_boot_guile __P((void));
 
 /* You need to link with -lgtop_guile_names to get this stuff here. */
 
-extern void glibtop_boot_guile_names __P((void));
+void glibtop_boot_guile_names (void);
 
 #ifndef GLIBTOP_NAMES
 #define GLIBTOP_NAMES

include/glibtop/close.h

@@ -1,36 +1,38 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_CLOSE_H__
 #define __GLIBTOP_CLOSE_H__
 
 #include <glibtop.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
-extern void glibtop_close_r __P((glibtop *));
+void glibtop_close_r (glibtop *server);
 
-extern void glibtop_close_s __P((glibtop *));
+void glibtop_close_s (glibtop *server);
-extern void glibtop_close_p __P((glibtop *));
+void glibtop_close_p (glibtop *server);
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/command.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_COMMAND_H__
 #define __GLIBTOP_COMMAND_H__
@@ -26,7 +28,7 @@
 #include <glibtop/sysdeps.h>
 #include <glibtop/union.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_CMND_QUIT		0
 #define GLIBTOP_CMND_SYSDEPS		1
@@ -87,9 +89,14 @@ struct _glibtop_response
 
 #define glibtop_call(p1, p2, p3, p4)	glibtop_call_r(glibtop_global_server, p1, p2, p3, p4)
 
-extern void *glibtop_call_l __P((glibtop *, unsigned, size_t, const void *, size_t, void *));
+void *
-extern void *glibtop_call_s __P((glibtop *, unsigned, size_t, const void *, size_t, void *));
+glibtop_call_l (glibtop *server, unsigned command, size_t send_size,
+		const void *send_buf, size_t recv_size, void *recv_buf);
 
-__END_DECLS
+void *
+glibtop_call_s (glibtop *server, unsigned command, size_t send_size,
+		const void *send_buf, size_t recv_size, void *recv_buf);
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/cpu.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_CPU_H__
 #define __GLIBTOP_CPU_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_CPU_TOTAL	0
 #define GLIBTOP_CPU_USER	1
@@ -71,14 +73,14 @@ struct _glibtop_cpu
 #define glibtop_get_cpu_r	glibtop_get_cpu_s
 #endif
 
-extern void glibtop_get_cpu_l __P((glibtop *, glibtop_cpu *));
+void glibtop_get_cpu_l (glibtop *server, glibtop_cpu *buf);
 
 #if GLIBTOP_SUID_CPU
-extern void glibtop_init_cpu_p __P((glibtop *));
+void glibtop_init_cpu_p (glibtop *server);
-extern void glibtop_get_cpu_p __P((glibtop *, glibtop_cpu *));
+void glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf);
 #else
-extern void glibtop_init_cpu_s __P((glibtop *));
+void glibtop_init_cpu_s (glibtop *server);
-extern void glibtop_get_cpu_s __P((glibtop *, glibtop_cpu *));
+void glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -92,6 +94,6 @@ extern const char *glibtop_descriptions_cpu [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/error.h

@@ -1,30 +1,80 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_ERROR_H__
 #define __GLIBTOP_ERROR_H__
 
 #include <glibtop.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_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_io_vr (glibtop *server, char *format, int, va_list args);
+void glibtop_warn_io_vr (glibtop *server, char *format, int, va_list args);
+
+static void
+glibtop_error_r (glibtop *server, char *format, ...)
+{
+	va_list args;
+
+	va_start (args, format);
+	glibtop_error_vr (server, format, args);
+	va_end (args);
+}
+
+static void
+glibtop_warn_r (glibtop *server, char *format, ...)
+{
+	va_list args;
+
+	va_start (args, format);
+	glibtop_warn_vr (server, format, args);
+	va_end (args);
+}
+
+static void
+glibtop_error_io_r (glibtop *server, char *format, ...)
+{
+	va_list args;
+
+	va_start (args, format);
+	glibtop_error_io_vr (server, format, errno, args);
+	va_end (args);
+}
+
+static void
+glibtop_warn_io_r (glibtop *server, char *format, ...)
+{
+	va_list args;
+
+	va_start (args, format);
+	glibtop_warn_io_vr (server, format, errno, args);
+	va_end (args);
+}
+
+#ifdef  __GNUC__
 
 #define glibtop_error(p1, args...)	glibtop_error_r(glibtop_global_server , p1 , ## args)
 #define glibtop_warn(p1, args...)	glibtop_warn_r(glibtop_global_server , p1 , ## args)
@@ -32,12 +82,46 @@ __BEGIN_DECLS
 #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)
 
-extern void glibtop_error_r __P((glibtop *, char *, ...));
+#else /* no __GNUC__ */
-extern void glibtop_warn_r __P((glibtop *, char *, ...));
 
-extern void glibtop_error_io_r __P((glibtop *, char *, ...));
+static void
-extern void glibtop_warn_io_r __P((glibtop *, char *, ...));
+glibtop_error (char *format, ...)
+{
+	va_list args;
+	va_start (args, format);
+	glibtop_error_vr (glibtop_global_server, format, args);
+	va_end (args);
+}
 
-__END_DECLS
+static void
+glibtop_warn (char *format, ...)
+{
+	va_list args;
+	va_start (args, format);
+	glibtop_warn_vr (glibtop_global_server, format, args);
+	va_end (args);
+}
+
+static void
+glibtop_error_io (char *format, ...)
+{
+	va_list args;
+	va_start (args, format);
+	glibtop_error_io_vr (glibtop_global_server, format, errno, args);
+	va_end (args);
+}
+
+static void
+glibtop_warn_io (char *format, ...)
+{
+	va_list args;
+	va_start (args, format);
+	glibtop_warn_io_vr (glibtop_global_server, format, errno, args);
+	va_end (args);
+}
+
+#endif /* no __GNUC__ */
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/fsusage.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_FSUSAGE_H__
 #define __GLIBTOP_FSUSAGE_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_FSUSAGE_BLOCKS		0
 #define GLIBTOP_FSUSAGE_BFREE		1
@@ -51,9 +53,8 @@ struct _glibtop_fsusage
 
 #define glibtop_get_fsusage_r		glibtop_get_fsusage_s
 
-extern void glibtop_get_fsusage_l __P((glibtop *, glibtop_fsusage *, const char *));
+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);
-extern void glibtop_get_fsusage_s __P((glibtop *, glibtop_fsusage *, const char *));
 
 #ifdef GLIBTOP_NAMES
 
@@ -66,6 +67,6 @@ extern const char *glibtop_descriptions_fsusage [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/global.h

@@ -1,54 +1,47 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_GLOBAL_H__
 #define __GLIBTOP_GLOBAL_H__
 
+#ifdef _IN_LIBGTOP
 #include <config.h>
-
-/* __BEGIN_DECLS should be used at the beginning of your declarations,
-   so that C++ compilers don't mangle their names.  Use __END_DECLS at
-   the end of C declarations. */
-   
-#undef __BEGIN_DECLS
-#undef __END_DECLS
-#ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
-#else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
 #endif
 
-/* __P is a macro used to wrap function prototypes, so that compilers
+/*
-   that don't understand ANSI C prototypes still work, and ANSI C
+ * All declarations are enclosed in BEGIN_LIBGTOP_DECLS and
-   compilers can issue warnings about type mismatches. */
+ * END_LIBGTOP_DECLS so that C++ compilers don't mangle their names.
+ *
+ */
    
-#undef __P
+#undef BEGIN_LIBGTOP_DECLS
-#if defined (__STDC__) || defined (_AIX) \
+#undef END_LIBGTOP_DECLS
-|| (defined (__mips) && defined (_SYSTYPE_SVR4)) \
+#ifdef __cplusplus
-     || defined(WIN32) || defined(__cplusplus)
+# define BEGIN_LIBGTOP_DECLS extern "C" {
-# define __P(protos) protos
+# define END_LIBGTOP_DECLS }
 #else
-# define __P(protos) ()
+# define BEGIN_LIBGTOP_DECLS /* empty */
+# define END_LIBGTOP_DECLS /* empty */
 #endif
 
 #ifdef _IN_LIBGTOP
@@ -129,17 +122,21 @@
 #include <signal.h>
 #include <errno.h>
 
-__BEGIN_DECLS
+#ifdef _IN_LIBGTOP
+
+BEGIN_LIBGTOP_DECLS
 
 #ifndef _
-#define _(String) gettext (String)
+#define _(String) dgettext (PACKAGE, String)
 #define N_(String) (String)
 #endif
 
 #ifndef HAVE_STRERROR
-extern char *strerror __P((int));
+char *strerror (int errno);
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
+
+#endif /* _IN_LIBGTOP */
 
 #endif

include/glibtop/gnuserv.h

@@ -153,8 +153,9 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
 #define CONN_IPC      2
 
 /* function declarations */
-extern int glibtop_make_connection __P((const char *, int, int *));
+int glibtop_make_connection (const char *hostarg, int portarg, int *s);
 
 #ifdef INTERNET_DOMAIN_SOCKETS
-extern long glibtop_internet_addr __P((const char *));
+long glibtop_internet_addr (const char *host);
 #endif
+

include/glibtop/inodedb.h

@@ -1,21 +1,23 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_INODEDB_H__
 #define __GLIBTOP_INODEDB_H__
@@ -29,7 +31,7 @@
 
 #define GLIBTOP_INODEDB_ALL		7
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 typedef struct _glibtop_inodedb		glibtop_inodedb;
 
@@ -49,10 +51,17 @@ struct _glibtop_inodedb
 #define glibtop_inodedb_lookup(p1,p2,p3) glibtop_inodedb_lookup_s(glibtop_global_server, p1, p2, p3)
 #define glibtop_inodedb_close(p1)	glibtop_inodedb_close_s(glibtop_global_server)
 
-extern glibtop_inodedb *glibtop_inodedb_open_s __P((glibtop *, unsigned, unsigned long));
+glibtop_inodedb *
-extern const char *glibtop_inodedb_lookup_s __P((glibtop *, glibtop_inodedb *, u_int64_t, u_int64_t));
+glibtop_inodedb_open_s (glibtop *server, unsigned databases, unsigned long cache_size);
-extern void glibtop_inodedb_close_s __P((glibtop *, glibtop_inodedb *));
 
-__END_DECLS
+const char *
+glibtop_inodedb_lookup_s (glibtop *server,
+			  glibtop_inodedb *inodedb,
+			  u_int64_t device, u_int64_t inode);
+
+void
+glibtop_inodedb_close_s (glibtop *server, glibtop_inodedb *inodedb);
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/loadavg.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_LOADAVG_H__
 #define __GLIBTOP_LOADAVG_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_LOADAVG_LOADAVG		0
 #define GLIBTOP_LOADAVG_NR_RUNNING	1
@@ -53,14 +55,14 @@ struct _glibtop_loadavg
 #define glibtop_get_loadavg_r		glibtop_get_loadavg_s
 #endif
 
-extern void glibtop_get_loadavg_l __P((glibtop *, glibtop_loadavg *));
+void glibtop_get_loadavg_l (glibtop *server, glibtop_loadavg *buf);
 
 #if GLIBTOP_SUID_LOADAVG
-extern void glibtop_init_loadavg_p __P((glibtop *));
+void glibtop_init_loadavg_p (glibtop *server);
-extern void glibtop_get_loadavg_p __P((glibtop *, glibtop_loadavg *));
+void glibtop_get_loadavg_p (glibtop *server, glibtop_loadavg *buf);
 #else
-extern void glibtop_init_loadavg_s __P((glibtop *));
+void glibtop_init_loadavg_s (glibtop *server);
-extern void glibtop_get_loadavg_s __P((glibtop *, glibtop_loadavg *));
+void glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -74,6 +76,6 @@ extern const char *glibtop_descriptions_loadavg [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/mem.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_MEM_H__
 #define __GLIBTOP_MEM_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_MEM_TOTAL	0
 #define GLIBTOP_MEM_USED	1
@@ -61,14 +63,14 @@ struct _glibtop_mem
 #define glibtop_get_mem_r		glibtop_get_mem_s
 #endif
 
-extern void glibtop_get_mem_l __P((glibtop *, glibtop_mem *));
+void glibtop_get_mem_l (glibtop *server, glibtop_mem *buf);
 
 #if GLIBTOP_SUID_MEM
-extern void glibtop_init_mem_p __P((glibtop *));
+void glibtop_init_mem_p (glibtop *server);
-extern void glibtop_get_mem_p __P((glibtop *, glibtop_mem *));
+void glibtop_get_mem_p (glibtop *server, glibtop_mem *buf);
 #else
-extern void glibtop_init_mem_s __P((glibtop *));
+void glibtop_init_mem_s (glibtop *server);
-extern void glibtop_get_mem_s __P((glibtop *, glibtop_mem *));
+void glibtop_get_mem_s (glibtop *server, glibtop_mem *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -82,6 +84,6 @@ extern const char *glibtop_descriptions_mem [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/mountlist.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_MOUNTLIST_H__
 #define __GLIBTOP_MOUNTLIST_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_MOUNTLIST_NUMBER	0
 #define GLIBTOP_MOUNTLIST_TOTAL		1
@@ -57,9 +59,11 @@ struct _glibtop_mountlist
 
 #define glibtop_get_mountlist_r		glibtop_get_mountlist_s
 
-extern glibtop_mountentry *glibtop_get_mountlist_l __P((glibtop *, glibtop_mountlist *, int));
+glibtop_mountentry *
+glibtop_get_mountlist_l (glibtop *server, glibtop_mountlist *buf, int all_fs);
 
-extern glibtop_mountentry *glibtop_get_mountlist_s __P((glibtop *, glibtop_mountlist *, int));
+glibtop_mountentry *
+glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs);
 
 #ifdef GLIBTOP_NAMES
 
@@ -72,6 +76,6 @@ extern const char *glibtop_descriptions_mountlist [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/msg_limits.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_MSG_LIMITS_H__
 #define __GLIBTOP_MSG_LIMITS_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_IPC_MSGPOOL	0
 #define GLIBTOP_IPC_MSGMAP	1
@@ -59,14 +61,14 @@ struct _glibtop_msg_limits
 #define glibtop_get_msg_limits_r	glibtop_get_msg_limits_s
 #endif
 
-extern void glibtop_get_msg_limits_l __P((glibtop *, glibtop_msg_limits *));
+void glibtop_get_msg_limits_l (glibtop *server, glibtop_msg_limits *buf);
 
 #if GLIBTOP_SUID_MSG_LIMITS
-extern void glibtop_init_msg_limits_p __P((glibtop *));
+void glibtop_init_msg_limits_p (glibtop *server);
-extern void glibtop_get_msg_limits_p __P((glibtop *, glibtop_msg_limits *));
+void glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf);
 #else
-extern void glibtop_init_msg_limits_s __P((glibtop *));
+void glibtop_init_msg_limits_s (glibtop *server);
-extern void glibtop_get_msg_limits_s __P((glibtop *, glibtop_msg_limits *));
+void glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -80,6 +82,7 @@ extern const char *glibtop_descriptions_msg_limits [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif
+

include/glibtop/netload.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_NETLOAD_H__
 #define __GLIBTOP_NETLOAD_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_NETLOAD_IF_FLAGS	0
 #define GLIBTOP_NETLOAD_MTU		1
@@ -92,14 +94,14 @@ struct _glibtop_netload
 #define glibtop_get_netload_r	glibtop_get_netload_s
 #endif
 
-extern void glibtop_get_netload_l __P((glibtop *, glibtop_netload *, const char *));
+void glibtop_get_netload_l (glibtop *server, glibtop_netload *buf, const char *interface);
 
 #if GLIBTOP_SUID_NETLOAD
-extern void glibtop_init_netload_p __P((glibtop *));
+void glibtop_init_netload_p (glibtop *server);
-extern void glibtop_get_netload_p __P((glibtop *, glibtop_netload *, const char *));
+void glibtop_get_netload_p (glibtop *server, glibtop_netload *buf, const char *interface);
 #else
-extern void glibtop_init_netload_s __P((glibtop *));
+void glibtop_init_netload_s (glibtop *server);
-extern void glibtop_get_netload_s __P((glibtop *, glibtop_netload *, const char *));
+void glibtop_get_netload_s (glibtop *server, glibtop_netload *buf, const char *interface);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -113,6 +115,6 @@ extern const char *glibtop_descriptions_netload [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/open.h

@@ -1,21 +1,23 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_OPEN_H__
 #define __GLIBTOP_OPEN_H__
@@ -24,7 +26,7 @@
 #include <glibtop/read.h>
 #include <glibtop/error.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define _GLIBTOP_INIT_STATE_INIT	0x10000
 #define _GLIBTOP_INIT_STATE_OPEN	0x20000
@@ -49,12 +51,23 @@ __BEGIN_DECLS
 
 #define GLIBTOP_ERROR_METHOD_DEFAULT	GLIBTOP_ERROR_METHOD_WARN_ONCE
 
-extern void glibtop_open_l __P((glibtop *, const char *, const unsigned long, const unsigned));
+void
+glibtop_open_l (glibtop *server, const char *program_name,
+		const unsigned long features, const unsigned flags);
 
-extern void glibtop_init_p __P((glibtop *, const unsigned long, const unsigned));
+void
-extern void glibtop_open_p __P((glibtop *, const char *, const unsigned long, const unsigned));
+glibtop_init_p (glibtop *server, const unsigned long features,
-extern void glibtop_open_s __P((glibtop *, const char *, const unsigned long, const unsigned));
+		const unsigned flags);
 
-__END_DECLS
+void
+glibtop_open_p (glibtop *server, const char *program_name,
+		const unsigned long features, const unsigned flags);
+
+void
+glibtop_open_s (glibtop *server, const char *program_name,
+		const unsigned long features, const unsigned flags);
+
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/parameter.h

@@ -1,21 +1,23 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_PARAMETER_H__
 #define __GLIBTOP_PARAMETER_H__
@@ -23,7 +25,7 @@
 #include <glibtop.h>
 #include <glibtop/open.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PARAM_METHOD		1
 #define GLIBTOP_PARAM_FEATURES		2
@@ -36,9 +38,14 @@ __BEGIN_DECLS
 #define glibtop_get_parameter(p1,p2,p3)	glibtop_get_parameter_l(glibtop_global_server,p1,p2,p3)
 #define glibtop_set_parameter(p1,p2,p3) glibtop_set_parameter_l(glibtop_global_server,p1,p2,p3)
 
-extern size_t	glibtop_get_parameter_l __P((glibtop *, const unsigned, void *, size_t));
+size_t
-extern void	glibtop_set_parameter_l __P((glibtop *, const unsigned, const void *, size_t));
+glibtop_get_parameter_l (glibtop *server, const unsigned parameter,
+			 void *data_ptr, size_t data_size);
 
-__END_DECLS
+void
+glibtop_set_parameter_l (glibtop *server, const unsigned parameter,
+			 const void *data_ptr, size_t data_size);
+
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/ppp.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_PPP_H__
 #define __GLIBTOP_PPP_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PPP_STATE	0
 #define GLIBTOP_PPP_BYTES_IN	1	
@@ -57,14 +59,14 @@ struct _glibtop_ppp
 #define glibtop_get_ppp_r	glibtop_get_ppp_s
 #endif
 
-extern void glibtop_get_ppp_l __P((glibtop *, glibtop_ppp *, unsigned short));
+void glibtop_get_ppp_l (glibtop *server, glibtop_ppp *buf, unsigned short device);
 
 #if GLIBTOP_SUID_PPP
-extern void glibtop_init_ppp_p __P((glibtop *));
+void glibtop_init_ppp_p (glibtop *server);
-extern void glibtop_get_ppp_p __P((glibtop *, glibtop_ppp *, unsigned short));
+void glibtop_get_ppp_p (glibtop *server, glibtop_ppp *buf, unsigned short device);
 #else
-extern void glibtop_init_ppp_s __P((glibtop *));
+void glibtop_init_ppp_s (glibtop *server);
-extern void glibtop_get_ppp_s __P((glibtop *, glibtop_ppp *, unsigned short));
+void glibtop_get_ppp_s (glibtop *server, glibtop_ppp *buf, unsigned short device);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -78,6 +80,6 @@ extern const char *glibtop_descriptions_ppp [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/procargs.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_PROC_ARGS_H__
 #define __GLIBTOP_PROC_ARGS_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROC_ARGS_SIZE		0
 
@@ -47,14 +49,22 @@ struct _glibtop_proc_args
 #define glibtop_get_proc_args_r		glibtop_get_proc_args_s
 #endif
 
-extern char  *glibtop_get_proc_args_l __P((glibtop *, glibtop_proc_args *, pid_t, unsigned));
+char *
+glibtop_get_proc_args_l (glibtop *server, glibtop_proc_args *buf,
+			 pid_t pid, unsigned max_len);
 
 #if GLIBTOP_SUID_PROC_ARGS
-extern void glibtop_init_proc_args_p __P((glibtop *));
+void glibtop_init_proc_args_p (glibtop *server);
-extern char *glibtop_get_proc_args_p __P((glibtop *, glibtop_proc_args *, pid_t, unsigned));
+
+char *
+glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
+			 pid_t pid, unsigned max_len);
 #else
-extern void glibtop_init_proc_args_s __P((glibtop *));
+void glibtop_init_proc_args_s (glibtop *server);
-extern char *glibtop_get_proc_args_s __P((glibtop *, glibtop_proc_args *, pid_t, unsigned));
+
+char *
+glibtop_get_proc_args_s (glibtop *server, glibtop_proc_args *buf,
+			 pid_t pid, unsigned max_len);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -68,6 +78,6 @@ extern const char *glibtop_descriptions_proc_args [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/prockernel.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_PROCKERNEL_H__
 #define __GLIBTOP_PROCKERNEL_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROC_KERNEL_K_FLAGS	0
 #define GLIBTOP_PROC_KERNEL_MIN_FLT	1
@@ -70,14 +72,14 @@ struct _glibtop_proc_kernel
 #define glibtop_get_proc_kernel_r	glibtop_get_proc_kernel_s
 #endif
 
-extern void glibtop_get_proc_kernel_l __P((glibtop *, glibtop_proc_kernel *, pid_t));
+void glibtop_get_proc_kernel_l (glibtop *server, glibtop_proc_kernel *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_KERNEL
-extern void glibtop_init_proc_kernel_p __P((glibtop *));
+void glibtop_init_proc_kernel_p (glibtop *server);
-extern void glibtop_get_proc_kernel_p __P((glibtop *, glibtop_proc_kernel *, pid_t));
+void glibtop_get_proc_kernel_p (glibtop *server, glibtop_proc_kernel *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_kernel_s __P((glibtop *));
+void glibtop_init_proc_kernel_s (glibtop *server);
-extern void glibtop_get_proc_kernel_s __P((glibtop *, glibtop_proc_kernel *, pid_t));
+void glibtop_get_proc_kernel_s (glibtop *server, glibtop_proc_kernel *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -91,6 +93,6 @@ extern const char *glibtop_descriptions_proc_kernel [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/proclist.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_PROCLIST_H__
 #define __GLIBTOP_PROCLIST_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROCLIST_NUMBER	0
 #define GLIBTOP_PROCLIST_TOTAL	1
@@ -68,14 +70,22 @@ struct _glibtop_proclist
 #define glibtop_get_proclist_r		glibtop_get_proclist_s
 #endif
 
-extern unsigned *glibtop_get_proclist_l __P((glibtop *, glibtop_proclist *, int64_t, int64_t));
+unsigned *
+glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf,
+			int64_t which, int64_t arg);
 
 #if GLIBTOP_SUID_PROCLIST
-extern void glibtop_init_proclist_p __P((glibtop *));
+void glibtop_init_proclist_p (glibtop *server);
-extern unsigned *glibtop_get_proclist_p __P((glibtop *, glibtop_proclist *, int64_t, int64_t));
+
+unsigned *
+glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
+			int64_t which, int64_t arg);
 #else
-extern void glibtop_init_proclist_s __P((glibtop *));
+void glibtop_init_proclist_s (glibtop *server);
-extern unsigned *glibtop_get_proclist_s __P((glibtop *, glibtop_proclist *, int64_t, int64_t));
+
+unsigned *
+glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
+			int64_t which, int64_t arg);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -89,6 +99,6 @@ extern const char *glibtop_descriptions_proclist [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/procmap.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_PROC_MAP_H__
 #define __GLIBTOP_PROC_MAP_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROC_MAP_NUMBER		0
 #define GLIBTOP_PROC_MAP_TOTAL		1
@@ -77,14 +79,19 @@ struct _glibtop_proc_map
 #define glibtop_get_proc_map_r		glibtop_get_proc_map_s
 #endif
 
-extern glibtop_map_entry *glibtop_get_proc_map_l __P((glibtop *, glibtop_proc_map *, pid_t));
+glibtop_map_entry *
+glibtop_get_proc_map_l (glibtop *server, glibtop_proc_map *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_MAP
-extern void glibtop_init_proc_map_p __P((glibtop *));
+void glibtop_init_proc_map_p (glibtop *server);
-extern glibtop_map_entry *glibtop_get_proc_map_p __P((glibtop *, glibtop_proc_map *, pid_t));
+
+glibtop_map_entry *
+glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_map_s __P((glibtop *));
+void glibtop_init_proc_map_s (glibtop *server);
-extern glibtop_map_entry *glibtop_get_proc_map_s __P((glibtop *, glibtop_proc_map *, pid_t));
+
+glibtop_map_entry *
+glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -98,6 +105,6 @@ extern const char *glibtop_descriptions_proc_map [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/procmem.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_PROCMEM_H__
 #define __GLIBTOP_PROCMEM_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROC_MEM_SIZE		0
 #define GLIBTOP_PROC_MEM_VSIZE		1
@@ -61,14 +63,14 @@ struct _glibtop_proc_mem
 #define glibtop_get_proc_mem_r		glibtop_get_proc_mem_s
 #endif
 
-extern void glibtop_get_proc_mem_l __P((glibtop *, glibtop_proc_mem *, pid_t));
+void glibtop_get_proc_mem_l (glibtop *server, glibtop_proc_mem *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_MEM
-extern void glibtop_init_proc_mem_p __P((glibtop *));
+void glibtop_init_proc_mem_p (glibtop *server);
-extern void glibtop_get_proc_mem_p __P((glibtop *, glibtop_proc_mem *, pid_t));
+void glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_mem_s __P((glibtop *));
+void glibtop_init_proc_mem_s (glibtop *server);
-extern void glibtop_get_proc_mem_s __P((glibtop *, glibtop_proc_mem *, pid_t));
+void glibtop_get_proc_mem_s (glibtop *server, glibtop_proc_mem *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -82,6 +84,6 @@ extern const char *glibtop_descriptions_proc_mem [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/procsegment.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_PROCSEGMENT_H__
 #define __GLIBTOP_PROCSEGMENT_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROC_SEGMENT_TEXT_RSS		0
 #define GLIBTOP_PROC_SEGMENT_SHLIB_RSS		1
@@ -64,14 +66,14 @@ struct _glibtop_proc_segment
 #define glibtop_get_proc_segment_r	glibtop_get_proc_segment_s
 #endif
 
-extern void glibtop_get_proc_segment_l __P((glibtop *, glibtop_proc_segment *, pid_t));
+void glibtop_get_proc_segment_l (glibtop *server, glibtop_proc_segment *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_SEGMENT
-extern void glibtop_init_proc_segment_p __P((glibtop *));
+void glibtop_init_proc_segment_p (glibtop *server);
-extern void glibtop_get_proc_segment_p __P((glibtop *, glibtop_proc_segment *, pid_t));
+void glibtop_get_proc_segment_p (glibtop *server, glibtop_proc_segment *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_segment_s __P((glibtop *));
+void glibtop_init_proc_segment_s (glibtop *server);
-extern void glibtop_get_proc_segment_s __P((glibtop *, glibtop_proc_segment *, pid_t));
+void glibtop_get_proc_segment_s (glibtop *server, glibtop_proc_segment *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -85,6 +87,6 @@ extern const char *glibtop_descriptions_proc_segment [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/procsignal.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_PROCSIGNAL_H__
 #define __GLIBTOP_PROCSIGNAL_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROC_SIGNAL_SIGNAL	0
 #define GLIBTOP_PROC_SIGNAL_BLOCKED	1
@@ -55,14 +57,14 @@ struct _glibtop_proc_signal
 #define glibtop_get_proc_signal_r	glibtop_get_proc_signal_s
 #endif
 
-extern void glibtop_get_proc_signal_l __P((glibtop *, glibtop_proc_signal *, pid_t));
+void glibtop_get_proc_signal_l (glibtop *server, glibtop_proc_signal *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_SIGNAL
-extern void glibtop_init_proc_signal_p __P((glibtop *));
+void glibtop_init_proc_signal_p (glibtop *server);
-extern void glibtop_get_proc_signal_p __P((glibtop *, glibtop_proc_signal *, pid_t));
+void glibtop_get_proc_signal_p (glibtop *server, glibtop_proc_signal *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_signal_s __P((glibtop *));
+void glibtop_init_proc_signal_s (glibtop *server);
-extern void glibtop_get_proc_signal_s __P((glibtop *, glibtop_proc_signal *, pid_t));
+void glibtop_get_proc_signal_s (glibtop *server, glibtop_proc_signal *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -76,6 +78,6 @@ extern const char *glibtop_descriptions_proc_signal [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/procstate.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_PROCSTATE_H__
 #define __GLIBTOP_PROCSTATE_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROC_STATE_CMD		0
 #define GLIBTOP_PROC_STATE_STATE	1
@@ -62,14 +64,14 @@ struct _glibtop_proc_state
 #define glibtop_get_proc_state_r	glibtop_get_proc_state_s
 #endif
 
-extern void glibtop_get_proc_state_l __P((glibtop *, glibtop_proc_state *, pid_t));
+void glibtop_get_proc_state_l (glibtop *server, glibtop_proc_state *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_STATE
-extern void glibtop_init_proc_state_p __P((glibtop *));
+void glibtop_init_proc_state_p (glibtop *server);
-extern void glibtop_get_proc_state_p __P((glibtop *, glibtop_proc_state *, pid_t));
+void glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_state_s __P((glibtop *));
+void glibtop_init_proc_state_s (glibtop *server);
-extern void glibtop_get_proc_state_s __P((glibtop *, glibtop_proc_state *, pid_t));
+void glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf, pid_t pid);
 #endif
      
 #ifdef GLIBTOP_NAMES
@@ -83,6 +85,6 @@ extern const char *glibtop_descriptions_proc_state [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/proctime.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_PROCTIME_H__
 #define __GLIBTOP_PROCTIME_H__
@@ -26,7 +28,7 @@
 #include <glibtop/cpu.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROC_TIME_START_TIME	0
 #define GLIBTOP_PROC_TIME_RTIME		1
@@ -76,14 +78,14 @@ struct _glibtop_proc_time
 #define glibtop_get_proc_time_r	glibtop_get_proc_time_s
 #endif
 
-extern void glibtop_get_proc_time_l __P((glibtop *, glibtop_proc_time *, pid_t));
+void glibtop_get_proc_time_l (glibtop *server, glibtop_proc_time *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_TIME
-extern void glibtop_init_proc_time_p __P((glibtop *));
+void glibtop_init_proc_time_p (glibtop *server);
-extern void glibtop_get_proc_time_p __P((glibtop *, glibtop_proc_time *, pid_t));
+void glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_time_s __P((glibtop *));
+void glibtop_init_proc_time_s (glibtop *server);
-extern void glibtop_get_proc_time_s __P((glibtop *, glibtop_proc_time *, pid_t));
+void glibtop_get_proc_time_s (glibtop *server, glibtop_proc_time *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -97,6 +99,6 @@ extern const char *glibtop_descriptions_proc_time [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/procuid.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_PROCUID_H__
 #define __GLIBTOP_PROCUID_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_PROC_UID_UID		0
 #define GLIBTOP_PROC_UID_EUID		1
@@ -71,14 +73,14 @@ struct _glibtop_proc_uid
 #define glibtop_get_proc_uid_r		glibtop_get_proc_uid_s
 #endif
 
-extern void glibtop_get_proc_uid_l __P((glibtop *, glibtop_proc_uid *, pid_t));
+void glibtop_get_proc_uid_l (glibtop *server, glibtop_proc_uid *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_UID
-extern void glibtop_init_proc_uid_p __P((glibtop *));
+void glibtop_init_proc_uid_p (glibtop *server);
-extern void glibtop_get_proc_uid_p __P((glibtop *, glibtop_proc_uid *, pid_t));
+void glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_uid_s __P((glibtop *));
+void glibtop_init_proc_uid_s (glibtop *server);
-extern void glibtop_get_proc_uid_s __P((glibtop *, glibtop_proc_uid *, pid_t));
+void glibtop_get_proc_uid_s (glibtop *server, glibtop_proc_uid *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -92,6 +94,6 @@ extern const char *glibtop_descriptions_proc_uid [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/read.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_READ_H__
 #define __GLIBTOP_READ_H__
@@ -25,13 +27,13 @@
 #include <glibtop.h>
 #include <glibtop/error.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define glibtop_read(p1, p2)	glibtop_read(glibtop_global_server, p1, p2)
 
-extern void glibtop_read_l __P((glibtop *, size_t, void *));
+void glibtop_read_l (glibtop *server, size_t size, void *buf);
-extern void glibtop_read_s __P((glibtop *, size_t, void *));
+void glibtop_read_s (glibtop *server, size_t size, void *buf);
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/read_data.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_READ_DATA_H__
 #define __GLIBTOP_READ_DATA_H__
@@ -25,13 +27,13 @@
 #include <glibtop.h>
 #include <glibtop/error.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define glibtop_read_data()	glibtop_read_data_r(glibtop_global_server)
 
-extern void *glibtop_read_data_l __P((glibtop *));
+void *glibtop_read_data_l (glibtop *server);
-extern void *glibtop_read_data_s __P((glibtop *));
+void *glibtop_read_data_s (glibtop *server);
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/sem_limits.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_SEM_LIMITS_H__
 #define __GLIBTOP_SEM_LIMITS_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_IPC_SEMMAP	0
 #define GLIBTOP_IPC_SEMMNI	1
@@ -65,14 +67,14 @@ struct _glibtop_sem_limits
 #define glibtop_get_sem_limits_r	glibtop_get_sem_limits_s
 #endif
 
-extern void glibtop_get_sem_limits_l __P((glibtop *, glibtop_sem_limits *));
+void glibtop_get_sem_limits_l (glibtop *server, glibtop_sem_limits *buf);
 
 #if GLIBTOP_SUID_SEM_LIMITS
-extern void glibtop_init_sem_limits_p __P((glibtop *));
+void glibtop_init_sem_limits_p (glibtop *server);
-extern void glibtop_get_sem_limits_p __P((glibtop *, glibtop_sem_limits *));
+void glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf);
 #else
-extern void glibtop_init_sem_limits_s __P((glibtop *));
+void glibtop_init_sem_limits_s (glibtop *server);
-extern void glibtop_get_sem_limits_s __P((glibtop *, glibtop_sem_limits *));
+void glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -86,6 +88,6 @@ extern const char *glibtop_descriptions_sem_limits [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/shm_limits.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_SHM_LIMITS_H__
 #define __GLIBTOP_SHM_LIMITS_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_IPC_SHMMAX	0
 #define GLIBTOP_IPC_SHMMIN	1
@@ -55,14 +57,14 @@ struct _glibtop_shm_limits
 #define glibtop_get_shm_limits_r	glibtop_get_shm_limits_s
 #endif
 
-extern void glibtop_get_shm_limits_l __P((glibtop *, glibtop_shm_limits *));
+void glibtop_get_shm_limits_l (glibtop *server, glibtop_shm_limits *buf);
 
 #if GLIBTOP_SUID_SHM_LIMITS
-extern void glibtop_init_shm_limits_p __P((glibtop *));
+void glibtop_init_shm_limits_p (glibtop *server);
-extern void glibtop_get_shm_limits_p __P((glibtop *, glibtop_shm_limits *));
+void glibtop_get_shm_limits_p (glibtop *, glibtop_shm_limits *buf);
 #else
-extern void glibtop_init_shm_limits_s __P((glibtop *));
+void glibtop_init_shm_limits_s (glibtop *server);
-extern void glibtop_get_shm_limits_s __P((glibtop *, glibtop_shm_limits *));
+void glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -76,6 +78,6 @@ extern const char *glibtop_descriptions_shm_limits [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/signal.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_SIGNAL_H__
 #define __GLIBTOP_SIGNAL_H__
@@ -28,7 +30,7 @@
 #include <sys/signal.h>
 #endif
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 typedef struct _glibtop_signame	glibtop_signame;
 
@@ -40,6 +42,6 @@ struct _glibtop_signame
 
 extern const glibtop_signame glibtop_sys_siglist [];
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/swap.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_SWAP_H__
 #define __GLIBTOP_SWAP_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_SWAP_TOTAL	0
 #define GLIBTOP_SWAP_USED	1
@@ -55,14 +57,14 @@ struct _glibtop_swap
 #define glibtop_get_swap_r		glibtop_get_swap_s
 #endif
 
-extern void glibtop_get_swap_l __P((glibtop *, glibtop_swap *));
+void glibtop_get_swap_l (glibtop *server, glibtop_swap *buf);
 
 #if GLIBTOP_SUID_SWAP
-extern void glibtop_init_swap_p __P((glibtop *));
+void glibtop_init_swap_p (glibtop *server);
-extern void glibtop_get_swap_p __P((glibtop *, glibtop_swap *));
+void glibtop_get_swap_p (glibtop *server, glibtop_swap *buf);
 #else
-extern void glibtop_init_swap_s __P((glibtop *));
+void glibtop_init_swap_s (glibtop *server);
-extern void glibtop_get_swap_s __P((glibtop *, glibtop_swap *));
+void glibtop_get_swap_s (glibtop *server, glibtop_swap *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -76,6 +78,6 @@ extern const char *glibtop_descriptions_swap [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/sysdeps.h

@@ -1,30 +1,32 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_SYSDEPS_H__
 #define __GLIBTOP_SYSDEPS_H__
 
 #include <glibtop.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_SYSDEPS_FEATURES	0
 #define GLIBTOP_SYSDEPS_CPU		1
@@ -90,7 +92,7 @@ struct _glibtop_sysdeps
 
 #define glibtop_get_sysdeps(sysdeps)	glibtop_get_sysdeps_r(glibtop_global_server,sysdeps)
 
-extern void glibtop_get_sysdeps_r __P((glibtop *, glibtop_sysdeps *));
+void glibtop_get_sysdeps_r (glibtop *server, glibtop_sysdeps *buf);
 
 #ifdef GLIBTOP_NAMES
 
@@ -103,6 +105,6 @@ extern const char *glibtop_descriptions_sysdeps [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/sysinfo.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_SYSINFO_H__
 #define __GLIBTOP_SYSINFO_H__
@@ -28,7 +30,7 @@
 
 #include <glib.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_SYSINFO_CPUINFO		0
 
@@ -55,8 +57,8 @@ struct _glibtop_sysinfo
 
 #define glibtop_get_sysinfo_r	glibtop_get_sysinfo_s
 
-extern glibtop_sysinfo * glibtop_get_sysinfo_s __P((glibtop *));
+glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server);
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/types.h

@@ -1,28 +1,30 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_TYPES_H__
 #define __GLIBTOP_TYPES_H__
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_TYPE_LONG	1
 #define GLIBTOP_TYPE_ULONG	2
@@ -31,6 +33,6 @@ __BEGIN_DECLS
 #define GLIBTOP_TYPE_CHAR	5
 #define GLIBTOP_TYPE_STRING	6
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/union.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_UNION_H__
 #define __GLIBTOP_UNION_H__
@@ -48,7 +50,7 @@
 #include <glibtop/netload.h>
 #include <glibtop/ppp.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 typedef union _glibtop_union	glibtop_union;
 
@@ -78,6 +80,6 @@ union _glibtop_union
 	glibtop_ppp		ppp;
 };
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/uptime.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_UPTIME_H__
 #define __GLIBTOP_UPTIME_H__
@@ -25,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define GLIBTOP_UPTIME_UPTIME		0
 #define GLIBTOP_UPTIME_IDLETIME		1
@@ -49,14 +51,14 @@ struct _glibtop_uptime
 #define glibtop_get_uptime_r		glibtop_get_uptime_s
 #endif
 
-extern void glibtop_get_uptime_l __P((glibtop *, glibtop_uptime *));
+void glibtop_get_uptime_l (glibtop *server, glibtop_uptime *buf);
 
 #if GLIBTOP_SUID_UPTIME
-extern void glibtop_init_uptime_p __P((glibtop *));
+void glibtop_init_uptime_p (glibtop *server);
-extern void glibtop_get_uptime_p __P((glibtop *, glibtop_uptime *));
+void glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf);
 #else
-extern void glibtop_init_uptime_s __P((glibtop *));
+void glibtop_init_uptime_s (glibtop *server);
-extern void glibtop_get_uptime_s __P((glibtop *, glibtop_uptime *));
+void glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -70,6 +72,6 @@ extern const char *glibtop_descriptions_uptime [];
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/version.h

@@ -1,21 +1,23 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_VERSION_H__
 #define __GLIBTOP_VERSION_H__
@@ -27,14 +29,14 @@
 
 #define LIBGTOP_VERSION_STRING "Libgtop %s server version %s (%u,%u,%u,%u)."
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #if _IN_LIBGTOP
 
-extern void glibtop_send_version __P((glibtop *, int));
+void glibtop_send_version (glibtop *server, int fd);
 
 #endif
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/write.h

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __GLIBTOP_WRITE_H__
 #define __GLIBTOP_WRITE_H__
@@ -25,13 +27,13 @@
 #include <glibtop.h>
 #include <glibtop/error.h>
 
-__BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 #define glibtop_write(p1, p2)	glibtop_write(glibtop_global_server, p1, p2)
 
-extern void glibtop_write_l __P((glibtop *, size_t, void *));
+void glibtop_write_l (glibtop *server, size_t size, void *buf);
-extern void glibtop_write_s __P((glibtop *, size_t, void *));
+void glibtop_write_s (glibtop *server, size_t size, void *buf);
 
-__END_DECLS
+END_LIBGTOP_DECLS
 
 #endif

include/glibtop/xmalloc.h

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

kernel/ChangeLog

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

kernel/sysctl/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile for the linux system information tables.
+# 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
@@ -7,7 +7,16 @@
 #
 # Note 2! The CFLAGS definition is now in the main makefile...
 
-O_TARGET := table.o
+O_TARGET := kernel.o
+ifeq ($(CONFIG_LIBGTOP),y)
+O_OJBS   := main.o libgtop.o
+else
 O_OBJS   := main.o
+endif
+OX_OBJS  := libgtop_syms.o
+
+ifeq ($(CONFIG_LIBGTOP),m)
+M_OBJS   := libgtop.o
+endif
 
 include $(TOPDIR)/Rules.make

kernel/sysctl/libgtop.c

@@ -0,0 +1,320 @@
+/*
+ * linux/libgtop/module.c
+ * Copyright (C) 1999 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/sysctl.h>
+#include <linux/module.h>
+
+#include <linux/libgtop.h>
+
+EXPORT_NO_SYMBOLS;
+
+static int system_ctl_handler (ctl_table *table, int *name, int nlen,
+			       void *oldval, size_t *oldlenp, void *newval,
+			       size_t newlen, void **context);
+
+static int proc_ctl_handler (ctl_table *table, int *name, int nlen,
+			     void *oldval, size_t *oldlenp, void *newval,
+			     size_t newlen, void **context);
+
+static int libgtop_sysctl_version = 1;
+static int libgtop_update_expensive = 5000;
+
+static struct ctl_table_header *libgtop_sysctl_header = NULL;
+
+static libgtop_stat_t libgtop_stat;
+static unsigned int libgtop_mem_timestamp = 0;
+static libgtop_mem_t libgtop_mem;
+static unsigned int libgtop_swap_timestamp = 0;
+static libgtop_swap_t libgtop_swap;
+static libgtop_proclist_t libgtop_proclist;
+
+static ctl_table libgtop_table[];
+static ctl_table proc_table[];
+
+static ctl_table libgtop_root_table[] = {
+    {CTL_LIBGTOP, "libgtop", NULL, 0, 0555, libgtop_table},
+    {0}
+};
+
+#ifdef MODULE
+static
+#endif
+ctl_table libgtop_table[] = {
+    {LIBGTOP_VERSION, "version", &libgtop_sysctl_version,
+     sizeof (int), 0444, NULL, &proc_dointvec},
+    {LIBGTOP_PROC, NULL, NULL, 0, 0555, proc_table},
+    {LIBGTOP_UPDATE_EXPENSIVE, "update_expensive",
+     &libgtop_update_expensive, sizeof (int), 0664, NULL, &proc_dointvec},
+    {LIBGTOP_STAT, NULL, &libgtop_stat, sizeof (libgtop_stat),
+     0444, NULL, NULL, &system_ctl_handler},
+    {LIBGTOP_MEM, NULL, &libgtop_mem, sizeof (libgtop_mem),
+     0444, NULL, NULL, &system_ctl_handler},
+    {LIBGTOP_SWAP, NULL, &libgtop_swap, sizeof (libgtop_swap),
+     0444, NULL, NULL, &system_ctl_handler},
+    {LIBGTOP_PROCLIST, NULL, &libgtop_proclist, sizeof (libgtop_proclist),
+     0444, NULL, NULL, &system_ctl_handler},
+    {0}
+};
+
+static ctl_table proc_table[] = {
+    {CTL_ANY, NULL, NULL, 0, 04444, NULL, NULL, &proc_ctl_handler},
+    {0}
+};
+
+#ifdef MODULE
+static void
+libgtop_sysctl_register(void)
+{
+    static int initialized = 0;
+
+    if (initialized == 1)
+	return;
+
+    libgtop_sysctl_header = register_sysctl_table(libgtop_root_table, 1);
+    initialized = 1;
+}
+
+static void
+libgtop_sysctl_unregister(void)
+{
+    unregister_sysctl_table(libgtop_sysctl_header);
+}
+
+int init_module(void)
+{
+    libgtop_sysctl_register();
+    return 0;
+}
+
+void cleanup_module(void)
+{
+    libgtop_sysctl_unregister();
+}
+
+#endif /* MODULE */
+
+static int
+libgtop_sysctl (ctl_table *table, int nlen, int *name)
+{
+    extern unsigned long total_forks;
+    int index, tindex, tty, which, arg;
+    libgtop_stat_t *lstat;
+    libgtop_mem_t *mem;
+    libgtop_swap_t *swap;
+    libgtop_proclist_t *proclist;
+    struct task_struct *tsk = NULL;
+    struct sysinfo i;
+
+    switch (table->ctl_name) {
+    case LIBGTOP_STAT:
+	lstat = table->data;
+	lstat->cpu.total = jiffies;
+	lstat->cpu.user  = kstat.cpu_user;
+	lstat->cpu.nice  = kstat.cpu_nice;
+	lstat->cpu.sys   = kstat.cpu_system;
+	lstat->cpu.idle  = jiffies*smp_num_cpus -
+	    (lstat->cpu.user + lstat->cpu.nice + lstat->cpu.sys);
+#ifdef __SMP__
+	for (i = 0; i < smp_num_cpus; i++) {
+	    lstat->xcpu[i].user = kstat.per_cpu_user[cpu_logical_map(i)];
+	    lstat->xcpu[i].nice = kstat.per_cpu_nice[cpu_logical_map(i)];
+	    lstat->xcpu[i].sys = kstat.per_cpu_system[cpu_logical_map(i)];
+	    lstat->xcpu[i].idle = jiffies -
+		(lstat->xcpu[i].user + lstat->xcpu[i].nice +
+		 lstat->xcpu[i].sys);
+	}
+
+	lstat->ncpu = smp_num_cpus;
+#else
+	lstat->ncpu = 0;
+#endif
+
+	lstat->frequency = HZ;
+
+	lstat->loadavg [0] = (double) avenrun [0] / (1 << FSHIFT);
+	lstat->loadavg [1] = (double) avenrun [1] / (1 << FSHIFT);
+	lstat->loadavg [2] = (double) avenrun [2] / (1 << FSHIFT);
+
+	lstat->pgpgin = kstat.pgpgin;
+	lstat->pgpgout = kstat.pgpgout;
+	lstat->pswpin = kstat.pswpin;
+	lstat->pswpout = kstat.pswpout;
+
+	lstat->context_swtch = kstat.context_swtch;
+	lstat->boot_time = xtime.tv_sec - jiffies / HZ;
+	lstat->total_forks = total_forks;
+	break;
+    case LIBGTOP_MEM:
+	if (jiffies - libgtop_mem_timestamp < libgtop_update_expensive)
+	    return 0;
+	libgtop_mem_timestamp = jiffies;
+
+	mem = table->data;
+	si_meminfo (&i);
+
+	mem->totalram = i.totalram;
+	mem->freeram = i.freeram;
+	mem->sharedram = i.sharedram;
+	mem->bufferram = i.bufferram;
+	return 0;
+    case LIBGTOP_SWAP:
+	if (jiffies - libgtop_swap_timestamp < libgtop_update_expensive)
+	    return 0;
+	libgtop_swap_timestamp = jiffies;
+
+	swap = table->data;
+	si_swapinfo (&i);
+
+	swap->totalswap = i.totalswap;
+	swap->freeswap = i.freeswap;
+	return 0;
+    case LIBGTOP_PROCLIST:
+	proclist = table->data;
+
+	if (nlen == 1) {
+	    which = 0;
+	    arg = 0;
+	} else if (nlen == 2) {
+	    which = name [1];
+	    arg = 0;
+	} else if (nlen == 3) {
+	    which = name [1];
+	    arg = name [2];
+	} else {
+	    return -EINVAL;
+	}
+
+	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 (which & LIBGTOP_PROCLIST_MASK) {
+	    case LIBGTOP_PROCLIST_PID:
+		if (tsk->pid != arg) continue;
+		break;
+	    case LIBGTOP_PROCLIST_PGRP:
+		if (tsk->pgrp != arg) continue;
+		break;
+	    case LIBGTOP_PROCLIST_SESSION:
+		if (tsk->session != arg) continue;
+		break;
+	    case LIBGTOP_PROCLIST_TTY:
+		tty = tsk->tty ?
+		    kdev_t_to_nr (tsk->tty->device) : 0;
+		if (tty != arg) continue;
+		break;
+	    case LIBGTOP_PROCLIST_UID:
+		if (tsk->uid != arg) continue;
+		break;
+	    case LIBGTOP_PROCLIST_RUID:
+		if (tsk->euid != arg) continue;
+		break;
+	    }
+
+	    if ((which & LIBGTOP_EXCLUDE_IDLE) && (tsk->state != 0))
+		continue;
+
+	    if ((which & LIBGTOP_EXCLUDE_NOTTY) && (tsk->tty == NULL))
+		continue;
+			
+	    proclist->pids [tindex++] = tsk->pid;
+	}
+
+	proclist->nr_running = nr_running;
+	proclist->last_pid = last_pid;
+	proclist->nr_tasks = tindex;
+	read_unlock(&tasklist_lock);
+	return 0;
+    default:
+	return -EINVAL;
+    }
+
+    return 0;
+}
+
+static int
+system_ctl_handler (ctl_table *table, int *name, int nlen,
+		    void *oldval, size_t *oldlenp, void *newval,
+		    size_t newlen, void **context)
+{
+    int ret, len, len_name;
+
+    if (!table->data || !table->maxlen)
+	return -ENOTDIR;
+
+    if (!oldval || !oldlenp || get_user(len, oldlenp))
+	return -EFAULT;
+
+    if (!name || !nlen || get_user(len_name, name))
+	return -EFAULT;
+
+    if (len != table->maxlen)
+	return -EFAULT;
+
+    ret = libgtop_sysctl (table, nlen, name);
+    if (ret) return ret;
+
+    if(copy_to_user(oldval, table->data, len))
+	return -EFAULT;
+
+    return 1;
+}
+
+static int
+proc_ctl_handler (ctl_table *table, int *name, int nlen,
+		  void *oldval, size_t *oldlenp, void *newval,
+		  size_t newlen, void **context)
+{
+    int ret, len;
+
+#if 0
+    printk ("proc_ctl_handler: %p - %p - %d - (%p,%p) - (%p,%d) - %p\n",
+	    table, name, nlen, oldval, oldlenp, newval, newlen, context);
+#endif
+
+    if (!name || !nlen || get_user(len, name))
+	return -EFAULT;
+
+#if 0
+    printk ("FUNCTION: %d - %d - %p\n", table->ctl_name,
+	    *name, table->de);
+#endif
+
+    if (!table->data || !table->maxlen)
+	return -ENOTDIR;
+
+    if (!oldval || !oldlenp || get_user(len, oldlenp))
+	return -EFAULT;
+
+    if (len != table->maxlen)
+	return -EFAULT;
+
+    return -ENOSYS;
+}

kernel/sysctl/libgtop.h

@@ -0,0 +1,82 @@
+#ifndef _LINUX_LIBGTOP_H
+#define _LINUX_LIBGTOP_H 1
+
+#include <linux/tasks.h>
+
+enum {
+    LIBGTOP_VERSION = 1,
+    LIBGTOP_PROC,
+    LIBGTOP_UPDATE_EXPENSIVE,
+    LIBGTOP_STAT,
+    LIBGTOP_MEM,
+    LIBGTOP_SWAP,
+    LIBGTOP_PROCLIST
+};
+
+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_PROCLIST_MASK		15	
+
+#define LIBGTOP_EXCLUDE_IDLE		0x1000
+#define LIBGTOP_EXCLUDE_SYSTEM		0x2000
+#define LIBGTOP_EXCLUDE_NOTTY		0x4000
+
+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;
+
+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 */
+};
+
+struct libgtop_swap
+{
+    unsigned long totalswap;		/* Total swap space size */
+    unsigned long freeswap;		/* swap space still available */
+};
+
+struct libgtop_proclist
+{
+    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	*/
+};
+
+#endif

kernel/sysctl/libgtop_syms.c

@@ -0,0 +1,24 @@
+/*
+ * 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(avenrun);
+EXPORT_SYMBOL(nr_running);
+EXPORT_SYMBOL(nr_tasks);
+EXPORT_SYMBOL(last_pid);
+EXPORT_SYMBOL(total_forks);
+EXPORT_SYMBOL(si_swapinfo);
+

kernel/sysctl/main.c

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

kernel/sysctl/patch-2.2.1

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

kernel/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 */
-
-

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

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

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) \

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;
-}

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_ */

kernel/table20/version.h

@@ -1 +0,0 @@
-#define _TABLE_VERSION	1

kernel/table21/.cvsignore

@@ -1,4 +0,0 @@
-kernel.patch
-.main.o.flags
-.table.o.flags
-.module.o.flags

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

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

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

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);
-}

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;
-}

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_ */

kernel/table21/version.h

@@ -1 +0,0 @@
-#define _TABLE_VERSION	1

kernel/version.h

@@ -1 +0,0 @@
-#define _TABLE_VERSION	1

lib/Makefile.am

@@ -1,6 +1,6 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-CFLAGS				= -Wall -W @CFLAGS@
+INCLUDES			= @INCLUDES@
 
 lib_LTLIBRARIES			= libgtop.la
 
@@ -12,11 +12,11 @@ libgtop_la_LDFLAGS		= $(LT_VERSION_INFO)
 
 BUILT_SOURCES			= lib.c
 
-lib.c: lib.awk $(top_builddir)/config.h $(top_srcdir)/features.def
+lib.c: lib.pl $(top_builddir)/config.h $(top_srcdir)/features.def
-	$(AWK) -f $(srcdir)/lib.awk < $(top_srcdir)/features.def > lib-t
+	$(PERL) $(srcdir)/lib.pl < $(top_srcdir)/features.def > lib-t
 	mv lib-t lib.c
 
-EXTRA_DIST			= lib.awk
+EXTRA_DIST			= lib.pl
 
 CLEANFILES			= lib.c
 

lib/close.c

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #include <glibtop.h>
 #include <glibtop/open.h>

lib/command.c

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #include <glibtop/read.h>
 #include <glibtop/write.h>

lib/init.c

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #include <glibtop.h>
 #include <glibtop/xmalloc.h>

lib/inodedb.c

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #include <glibtop.h>
 #include <glibtop/error.h>

lib/lib.awk

@@ -1,167 +0,0 @@
-BEGIN {
-  print "/* lib.c */";
-  print "/* This is a generated file.  Please modify `lib.awk' */";
-  print "";
-  
-  print "#include <glibtop.h>";
-  print "#include <glibtop/open.h>";
-  print "";
-  print "#include <glibtop/sysdeps.h>";
-  print "#include <glibtop/union.h>";
-  print "";
-  print "#include <glibtop/command.h>";
-  
-  print "";
-  print "/* Some required fields are missing. */";
-  print "";
-
-  print "static void";
-  print "_glibtop_missing_feature (glibtop *server, const char *feature,";
-  print "\t\t\t  const u_int64_t present, u_int64_t *required)";
-  print "{";
-  print "\tswitch (server->error_method) {";
-  print "\tcase GLIBTOP_ERROR_METHOD_WARN_ONCE:";
-  print "\t\t*required &= present;";
-  print "\tcase GLIBTOP_ERROR_METHOD_WARN:";
-  print "\t\tglibtop_warn_r (server,";
-  print "\t\t\t\t_(\"glibtop_get_%s (): Client requested \"";
-  print "\t\t\t\t  \"field mask %05Lx, but only have %05Lx.\"),";
-  print "\t\t\t\t feature, required, present);";
-  print "\t\tbreak;";
-  print "\tcase GLIBTOP_ERROR_METHOD_ABORT:";
-  print "\t\tglibtop_error_r (server,";
-  print "\t\t\t\t _(\"glibtop_get_%s (): Client requested \"";
-  print "\t\t\t\t   \"field mask %05x, but only have %05x.\"),";
-  print "\t\t\t\t feature, required, present);";
-  print "\t\tbreak;";
-  print "\t}";
-  print "}";
-
-  print "";
-  print "/* Library functions. */";
-  print "";
-
-  convert["long"]     = "int64_t";
-  convert["ulong"]    = "u_int64_t";
-  convert["pid_t"]    = "pid_t";
-  convert["int"]      = "int";
-  convert["ushort"]   = "unsigned short";
-  convert["unsigned"] = "unsigned";
-}
-
-function output(line) {
-  split (line, line_fields, /\|/);
-  retval = line_fields[1];
-  feature = line_fields[2];
-  param_def = line_fields[4];
-
-  orig = feature; sub(/^@/,"",feature);
-  space = feature; gsub(/./," ",space);
-
-  print retval;
-  if (retval !~ /^void$/) {
-    prefix = "retval = ";
-    prefix_space = "         ";
-  } else {
-    prefix = "";
-    prefix_space = "";
-  }
-
-  if (param_def == "string") {
-    call_param = ", "line_fields[5];
-    param_decl = ",\n            "space"    const char *"line_fields[5];
-    send_ptr = "\n\tconst void *send_ptr = "line_fields[5]";";
-    send_size = "\n\tconst size_t send_size =\n\t\tstrlen ("line_fields[5]") + 1;";
-  } else {
-    call_param = "";
-    param_decl = "";
-    send_size = "";
-    send_ptr = "";
-    nr_params = split (param_def, params, /:/);
-    for (param = 1; param <= nr_params; param++) {
-      list = params[param];
-      type = params[param];
-      sub(/\(.*/, "", type);
-      sub(/^.*\(/, "", list); sub(/\)$/, "", list);
-      count = split (list, fields, /,/);
-      for (field = 1; field <= count; field++) {
-	if (param_decl == "")
-	  param_decl = ",\n            "space"    ";
-	else
-	  param_decl = param_decl", ";
-	param_decl = param_decl""convert[type]" "fields[field];
-	call_param = call_param", "fields[field];
-	if (send_ptr == "")
-	  send_ptr = "\n\tconst void *send_ptr = &"fields[field]";";
-	if (send_size == "")
-	  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 != "")
-      send_size = send_size";";
-    else
-      send_size = "\n\tconst size_t send_size = 0;";
-    if (send_ptr == "")
-      send_ptr = "\n\tconst void *send_ptr = NULL;";
-  }
-
-  print "glibtop_get_"feature"_l (glibtop *server, glibtop_"feature" *buf"param_decl")";
-  
-  print "{"send_ptr""send_size;
-  if (retval !~ /^void$/)
-    print "\t"retval" retval = ("retval") 0;";
-  print "";
-
-  print "\tglibtop_init_r (&server, (1 << GLIBTOP_SYSDEPS_"toupper(feature)"), 0);";
-
-  print "";
-  print "\t/* If neccessary, we ask the server for the requested";
-  print "\t * feature. If not, we call the sysdeps function. */";
-  print "";
-
-  print "\tif ((server->flags & _GLIBTOP_INIT_STATE_SERVER) &&";
-  print "\t    (server->features & (1 << GLIBTOP_SYSDEPS_"toupper(feature)")))";
-  print "\t{";
-
-  print "\t\t"prefix"glibtop_call_l (server, GLIBTOP_CMND_"toupper(feature)",";
-  print "\t\t\t\t"prefix_space"send_size, send_ptr,";
-  print "\t\t\t\t"prefix_space"sizeof (glibtop_"feature"), buf);";
-  
-  print "\t} else {";
-
-  if (orig !~ /^@/)
-    print "#if (!GLIBTOP_SUID_"toupper(feature)")";
-
-  print "\t\t"prefix"glibtop_get_"feature"_s (server, buf"call_param");";
-
-  if (orig !~ /^@/) {
-    print "#else";
-    print "\t\terrno = ENOSYS;";
-    print "\t\tglibtop_error_io_r (server, \"glibtop_get_"feature"\");";
-    print "#endif";
-  }
-
-  print "\t}";
-
-  print "";
-  print "\t/* Make sure that all required fields are present. */";
-  print "";
-
-  print "\tif (buf->flags & server->required."feature")";
-  print "\t\t_glibtop_missing_feature (server, \""feature"\", buf->flags,";
-  print "\t\t\t\t\t  &server->required."feature");";
-
-  if (retval !~ /^void$/) {
-    print "\n\t/* Now we can return. */";
-    print "\n\treturn retval;";
-  }
-
-  print "}";
-  print "";
-}
-	
-/^[^#]/		{ output($0) }
-

lib/lib.pl

@@ -0,0 +1,231 @@
+#!/usr/bin/perl
+
+$[ = 1;			# set array base to 1
+$, = ' ';		# set output field separator
+$\ = "\n";		# set output record separator
+
+sub toupper {
+    local($_) = @_;
+    tr/a-z/A-Z/;
+    return $_;
+}
+
+sub tolower {
+    local($_) = @_;
+    tr/A-Z/a-z/;
+    return $_;
+}
+
+print '/* lib.c */';
+print "/* This is a generated file.  Please modify `lib.pl' */";
+print '';
+
+print '#include <glibtop.h>';
+print '#include <glibtop/open.h>';
+print '';
+print '#include <glibtop/sysdeps.h>';
+print '#include <glibtop/union.h>';
+print '';
+print '#include <glibtop/command.h>';
+
+print '';
+print '/* Some required fields are missing. */';
+print '';
+
+print 'static void';
+print '_glibtop_missing_feature (glibtop *server, const char *feature,';
+print "\t\t\t  const u_int64_t present, u_int64_t *required)";
+print '{';
+print "\tu_int64_t old_required = *required;\n";
+print "\t/* Return if we have all required fields. */";
+print "\tif ((~present & old_required) == 0)";
+print "\t\treturn;\n";
+print "\tswitch (server->error_method) {";
+print "\tcase GLIBTOP_ERROR_METHOD_WARN_ONCE:";
+print "\t\t*required &= present;";
+print "\tcase GLIBTOP_ERROR_METHOD_WARN:";
+print "\t\tglibtop_warn_r (server,";
+print "\t\t\t\t_(\"glibtop_get_%s (): Client requested \"";
+print "\t\t\t\t  \"field mask %05Lx, but only have %05Lx.\"),";
+print "\t\t\t\t feature, old_required, present);";
+print "\t\tbreak;";
+print "\tcase GLIBTOP_ERROR_METHOD_ABORT:";
+print "\t\tglibtop_error_r (server,";
+print "\t\t\t\t _(\"glibtop_get_%s (): Client requested \"";
+print "\t\t\t\t   \"field mask %05x, but only have %05x.\"),";
+print "\t\t\t\t feature, old_required, present);";
+print "\t\tbreak;";
+print "\t}";
+print '}';
+
+print '';
+print '/* Library functions. */';
+print '';
+
+$convert{'long'} = 'int64_t';
+$convert{'ulong'} = 'u_int64_t';
+$convert{'pid_t'} = 'pid_t';
+$convert{'int'} = 'int';
+$convert{'ushort'} = 'unsigned short';
+$convert{'unsigned'} = 'unsigned';
+
+while (<>) {
+    chop;	# strip record separator
+
+    if (/^[^#]/) {
+	&output($_);
+    }
+}
+
+sub output {
+    local($line) = @_;
+    @line_fields = split(/\|/, $line, 9999);
+    $retval = $line_fields[1];
+    $feature = $line_fields[2];
+    $param_def = $line_fields[4];
+
+    $orig = $feature;
+    $feature =~ s/^@//;
+    $space = $feature;
+    $space =~ s/./ /g;
+
+    print $retval;
+    if ($retval !~ /^void$/) {
+	$prefix = 'retval = ';
+	$prefix_space = '         ';
+    }
+    else {
+	$prefix = '';
+	$prefix_space = '';
+    }
+
+    if ($param_def eq 'string') {
+	$call_param = ', ' . $line_fields[5];
+	$param_decl = ",\n            " . $space . '    const char *' .
+
+	  $line_fields[5];
+	$send_ptr = "\n\tconst void *send_ptr = " . $line_fields[5] . ';';
+	$send_size = "\n\tconst size_t send_size =\n\t\tstrlen (" .
+
+	  $line_fields[5] . ') + 1;';
+    }
+    else {
+	$call_param = '';
+	$param_decl = '';
+	$send_size = '';
+	$send_ptr = '';
+	$nr_params = (@params = split(/:/, $param_def, 9999));
+	for ($param = 1; $param <= $nr_params; $param++) {
+	    $list = $params[$param];
+	    $type = $params[$param];
+	    $type =~ s/\(.*//;
+	    $list =~ s/^.*\(//;
+	    $list =~ s/\)$//;
+	    $count = (@fields = split(/,/, $list, 9999));
+	    for ($field = 1; $field <= $count; $field++) {
+		if ($param_decl eq '') {
+		    $param_decl = ",\n            " . $space . '    ';
+		}
+		else {
+		    $param_decl = $param_decl . ', ';
+		}
+		$param_decl = $param_decl . '' . $convert{$type} . ' ' .
+
+		  $fields[$field];
+		$call_param = $call_param . ', ' . $fields[$field];
+		if ($send_ptr eq '') {
+		    $send_ptr = "\n\tconst void *send_ptr = &" .
+
+		      $fields[$field] . ';';
+		}
+		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 . ';';
+	}
+	else {
+	    $send_size = "\n\tconst size_t send_size = 0;";
+	}
+	if ($send_ptr eq '') {
+	    $send_ptr = "\n\tconst void *send_ptr = NULL;";
+	}
+    }
+
+    print 'glibtop_get_' . $feature . '_l (glibtop *server, glibtop_' .
+
+      $feature . ' *buf' . $param_decl . ')';
+
+    print '{' . $send_ptr . '' . $send_size;
+    if ($retval !~ /^void$/) {
+	print "\t" . $retval . ' retval = (' . $retval . ') 0;';
+    }
+    print '';
+
+    print "\tglibtop_init_r (&server, (1 << GLIBTOP_SYSDEPS_" .
+
+      &toupper($feature) . '), 0);';
+
+    print '';
+    print "\t/* If neccessary, we ask the server for the requested";
+    print "\t * feature. If not, we call the sysdeps function. */";
+    print '';
+
+    print "\tif ((server->flags & _GLIBTOP_INIT_STATE_SERVER) &&";
+    print "\t    (server->features & (1 << GLIBTOP_SYSDEPS_" .
+
+      &toupper($feature) . ')))';
+    print "\t{";
+
+    print "\t\t" . $prefix . 'glibtop_call_l (server, GLIBTOP_CMND_' .
+
+      &toupper($feature) . ',';
+    print "\t\t\t\t" . $prefix_space . 'send_size, send_ptr,';
+    print "\t\t\t\t" . $prefix_space . 'sizeof (glibtop_' . $feature .
+
+      '), buf);';
+
+    print "\t} else {";
+
+    if ($orig !~ /^@/) {
+	print '#if (!GLIBTOP_SUID_' . &toupper($feature) . ')';
+    }
+    print "\t\t" . $prefix . 'glibtop_get_' . $feature . '_s (server, buf' .
+
+      $call_param . ');';
+
+    if ($orig !~ /^@/) {
+	print '#else';
+	print "\t\terrno = ENOSYS;";
+	print "\t\tglibtop_error_io_r (server, \"glibtop_get_" . $feature .
+
+	  "\");";
+	print '#endif';
+    }
+
+    print "\t}";
+
+    print '';
+    print "\t/* Make sure that all required fields are present. */";
+    print '';
+
+    print "\tif (buf->flags & server->required." . $feature . ')';
+    print "\t\t_glibtop_missing_feature (server, \"" . $feature .
+
+      "\", buf->flags,";
+    print "\t\t\t\t\t  &server->required." . $feature . ');';
+
+    if ($retval !~ /^void$/) {
+	print "\n\t/* Now we can return. */";
+	print "\n\treturn retval;";
+    }
+
+    print '}';
+    print '';
+}

lib/open.c

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -128,7 +130,7 @@ glibtop_open_l (glibtop *server, const char *program_name,
 	if (server->flags & _GLIBTOP_INIT_STATE_SERVER) {
 		char version [BUFSIZ], buffer [BUFSIZ];
 		glibtop_sysdeps sysdeps;
-		unsigned size, nbytes;
+		size_t size, nbytes;
 
 		/* First check whether the server version is correct. */
 

lib/parameter.c

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #include <glibtop.h>
 #include <glibtop/parameter.h>

lib/read.c

@@ -1,23 +1,25 @@
 /* $Id$ */
 
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of the Gnome Top Library.
+   This file is part of LibGTop 1.0.
+
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
-   The Gnome Top Library is free software; you can redistribute it and/or
+   LibGTop is free software; you can redistribute it and/or modify it
-   modify it under the terms of the GNU Library General Public License as
+   under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2 of the
+   the Free Software Foundation; either version 2 of the License,
-   License, or (at your option) any later version.
+   or (at your option) any later version.
 
-   The Gnome Top Library is distributed in the hope that it will be useful,
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   Library General Public License for more details.
+   for more details.
 
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU General Public License
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   along with LibGTop; see the file COPYING. If not, write to the
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02111-1307, USA.
+*/
 
 #include <glibtop/read.h>