Fixing mistakes from previous checkin.

1998-06-12  Martin Baulig  <baulig@taurus.uni-trier.de>

	* sysdeps/guile/proclist.c: Replaced call to
	`gh_append2 ()' with `gh_append ()'.

ChangeLog

@@ -1,183 +1,10 @@
-1998-07-03  Martin baulig  <martin@home-of-linux.org>
-
-	* macros/gnome-libgtop-sysdeps.m4: No longer use
-	`glibtop_machine.h' for Linux.
-
-	* sysdeps/linux/glibtop_machine.h: Removed.
-
-	* sysdeps/guile/guile.awk: Using `scm_append'
-	instead of `gh_append'.
-
-	* sysdeps/guile/names/guile-names.awk: dito.
-
-	* sysdeps/linux/*.c: Using code from stable branch again.
-
-	* include/glibtop/parameter.h: New file.
-
-	* lib/parameter.c: New file.
-
-	* lib/{open, init}.c: Done some more work on server
-	initialization
-
-1998-06-21  Martin Baulig  <martin@home-of-linux.org>
-
-	* perl/*: Added perl interface.
-
-	* sysdeps/linux/cpu.c: Bug fix.
-
-	* include/glibtop/global.h: Only including guile header files
-	within libgtop.
-
-	* configure.in (LIGBTOP_LIBS): Added `-lgtop'.
-
-	* Makefile.am: Creating `perl/Makefile.PL' from `perl/Makefile.PL.in'
-	and `perl/Libgtop.xs' using `perl/perl.awk'.
-
-1998-06-18  Martin Baulig  <baulig@taurus.uni-trier.de>
-
-	* sysdeps/linux/*.c: Reverted some stuff from 06-07-1998
-	since it was too buggy.
-
-	* glibtop.h (_glibtop): New field `server_port'.
-
-	* lib/xmalloc.c (glibtop_strdup_r): New function.
-
-	* lib/gnuclient.c: Removed.
-	
-	* lib/{command, write, read}.c: Changed client <-> server
-	interface to make less system calls.
-
-	* src/daemon/main.c: Changed server side of interface.
-	
-	* include/glibtop/command.h (struct _glibtop_response): New
-	structure to return data from the server to the client.
-
-1998-06-14  Martin Baulig  <martin@home-of-linux.org>
-
-	* glibtop.h (struct _glibtop): Added `socket' field.
-
-	* include/glibtop/gnuserv.h: New file. Imported from xemacs 20.3.
-
-	* sysdeps/common/gnuslib.c: New file. Imported from xemacs 20.3
-
-	* lib/gnuclient.c: New file. Imported from xemacs 20.3
-
-	* sysdeps/daemon/gnuserv.c: New file. Imported from xemacs 20.3
-
-	* sysdeps/daemon: New directory.
-
-	* configure.in (LIBGTOP_LIBS, LIBGTOP_GUILE_LIBS): Added
-	`$X_LIBS -lXau' when we have xauth.
-
-	* acconfig.h (HAVE_XAUTH): New tag.
-
-	* configure.in: Added check for `HAVE_XAUTH'.
-
-	* sysdeps/common/error.c (glibtop_warn_r): New function -
-	same as `glibtop_error_r', but doesn't call `exit'.
-	(glibtop_error_io_r, glibtop_warn_io_r): New functions,
-	display `strerror (errno)' together with message.
-
-	* include/glibtop/global.h (TIME_WITH_SYS_TIME): including
-	correct headers; (HAVE_UNISTD_H): Added conditional.
-	Added `#include <sys/param.h>' and `#include <sys/stat.h>'.
-
-	* acconfig.h (HAVE_LINUX_TABLE): New tag.
-
-	* lib/lib.awk: New file.
-	Creates `lib.c' depending upon `features.def'.
-
-	* lib/<feature>.c: Removed.
-
-	* sysdeps/guile/guile.awk: New file.
-	Creates `guile.c' depending upon `features.def'.
-
-	* sysdeps/guile/*.c: Removed.
-
-1998-06-13  Martin Baulig  <martin@home-of-linux.org>
-
-	* features.def: List of features for `guile-names.awk'.
-
-	* sysdeps/guile/names/guile-names.awk: New file.
-	Creates `guile-names.c' depending upon `features.def'.
-
-	* sysdeps/guile/names/*.c: Removed.
-
-	* kernel: New directory. Contains some kernel code to
-	implement a new system call table () to fetch information
-	directly from the Linux kernel.
-
-	* sysdeps/kernel: New directory. Uses the table () function
-	from the `kernel' directory to fetch things directly from
-	the Linux kernel.
-
-	* sysdeps/Makefile.am (DIST_SUBDIRS): Added `kernel'.
-
-	* configure.in: Removed `build_CC' again.
-
 1998-06-12  Martin Baulig  <baulig@taurus.uni-trier.de>
 
-	* include/glibtop/sysdeps.h (glibtop_types_sysdeps):
-	Forgot to change declaration on Jun 6.
-	
-	* sysdeps/names/sysdeps.c (glibtop_types_sysdeps):
-	Using numeric constants from `types.h' instead of string
-	constants; forgot to change this on Jun 6. Added information
-	about new `features' field of `_glibtop_sysdeps'.
-
-	* sysdeps/guile/names/*.c (glibtop_guile_types_*):
-	Using `gh_ulong2scm' instead of `gh_str02scm'.
-
 	* sysdeps/guile/proclist.c: Replaced call to
 	`gh_append2 ()' with `gh_append ()'.
 
 	* sysdeps/guile/names/*.c: dito.
 
-1998-06-08  Martin Baulig  <martin@home-of-linux.org>
-
-	* support: Added again.
-
-	* Makefile.am (SUBDIRS): Added `support' again.
-
-	* configure.in: First, we check for gnome. If it is not
-	found, we run GNOME_SUPPORT_CHECKS; otherwise use
-	`$GNOME_LIBDIR -lgnomesupport'.
-
-1998-06-07  Martin Baulig  <martin@home-of-linux.org>
-
-	* examples/ChangeLog: New file.
-	
-	* macros/gnome-libgtop-sysdeps.m4: Include
-	`glibtop_machine.h' for Linux.
-	
-	* sysdeps/linux/glibtop_machine.h: New file.
-	
-	* sysdeps/linux/*.c: Performance optimizations. We now use
-	`open' and `read' instead of `fopen' and `fscanf'.
-	
-	* *.[ch]: Using single underscore instead of two underscores
-	for function prefixes (regexp: ``s,__([rspl])\b,_$1,g'') to
-	avoid ambiguity with mangled C++ names.
-	
-1998-06-06  Martin Baulig  <martin@home-of-linux.org>
-
-	* sysdeps/osf1/glibtop_server.h: New file.
-	
-	* sysdeps/osf1/*.c: renamed all functions implementing
-	features that don't need to be suid to '__s'.
-
-	* sysdeps/names/procdata.c: Removed that file.
-	
-	* include/glibtop/*.h (glibtop_types_*): Changed declaration.
-	
-	* glibtop.h: Added `#include <types.h>'.
-
-	* include/glibtop/types.h: New file - numeric constants
-	for `glibtop_types_<feature>'.
-
-	* sysdeps/names/*.c (glibtop_types_*): Using numeric
-	constants from `types.h' instead of string constants.
-
 1998-06-05  Martin Baulig  <baulig@taurus.uni-trier.de>
 
 	* support: removed that directory.
@@ -209,99 +36,6 @@
 
 	* src/server/main.c: #include <locale.h>
 
-1998-06-02  Martin Baulig  <baulig@merkur.uni-trier.de>
-
-	* lib/open.c (glibtop_open): renamed to `glibtop_open__l'.
-
-	* sysdeps/linux/open.c (glibtop_open): renamed to
-	`glibtop_open__r'.
-
-	* include/glibtop/open.h (GLIBTOP_OPEN_NO_OVERRIDE):
-	tells `glibtop_open' to use the default server and not
-	to check the environment variables.
-
-	* include/glibtop/sysdeps.h (_glibtop_sysdeps):
-	renamed 'dummy' member to 'features'.
-
-	* src/proxy/*: new directory - proxy server.
-
-	* include/glibtop/command.h (GLIBTOP_CMND_SYSDEPS):
-	added definition here.
-
-	* src/server/main.c (GLIBTOP_CMND_SYSDEPS): new
-	command to get glibtop_server_features.
-
-1998-06-01  Martin Baulig  <martin@home-of-linux.org>
-
-	* NEWS: added more detailed description of today's and
-	yesterday's changes.
-	
-	* include/glibtop/*.h: to use the ChangeLog entry from May 28:
-	'__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'.
-
-	* 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.
-
-1998-05-25  Martin Baulig  <baulig@merkur.uni-trier.de>
-
-	* src/server/main.c: Fixed `broken pipe' error when server
-	is running SUID; accidentally uses setreuid () instead of
-	setregid ().
-
 1998-05-24  Martin Baulig  <martin@home-of-linux.org>
 
 	* sysdeps/sun4/{open.c, mem.c, glibtop_machine.h}: added

Makefile.am

@@ -4,9 +4,9 @@ if GLIBTOP_EXAMPLES
 examples_SUBDIRS	= examples
 endif
 
-built_SUBDIRS = include sysdeps lib src
+built_SUBDIRS = include sysdeps src lib
 
-SUBDIRS = po intl support macros $(built_SUBDIRS) $(examples_SUBDIRS)
+SUBDIRS = po intl macros $(built_SUBDIRS) $(examples_SUBDIRS)
 
 DIST_SUBDIRS = po intl macros include sysdeps src lib examples
 
@@ -22,9 +22,6 @@ release:
 confexecdir=$(libdir)
 confexec_DATA = $(top_builddir)/libgtopConf.sh
 
-noinst_DATA = $(top_builddir)/perl/Makefile.PL \
-		$(top_builddir)/perl/Libgtop.xs
-
 ## to automatically rebuild aclocal.m4 if any of the macros in
 ## `macros/' change
 @MAINT@include macros/macros.dep
@@ -54,27 +51,3 @@ libgtopConf.sh: libgtopConf.sh.in Makefile
 	    -e 's,\@libgtop_want_examples\@,$(libgtop_want_examples),g' \
 	      < $(srcdir)/libgtopConf.sh.in > libgtopConf.tmp \
 	  && mv libgtopConf.tmp libgtopConf.sh
-
-perl/Makefile.PL: perl/Makefile.PL.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's,\@LIBGTOP_LIBDIR\@,$(libdir),g' \
-	    -e 's,\@LIBGTOP_INCLUDEDIR\@,$(includedir),g' \
-	    -e 's,\@LIBGTOP_LIBS\@,$(LIBGTOP_LIBS),g' \
-	    -e 's,\@LIBGTOP_INCS\@,$(LIBGTOP_INCS),g' \
-	    -e 's,\@LIBGTOP_GUILE_LIBS\@,$(LIBGTOP_GUILE_LIBS),g' \
-	    -e 's,\@LIBGTOP_GUILE_INCS\@,$(LIBGTOP_GUILE_INCS),g' \
-	    -e 's,\@LIBGTOP_BINDIR\@,$(LIBGTOP_BINDIR),g' \
-	    -e 's,\@LIBGTOP_SERVER\@,$(LIBGTOP_SERVER),g' \
-	    -e 's,\@libgtop_sysdeps_dir\@,$(libgtop_sysdeps_dir),g' \
-	    -e 's,\@libgtop_need_server\@,$(libgtop_need_server),g' \
-	    -e 's,\@libgtop_use_machine_h\@,$(libgtop_use_machine_h),g' \
-	    -e 's,\@libgtop_guile_found\@,$(libgtop_guile_found),g' \
-	    -e 's,\@libgtop_want_names\@,$(libgtop_want_names),g' \
-	    -e 's,\@libgtop_want_guile_names\@,$(libgtop_want_guile_names),g' \
-	    -e 's,\@libgtop_want_examples\@,$(libgtop_want_examples),g' \
-	      < $(srcdir)/perl/Makefile.PL.in > perl/Makefile.tmp \
-	  && mv perl/Makefile.tmp perl/Makefile.PL
-
-perl/Libgtop.xs: perl/perl.awk $(top_builddir)/config.h $(top_srcdir)/features.def
-	$(AWK) -f $(top_srcdir)/perl/perl.awk < $(top_srcdir)/features.def > perl/lgt-t
-	mv perl/lgt-t perl/Libgtop.xs

NEWS

@@ -1,116 +1,5 @@
 $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
 ===========
 

acconfig.h

@@ -33,7 +33,3 @@
 #undef GLIBTOP_EXAMPLES
 
 #undef NEED_LIBGTOP
-
-#undef HAVE_LINUX_TABLE
-
-#undef HAVE_XAUTH

configure.in

@@ -4,21 +4,19 @@ dnl
 
 AC_INIT(copyright.txt)
 AM_CONFIG_HEADER(config.h)
-AC_CANONICAL_SYSTEM
 
 AM_INIT_AUTOMAKE(libgtop, 0.01)
 
+AM_MAINTAINER_MODE
+
 AM_ACLOCAL_INCLUDE(macros)
 
-AC_ISC_POSIX
+AC_CANONICAL_HOST
-AC_PROG_CC
-AC_STDC_HEADERS
-AC_ARG_PROGRAM
-
-AC_PROG_AWK
 
 AC_CHECK_TOOL(CC,gcc)
+AC_CHECK_TOOL(CXX,g++)
 AC_CHECK_TOOL(RANLIB,ranlib)
+AC_CHECK_TOOL(LD,ld)
 AC_CHECK_TOOL(AS,as)
 AC_CHECK_TOOL(AR,ar)
 AC_CHECK_TOOL(NM,nm)
@@ -26,23 +24,8 @@ AC_CHECK_TOOL(NM,nm)
 NM=`which $NM`
 export CC CXX RANLIB LD AS AR NM
 
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-
-export cross_compiling
-
-AM_PROG_LIBTOOL
-
 dnl If you want to use libgtop without gnome, comment the following line out.
-GNOME_INIT_HOOK(gnome_found=yes)
+GNOME_INIT
-
-if test "x$gnome_found" != xyes; then
-  GNOME_SUPPORT_CHECKS
-else
-  AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
-  AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
-fi
 
 AC_LC_SYSDEPS
 
@@ -52,7 +35,7 @@ if test x$libgtop_want_guile = xyes ; then
     if test x$libgtop_want_names = xyes ; then
       AC_DEFINE(GLIBTOP_GUILE_NAMES)
     fi
-    guile_examples='third third_static'
+    guile_examples='third third_static third_linux'
     guile_subdirs='guile'
   else
     guile_examples=
@@ -66,6 +49,18 @@ fi
 AC_SUBST(guile_examples)
 AC_SUBST(guile_subdirs)
 
+AC_ISC_POSIX
+AC_PROG_CXX
+AC_PROG_CC
+AC_PROG_CPP
+AC_STDC_HEADERS
+AC_ARG_PROGRAM
+AM_PROG_LEX
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+
+export cross_compiling
 AM_PROG_LIBTOOL
 
 dnl You need to uncomment the following line if you want to use libgtop without Gnome.
@@ -99,33 +94,9 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
 
-ALL_LINGUAS="fr"
+ALL_LINGUAS=""
 AM_GNU_GETTEXT
 
-AC_PATH_XTRA
-
-dnl The construct foo=`echo $w1 $w2 $w3` fails on some systems if $w1 = -e or -n
-dnl So we use the following instead.
-dnl XE_SPACE(var, words)
-define([XE_SPACE],[
-T=""
-for W in $2; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
-$1="$T"
-])dnl
-
-dnl Autodetect Xauth
-dnl -lXau is only used by gnuclient, so use a special variable for Xauth X libs
-test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
-test -z "$with_xauth" && { AC_CHECK_HEADER(X11/Xauth.h,          ,with_xauth=no) }
-test -z "$with_xauth" && { AC_CHECK_LIB(Xau, XauGetAuthByAddr,[:],with_xauth=no, $X_LIBS) }
-test -z "$with_xauth" && with_xauth=yes
-if test "$with_xauth" = "yes"; then
-  AC_DEFINE(HAVE_XAUTH)
-  XE_SPACE(libs_xauth, $X_LIBS -lXau)
-fi
-AC_SUBST(libs_xauth)
-
-
 CFLAGS="$CFLAGS -D_IN_LIBGTOP"
 
 AC_SUBST(CFLAGS)
@@ -154,7 +125,7 @@ AC_SUBST(LIBSUPPORT)
 AC_SUBST(SUPPORTINCS)
 
 dnl These definitions are expanded in make.
-LIBGTOP_LIBS='-L$(libdir) -lgtop'
+LIBGTOP_LIBS='-L$(libdir)'
 LIBGTOP_INCS='-I$(includedir)'
 LIBGTOP_GUILE_LIBS="$LIBGTOP_LIBS"
 LIBGTOP_GUILE_INCS="$LIBGTOP_INCS"
@@ -186,8 +157,8 @@ fi
 
 AC_SUBST(libgtop_want_guile_names)
 
-LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_common $libs_xauth" 
+LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_common"
-LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_common $libs_xauth"
+LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_common"
 
 if test "x$need_server" = "xyes" ; then
   LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop"
@@ -203,7 +174,9 @@ if test "x$ac_cv_guile_found" = "xyes" ; then
   LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS $GUILE_LIBS"
 fi
 
-machine_incs='-I$(top_srcdir)/sysdeps/@sysdeps_dir@'
+if test "x$libgtop_use_machine_h" = "xyes" ; then
+  machine_incs='-I$(top_srcdir)/sysdeps/@sysdeps_dir@'
+fi
 
 AC_SUBST(machine_incs)
 
@@ -214,18 +187,6 @@ AC_SUBST(LIBGTOP_GUILE_INCS)
 AC_SUBST(LIBGTOP_BINDIR)
 AC_SUBST(LIBGTOP_SERVER)
 
-LIBSUPPORT=
-SUPPORTINCS=
-if test "$need_gnome_support" = yes; then
-   if test "x$gnome_found" = xyes ; then
-     LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
-     SUPPORTINCS="$GNOME_INCLUDEDIR"
-   else
-     LIBSUPPORT='$(top_builddir)/support/libgnomesupport.la'
-     SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support'
-   fi
-fi
-
 AC_OUTPUT([
 Makefile
 po/Makefile.in
@@ -241,12 +202,8 @@ sysdeps/stub/Makefile
 sysdeps/sun4/Makefile
 sysdeps/osf1/Makefile
 sysdeps/linux/Makefile
-sysdeps/kernel/Makefile
 src/Makefile
 src/server/Makefile
-src/proxy/Makefile
-src/daemon/Makefile
 lib/Makefile
 examples/Makefile
-support/Makefile
 macros/Makefile],[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])

examples/ChangeLog

@@ -1,11 +0,0 @@
-1998-06-12  Martin Baulig  <martin@home-of-linux.org>
-
-	* test.scm: New file.
-	
-1998-06-07  Martin Baulig  <martin@home-of-linux.org>
-
-	* Makefile.am (CFLAGS): Disable optimize.
-	
-	* first.c (PROFILE_COUNT): Number of times each function
-	should be called. Defaults to 1; to profile the code, you
-	can increase this when compiling.

examples/Makefile.am

@@ -6,35 +6,46 @@ INCLUDES		= -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
 			  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
 			  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
-CFLAGS			= -Wall -W @CFLAGS@ -O0
+CFLAGS			= -Wall -W @CFLAGS@
 
 DEFS			= @DEFS@
 
-bin_PROGRAMS		= first first_static second second_static \
+bin_PROGRAMS		= first first_static first_linux \
+			  second second_static second_linux \
 			  @guile_examples@
 
-EXTRA_PROGRAMS		= third third_static
+EXTRA_PROGRAMS		= third third_static third_linux
 
 first_SOURCES		= first.c
-first_LDADD		= $(top_builddir)/lib/libgtop.la \
+first_LDADD		= $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+			  @INTLLIBS@ @LIBSUPPORT@
-			  @INTLLIBS@ @LIBSUPPORT@ @libs_xauth@
 
 first_static_SOURCES	= $(first_SOURCES)
 first_static_LDADD	= $(first_LDADD)
 first_static_LDFLAGS	= -static
 
-second_SOURCES		= second.c
+first_linux_SOURCES	= $(first_SOURCES)
-second_LDADD		= $(top_builddir)/lib/libgtop.la \
+first_linux_LDADD	= $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-			  @INTLLIBS@ @LIBSUPPORT@ @libs_xauth@
+			  @INTLLIBS@ @LIBSUPPORT@
+first_linux_LDFLAGS	= -static
+
+second_SOURCES		= second.c
+second_LDADD		= $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/lib/libgtop.la \
+			  @INTLLIBS@ @LIBSUPPORT@
 
 second_static_SOURCES	= $(second_SOURCES)
 second_static_LDADD	= $(second_LDADD)
 second_static_LDFLAGS	= -static
 
+second_linux_SOURCES	= $(second_SOURCES)
+second_linux_LDADD	= $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+			  @INTLLIBS@ @LIBSUPPORT@
+second_linux_LDFLAGS	= -static
+
 if GLIBTOP_NAMES
 third_guile_names_LIBS	= $(top_builddir)/sysdeps/guile/names/libgtop_guile_names.la
 third_names_LIBS	= $(top_builddir)/sysdeps/names/libgtop_names.la
@@ -43,11 +54,18 @@ endif
 third_SOURCES		= third.c
 third_LDADD		= $(top_builddir)/sysdeps/guile/libgtop_guile.la \
 			  $(third_guile_names_LIBS) $(third_names_LIBS) \
-			  $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+			  $(top_builddir)/lib/libgtop.la \
-			  @GUILE_LIBS@ @INTLLIBS@ @LIBSUPPORT@ @libs_xauth@
+			  @GUILE_LIBS@ @INTLLIBS@ @LIBSUPPORT@
 
 third_static_SOURCES	= $(third_SOURCES)
 third_static_LDADD	= $(third_LDADD)
 third_static_LDFLAGS	= -static
+
+third_linux_SOURCES	= $(third_SOURCES)
+third_linux_LDADD	= $(top_builddir)/sysdeps/guile/libgtop_guile.la \
+			  $(third_guile_names_LIBS) $(third_names_LIBS) \
+			  $(top_builddir)/sysdeps/common/libgtop_common.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+			  @GUILE_LIBS@ @INTLLIBS@ @LIBSUPPORT@
+third_linux_LDFLAGS	= -static

examples/first.c

@@ -26,138 +26,105 @@
 #include <glibtop/close.h>
 #include <glibtop/xmalloc.h>
 
-#include <glibtop/parameter.h>
-
 #include <glibtop/union.h>
 #include <glibtop/sysdeps.h>
 
-#ifndef PROFILE_COUNT
-#define PROFILE_COUNT	1
-#endif
-
 int
 main (int argc, char *argv [])
 {
 	glibtop_union data;
 	glibtop_sysdeps sysdeps;
-	unsigned c, method, count, port, i, *ptr;
+	unsigned i, *ptr;
-	char buffer [BUFSIZ];
 	pid_t pid, ppid;
 
-	count = PROFILE_COUNT;
-
 	setlocale (LC_ALL, "");
 	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
 	textdomain (PACKAGE);
 	
-	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
+	glibtop_init__r (&glibtop_global_server);
 
-	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
+	glibtop_get_cpu (&data.cpu);
 
-	printf ("Method = %d\n", method);
+	fprintf (stderr, "CPU          (0x%08lx): %lu, %lu, %lu, %lu, %lu, %lu\n",
+		 data.cpu.flags, data.cpu.total, data.cpu.user, data.cpu.nice,
+		 data.cpu.sys, data.cpu.idle, data.cpu.frequency);
 
-	count = glibtop_get_parameter (GLIBTOP_PARAM_COMMAND, buffer, BUFSIZ);
+	glibtop_get_mem (&data.mem);
-	buffer [count] = 0;
 
-	printf ("Command = '%s'\n", buffer);
+	fprintf (stderr, "Memory       (0x%08lx): %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu\n",
+		 data.mem.flags, data.mem.total, data.mem.used, data.mem.free,
+		 data.mem.shared, data.mem.buffer, data.mem.cached,
+		 data.mem.user, data.mem.locked);
 
-	count = glibtop_get_parameter (GLIBTOP_PARAM_HOST, buffer, BUFSIZ);
+	glibtop_get_swap (&data.swap);
-	buffer [count] = 0;
 
-	glibtop_get_parameter (GLIBTOP_PARAM_PORT, &port, sizeof (port));
+	fprintf (stderr, "Swap         (0x%08lx): %lu, %lu, %lu\n", data.swap.flags,
+		 data.swap.total, data.swap.used, data.swap.free);
 
-	printf ("Host = '%s' - %u\n\n", buffer, port);
+	glibtop_get_uptime (&data.uptime);
 
-	for (c = 0; c < count; c++)
+	fprintf (stderr, "Uptime       (0x%08lx): %f, %f\n", data.uptime.flags,
-	  	glibtop_get_cpu (&data.cpu);
+		 data.uptime.uptime, data.uptime.idletime);
 
-	printf ("CPU          (0x%08lx): %lu, %lu, %lu, %lu, %lu, %lu\n",
+	glibtop_get_loadavg (&data.loadavg);
-		data.cpu.flags, data.cpu.total, data.cpu.user, data.cpu.nice,
-		data.cpu.sys, data.cpu.idle, data.cpu.frequency);
 
-	for (c = 0; c < count; c++)
+	fprintf (stderr, "Loadavg      (0x%08lx): %f, %f, %f\n", data.loadavg.flags,
-		glibtop_get_mem (&data.mem);
+		 data.loadavg.loadavg [0], data.loadavg.loadavg [1],
+		 data.loadavg.loadavg [2]);
 
-	printf ("Memory       (0x%08lx): %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu\n",
+	glibtop_get_shm_limits (&data.shm_limits);
-		data.mem.flags, data.mem.total, data.mem.used, data.mem.free,
-		data.mem.shared, data.mem.buffer, data.mem.cached,
-		data.mem.user, data.mem.locked);
 	
-	for (c = 0; c < count; c++)
+	fprintf (stderr, "Shm Limits   (0x%08lx): %ld, %ld, %ld, %ld, %ld\n",
-		glibtop_get_swap (&data.swap);
+		 data.shm_limits.flags, data.shm_limits.shmmax,
+		 data.shm_limits.shmmin, data.shm_limits.shmmni,
+		 data.shm_limits.shmseg, data.shm_limits.shmall);
 
-	printf ("Swap         (0x%08lx): %lu, %lu, %lu\n", data.swap.flags,
+	glibtop_get_msg_limits (&data.msg_limits);
-		data.swap.total, data.swap.used, data.swap.free);
 
-	for (c = 0; c < count; c++)
+	fprintf (stderr, "Msg Limits   (0x%08lx): %ld, %ld, %ld, %ld, %ld, %ld, %ld\n",
-		glibtop_get_uptime (&data.uptime);
+		 data.msg_limits.flags, data.msg_limits.msgpool,
+		 data.msg_limits.msgmap, data.msg_limits.msgmax,
+		 data.msg_limits.msgmnb, data.msg_limits.msgmni,
+		 data.msg_limits.msgssz, data.msg_limits.msgtql);
 
-	printf ("Uptime       (0x%08lx): %f, %f\n", data.uptime.flags,
+	glibtop_get_sem_limits (&data.sem_limits);
-		data.uptime.uptime, data.uptime.idletime);
 	
-	for (c = 0; c < count; c++)
+	fprintf (stderr, "Sem Limits   (0x%08lx): "
-		glibtop_get_loadavg (&data.loadavg);
+		 "%ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld\n",
+		 data.sem_limits.flags, data.sem_limits.semmap,
+		 data.sem_limits.semmni, data.sem_limits.semmns,
+		 data.sem_limits.semmnu, data.sem_limits.semmsl,
+		 data.sem_limits.semopm, data.sem_limits.semume,
+		 data.sem_limits.semusz, data.sem_limits.semvmx,
+		 data.sem_limits.semaem);
 
-	printf ("Loadavg      (0x%08lx): %f, %f, %f\n", data.loadavg.flags,
+	fprintf (stderr, "\n");
-		data.loadavg.loadavg [0], data.loadavg.loadavg [1],
-		data.loadavg.loadavg [2]);
-
-	for (c = 0; c < count; c++)
-		glibtop_get_shm_limits (&data.shm_limits);
-	
-	printf ("Shm Limits   (0x%08lx): %ld, %ld, %ld, %ld, %ld\n",
-		data.shm_limits.flags, data.shm_limits.shmmax,
-		data.shm_limits.shmmin, data.shm_limits.shmmni,
-		data.shm_limits.shmseg, data.shm_limits.shmall);
-
-	for (c = 0; c < count; c++)
-		glibtop_get_msg_limits (&data.msg_limits);
-
-	printf ("Msg Limits   (0x%08lx): %ld, %ld, %ld, %ld, %ld, %ld, %ld\n",
-		data.msg_limits.flags, data.msg_limits.msgpool,
-		data.msg_limits.msgmap, data.msg_limits.msgmax,
-		data.msg_limits.msgmnb, data.msg_limits.msgmni,
-		data.msg_limits.msgssz, data.msg_limits.msgtql);
-
-	for (c = 0; c < count; c++)
-		glibtop_get_sem_limits (&data.sem_limits);
-	
-	printf ("Sem Limits   (0x%08lx): "
-		"%ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld\n",
-		data.sem_limits.flags, data.sem_limits.semmap,
-		data.sem_limits.semmni, data.sem_limits.semmns,
-		data.sem_limits.semmnu, data.sem_limits.semmsl,
-		data.sem_limits.semopm, data.sem_limits.semume,
-		data.sem_limits.semusz, data.sem_limits.semvmx,
-		data.sem_limits.semaem);
-
-	printf ("\n");
 
 	glibtop_get_sysdeps (&sysdeps);
 
-	printf ("Sysdeps      (0x%08lx): %lu, %lu, %lu, %lu, %lu, "
+	fprintf (stderr, "Sysdeps      (0x%08lx): %lu, %lu, %lu, %lu, %lu, "
-		"%lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu\n",
+		 "%lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu\n",
-		sysdeps.flags, sysdeps.cpu, sysdeps.mem, sysdeps.swap,
+		 sysdeps.flags, sysdeps.cpu, sysdeps.mem, sysdeps.swap,
-		sysdeps.uptime, sysdeps.loadavg, sysdeps.shm_limits,
+		 sysdeps.uptime, sysdeps.loadavg, sysdeps.shm_limits,
-		sysdeps.msg_limits, sysdeps.sem_limits,
+		 sysdeps.msg_limits, sysdeps.sem_limits,
-		sysdeps.proclist, sysdeps.proc_state,
+		 sysdeps.proclist, sysdeps.proc_state,
-		sysdeps.proc_uid, sysdeps.proc_mem,
+		 sysdeps.proc_uid, sysdeps.proc_mem,
-		sysdeps.proc_time, sysdeps.proc_signal,
+		 sysdeps.proc_time, sysdeps.proc_signal,
-		sysdeps.proc_kernel, sysdeps.proc_segment);
+		 sysdeps.proc_kernel, sysdeps.proc_segment);
 
-	printf ("\n");
+	fprintf (stderr, "\n");
 	
 	ptr = glibtop_get_proclist (&data.proclist);
 
-	printf ("Proclist     (0x%08lx): %ld, %ld, %ld\n",
+	fprintf (stderr, "Proclist     (0x%08lx): %ld, %ld, %ld\n",
-		data.proclist.flags, data.proclist.number,
+		 data.proclist.flags, data.proclist.number,
-		data.proclist.size, data.proclist.total);
+		 data.proclist.size, data.proclist.total);
 
 	if (ptr) {
-		printf ("\nProcess: ");
+		fprintf (stderr, "\nProcess: ");
 		for (i = 0; i < data.proclist.number; i++)
-			printf ("%s%u", i ? ", " : "", ptr [i]);
+			fprintf (stderr, "%s%u", i ? ", " : "", ptr [i]);
-		printf ("\n");
+		fprintf (stderr, "\n");
 	}
 
 	glibtop_free (ptr);
@@ -165,218 +132,197 @@ main (int argc, char *argv [])
 	pid = getpid ();
 	ppid = getppid ();
 
-	printf ("\n");
+	fprintf (stderr, "\n");
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_state (&data.proc_state, pid);
-		glibtop_get_proc_state (&data.proc_state, pid);
 
-	printf ("Proc_State   PID  %5u (0x%08lx): '%s', %c, %u, %u\n",
+	fprintf (stderr, "Proc_State   PID  %5u (0x%08lx): '%s', %c, %u, %u\n",
-		pid, data.proc_state.flags, data.proc_state.cmd,
+		 pid, data.proc_state.flags, data.proc_state.cmd,
-		data.proc_state.state, data.proc_state.uid,
+		 data.proc_state.state, data.proc_state.uid,
-		data.proc_state.gid);
+		 data.proc_state.gid);
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_uid (&data.proc_uid, pid);
-		glibtop_get_proc_uid (&data.proc_uid, pid);
 
-	printf ("Proc_Uid     PID  %5u (0x%08lx): "
+	fprintf (stderr, "Proc_Uid     PID  %5u (0x%08lx): "
-		"%d %d %d %d %d %d %d %d %d %d %d %d\n",
+		 "%d %d %d %d %d %d %d %d %d %d %d %d\n",
-		pid, data.proc_uid.flags, data.proc_uid.uid,
+		 pid, data.proc_uid.flags, data.proc_uid.uid,
-		data.proc_uid.euid, data.proc_uid.gid,
+		 data.proc_uid.euid, data.proc_uid.gid,
-		data.proc_uid.egid, data.proc_uid.pid,
+		 data.proc_uid.egid, data.proc_uid.pid,
-		data.proc_uid.ppid, data.proc_uid.pgrp,
+		 data.proc_uid.ppid, data.proc_uid.pgrp,
-		data.proc_uid.session, data.proc_uid.tty,
+		 data.proc_uid.session, data.proc_uid.tty,
-		data.proc_uid.tpgid, data.proc_uid.priority,
+		 data.proc_uid.tpgid, data.proc_uid.priority,
-		data.proc_uid.nice);
+		 data.proc_uid.nice);
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_mem (&data.proc_mem, pid);
-		glibtop_get_proc_mem (&data.proc_mem, pid);
 
-	printf ("Proc_Mem     PID  %5u (0x%08lx): "
+	fprintf (stderr, "Proc_Mem     PID  %5u (0x%08lx): "
-		"%ld %ld %ld %ld %ld %ld\n", pid, data.proc_mem.flags,
+		 "%ld %ld %ld %ld %ld %ld\n", pid, data.proc_mem.flags,
-		data.proc_mem.size, data.proc_mem.vsize,
+		 data.proc_mem.size, data.proc_mem.vsize,
-		data.proc_mem.resident, data.proc_mem.share,
+		 data.proc_mem.resident, data.proc_mem.share,
-		data.proc_mem.rss, data.proc_mem.rss_rlim);
+		 data.proc_mem.rss, data.proc_mem.rss_rlim);
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_time (&data.proc_time, pid);
-		glibtop_get_proc_time (&data.proc_time, pid);
 
-	printf ("Proc_Time    PID  %5u (0x%08lx): "
+	fprintf (stderr, "Proc_Time    PID  %5u (0x%08lx): "
-		"%ld %ld %ld %ld %ld %ld %ld\n", pid, data.proc_time.flags,
+		 "%ld %ld %ld %ld %ld %ld %ld\n", pid, data.proc_time.flags,
-		data.proc_time.start_time, data.proc_time.utime,
+		 data.proc_time.start_time, data.proc_time.utime,
-		data.proc_time.stime, data.proc_time.cutime,
+		 data.proc_time.stime, data.proc_time.cutime,
-		data.proc_time.cstime, data.proc_time.timeout,
+		 data.proc_time.cstime, data.proc_time.timeout,
-		data.proc_time.it_real_value);
+		 data.proc_time.it_real_value);
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_signal (&data.proc_signal, pid);
-		glibtop_get_proc_signal (&data.proc_signal, pid);
 	
-	printf ("Proc_Signal  PID  %5u (0x%08lx): "
+	fprintf (stderr, "Proc_Signal  PID  %5u (0x%08lx): "
-		"%d %d %d %d\n", pid, data.proc_signal.flags,
+		 "%d %d %d %d\n", pid, data.proc_signal.flags,
-		data.proc_signal.signal, data.proc_signal.blocked,
+		 data.proc_signal.signal, data.proc_signal.blocked,
-		data.proc_signal.sigignore, data.proc_signal.sigcatch);
+		 data.proc_signal.sigignore, data.proc_signal.sigcatch);
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_kernel (&data.proc_kernel, pid);
-		glibtop_get_proc_kernel (&data.proc_kernel, pid);
 
-	printf ("Proc_Kernel  PID  %5u (0x%08lx): "
+	fprintf (stderr, "Proc_Kernel  PID  %5u (0x%08lx): "
-		"%lu %lu %lu %lu %lu %lu %lu %lu\n", pid,
+		 "%lu %lu %lu %lu %lu %lu %lu %lu\n", pid,
-		data.proc_kernel.flags, data.proc_kernel.k_flags,
+		 data.proc_kernel.flags, data.proc_kernel.k_flags,
-		data.proc_kernel.min_flt, data.proc_kernel.maj_flt,
+		 data.proc_kernel.min_flt, data.proc_kernel.maj_flt,
-		data.proc_kernel.cmin_flt, data.proc_kernel.cmaj_flt,
+		 data.proc_kernel.cmin_flt, data.proc_kernel.cmaj_flt,
-		data.proc_kernel.kstk_esp, data.proc_kernel.kstk_eip,
+		 data.proc_kernel.kstk_esp, data.proc_kernel.kstk_eip,
-		data.proc_kernel.wchan);
+		 data.proc_kernel.wchan);
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_segment (&data.proc_segment, pid);
-		glibtop_get_proc_segment (&data.proc_segment, pid);
 
-	printf ("Proc_Segment PID  %5u (0x%08lx): "
+	fprintf (stderr, "Proc_Segment PID  %5u (0x%08lx): "
-		"%ld %ld %ld %ld %lu %lu %lu\n", pid, data.proc_segment.flags,
+		 "%ld %ld %ld %ld %lu %lu %lu\n", pid, data.proc_segment.flags,
-		data.proc_segment.trs, data.proc_segment.lrs,
+		 data.proc_segment.trs, data.proc_segment.lrs,
-		data.proc_segment.drs, data.proc_segment.dt,
+		 data.proc_segment.drs, data.proc_segment.dt,
-		data.proc_segment.start_code, data.proc_segment.end_code,
+		 data.proc_segment.start_code, data.proc_segment.end_code,
-		data.proc_segment.start_stack);
+		 data.proc_segment.start_stack);
 
-	printf ("\n");
+	fprintf (stderr, "\n");
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_state (&data.proc_state, ppid);
-		glibtop_get_proc_state (&data.proc_state, ppid);
 
-	printf ("Proc_State   PPID %5u (0x%08lx): '%s', %c, %u, %u\n",
+	fprintf (stderr, "Proc_State   PPID %5u (0x%08lx): '%s', %c, %u, %u\n",
-		ppid, data.proc_state.flags, data.proc_state.cmd,
+		 ppid, data.proc_state.flags, data.proc_state.cmd,
-		data.proc_state.state, data.proc_state.uid,
+		 data.proc_state.state, data.proc_state.uid,
-		data.proc_state.gid);
+		 data.proc_state.gid);
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_uid (&data.proc_uid, ppid);
-		glibtop_get_proc_uid (&data.proc_uid, ppid);
 
-	printf ("Proc_Uid     PPID %5u (0x%08lx): "
+	fprintf (stderr, "Proc_Uid     PPID %5u (0x%08lx): "
-		"%d %d %d %d %d %d %d %d %d %d %d %d\n",
+		 "%d %d %d %d %d %d %d %d %d %d %d %d\n",
-		ppid, data.proc_uid.flags, data.proc_uid.uid,
+		 ppid, data.proc_uid.flags, data.proc_uid.uid,
-		data.proc_uid.euid, data.proc_uid.gid,
+		 data.proc_uid.euid, data.proc_uid.gid,
-		data.proc_uid.egid, data.proc_uid.pid,
+		 data.proc_uid.egid, data.proc_uid.pid,
-		data.proc_uid.ppid, data.proc_uid.pgrp,
+		 data.proc_uid.ppid, data.proc_uid.pgrp,
-		data.proc_uid.session, data.proc_uid.tty,
+		 data.proc_uid.session, data.proc_uid.tty,
-		data.proc_uid.tpgid, data.proc_uid.priority,
+		 data.proc_uid.tpgid, data.proc_uid.priority,
-		data.proc_uid.nice);
+		 data.proc_uid.nice);
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_mem (&data.proc_mem, ppid);
-		glibtop_get_proc_mem (&data.proc_mem, ppid);
 
-	printf ("Proc_Mem     PPID %5u (0x%08lx): "
+	fprintf (stderr, "Proc_Mem     PPID %5u (0x%08lx): "
-		"%ld %ld %ld %ld %ld %ld\n", ppid, data.proc_mem.flags,
+		 "%ld %ld %ld %ld %ld %ld\n", ppid, data.proc_mem.flags,
-		data.proc_mem.size, data.proc_mem.vsize,
+		 data.proc_mem.size, data.proc_mem.vsize,
-		data.proc_mem.resident, data.proc_mem.share,
+		 data.proc_mem.resident, data.proc_mem.share,
-		data.proc_mem.rss, data.proc_mem.rss_rlim);
+		 data.proc_mem.rss, data.proc_mem.rss_rlim);
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_time (&data.proc_time, ppid);
-		glibtop_get_proc_time (&data.proc_time, ppid);
 
-	printf ("Proc_Time    PPID %5u (0x%08lx): "
+	fprintf (stderr, "Proc_Time    PPID %5u (0x%08lx): "
-		"%ld %ld %ld %ld %ld %ld %ld\n", ppid, data.proc_time.flags,
+		 "%ld %ld %ld %ld %ld %ld %ld\n", ppid, data.proc_time.flags,
-		data.proc_time.start_time, data.proc_time.utime,
+		 data.proc_time.start_time, data.proc_time.utime,
-		data.proc_time.stime, data.proc_time.cutime,
+		 data.proc_time.stime, data.proc_time.cutime,
-		data.proc_time.cstime, data.proc_time.timeout,
+		 data.proc_time.cstime, data.proc_time.timeout,
-		data.proc_time.it_real_value);
+		 data.proc_time.it_real_value);
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_signal (&data.proc_signal, ppid);
-		glibtop_get_proc_signal (&data.proc_signal, ppid);
 
-	printf ("Proc_Signal  PPID %5u (0x%08lx): "
+	fprintf (stderr, "Proc_Signal  PPID %5u (0x%08lx): "
-		"%d %d %d %d\n", ppid, data.proc_signal.flags,
+		 "%d %d %d %d\n", ppid, data.proc_signal.flags,
-		data.proc_signal.signal, data.proc_signal.blocked,
+		 data.proc_signal.signal, data.proc_signal.blocked,
-		data.proc_signal.sigignore, data.proc_signal.sigcatch);
+		 data.proc_signal.sigignore, data.proc_signal.sigcatch);
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_kernel (&data.proc_kernel, ppid);
-		glibtop_get_proc_kernel (&data.proc_kernel, ppid);
 
-	printf ("Proc_Kernel  PPID %5u (0x%08lx): "
+	fprintf (stderr, "Proc_Kernel  PPID %5u (0x%08lx): "
-		"%lu %lu %lu %lu %lu %lu %lu %lu\n", ppid,
+		 "%lu %lu %lu %lu %lu %lu %lu %lu\n", ppid,
-		data.proc_kernel.flags, data.proc_kernel.k_flags,
+		 data.proc_kernel.flags, data.proc_kernel.k_flags,
-		data.proc_kernel.min_flt, data.proc_kernel.maj_flt,
+		 data.proc_kernel.min_flt, data.proc_kernel.maj_flt,
-		data.proc_kernel.cmin_flt, data.proc_kernel.cmaj_flt,
+		 data.proc_kernel.cmin_flt, data.proc_kernel.cmaj_flt,
-		data.proc_kernel.kstk_esp, data.proc_kernel.kstk_eip,
+		 data.proc_kernel.kstk_esp, data.proc_kernel.kstk_eip,
-		data.proc_kernel.wchan);
+		 data.proc_kernel.wchan);
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_segment (&data.proc_segment, ppid);
-		glibtop_get_proc_segment (&data.proc_segment, ppid);
 
-	printf ("Proc_Segment PPID %5u (0x%08lx): "
+	fprintf (stderr, "Proc_Segment PPID %5u (0x%08lx): "
-		"%ld %ld %ld %ld %lu %lu %lu\n", ppid, data.proc_segment.flags,
+		 "%ld %ld %ld %ld %lu %lu %lu\n", ppid, data.proc_segment.flags,
-		data.proc_segment.trs, data.proc_segment.lrs,
+		 data.proc_segment.trs, data.proc_segment.lrs,
-		data.proc_segment.drs, data.proc_segment.dt,
+		 data.proc_segment.drs, data.proc_segment.dt,
-		data.proc_segment.start_code, data.proc_segment.end_code,
+		 data.proc_segment.start_code, data.proc_segment.end_code,
-		data.proc_segment.start_stack);
+		 data.proc_segment.start_stack);
 
-	printf ("\n");
+	fprintf (stderr, "\n");
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_state (&data.proc_state, 1);
-		glibtop_get_proc_state (&data.proc_state, 1);
 
-	printf ("Proc_State   INIT %5u (0x%08lx): '%s', %c, %u, %u\n",
+	fprintf (stderr, "Proc_State   INIT %5u (0x%08lx): '%s', %c, %u, %u\n",
-		1, data.proc_state.flags, data.proc_state.cmd,
+		 1, data.proc_state.flags, data.proc_state.cmd,
-		data.proc_state.state, data.proc_state.uid,
+		 data.proc_state.state, data.proc_state.uid,
-		data.proc_state.gid);
+		 data.proc_state.gid);
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_uid (&data.proc_uid, 1);
-		glibtop_get_proc_uid (&data.proc_uid, 1);
 
-	printf ("Proc_Uid     INIT %5u (0x%08lx): "
+	fprintf (stderr, "Proc_Uid     INIT %5u (0x%08lx): "
-		"%d %d %d %d %d %d %d %d %d %d %d %d\n",
+		 "%d %d %d %d %d %d %d %d %d %d %d %d\n",
-		1, data.proc_uid.flags, data.proc_uid.uid,
+		 1, data.proc_uid.flags, data.proc_uid.uid,
-		data.proc_uid.euid, data.proc_uid.gid,
+		 data.proc_uid.euid, data.proc_uid.gid,
-		data.proc_uid.egid, data.proc_uid.pid,
+		 data.proc_uid.egid, data.proc_uid.pid,
-		data.proc_uid.ppid, data.proc_uid.pgrp,
+		 data.proc_uid.ppid, data.proc_uid.pgrp,
-		data.proc_uid.session, data.proc_uid.tty,
+		 data.proc_uid.session, data.proc_uid.tty,
-		data.proc_uid.tpgid, data.proc_uid.priority,
+		 data.proc_uid.tpgid, data.proc_uid.priority,
-		data.proc_uid.nice);
+		 data.proc_uid.nice);
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_mem (&data.proc_mem, 1);
-		glibtop_get_proc_mem (&data.proc_mem, 1);
 
-	printf ("Proc_Mem     INIT %5u (0x%08lx): "
+	fprintf (stderr, "Proc_Mem     INIT %5u (0x%08lx): "
-		"%ld %ld %ld %ld %ld %ld\n", 1, data.proc_mem.flags,
+		 "%ld %ld %ld %ld %ld %ld\n", 1, data.proc_mem.flags,
-		data.proc_mem.size, data.proc_mem.vsize,
+		 data.proc_mem.size, data.proc_mem.vsize,
-		data.proc_mem.resident, data.proc_mem.share,
+		 data.proc_mem.resident, data.proc_mem.share,
-		data.proc_mem.rss, data.proc_mem.rss_rlim);
+		 data.proc_mem.rss, data.proc_mem.rss_rlim);
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_time (&data.proc_time, 1);
-		glibtop_get_proc_time (&data.proc_time, 1);
 
-	printf ("Proc_Time    INIT %5u (0x%08lx): "
+	fprintf (stderr, "Proc_Time    INIT %5u (0x%08lx): "
-		"%ld %ld %ld %ld %ld %ld %ld\n", 1, data.proc_time.flags,
+		 "%ld %ld %ld %ld %ld %ld %ld\n", 1, data.proc_time.flags,
-		data.proc_time.start_time, data.proc_time.utime,
+		 data.proc_time.start_time, data.proc_time.utime,
-		data.proc_time.stime, data.proc_time.cutime,
+		 data.proc_time.stime, data.proc_time.cutime,
-		data.proc_time.cstime, data.proc_time.timeout,
+		 data.proc_time.cstime, data.proc_time.timeout,
-		data.proc_time.it_real_value);
+		 data.proc_time.it_real_value);
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_signal (&data.proc_signal, 1);
-		glibtop_get_proc_signal (&data.proc_signal, 1);
 
-	printf ("Proc_Signal  INIT %5u (0x%08lx): "
+	fprintf (stderr, "Proc_Signal  INIT %5u (0x%08lx): "
-		"%d %d %d %d\n", 1, data.proc_signal.flags,
+		 "%d %d %d %d\n", 1, data.proc_signal.flags,
-		data.proc_signal.signal, data.proc_signal.blocked,
+		 data.proc_signal.signal, data.proc_signal.blocked,
-		data.proc_signal.sigignore, data.proc_signal.sigcatch);
+		 data.proc_signal.sigignore, data.proc_signal.sigcatch);
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_kernel (&data.proc_kernel, 1);
-		glibtop_get_proc_kernel (&data.proc_kernel, 1);
 
-	printf ("Proc_Kernel  INIT %5u (0x%08lx): "
+	fprintf (stderr, "Proc_Kernel  INIT %5u (0x%08lx): "
-		"%lu %lu %lu %lu %lu %lu %lu %lu\n", 1,
+		 "%lu %lu %lu %lu %lu %lu %lu %lu\n", 1,
-		data.proc_kernel.flags, data.proc_kernel.k_flags,
+		 data.proc_kernel.flags, data.proc_kernel.k_flags,
-		data.proc_kernel.min_flt, data.proc_kernel.maj_flt,
+		 data.proc_kernel.min_flt, data.proc_kernel.maj_flt,
-		data.proc_kernel.cmin_flt, data.proc_kernel.cmaj_flt,
+		 data.proc_kernel.cmin_flt, data.proc_kernel.cmaj_flt,
-		data.proc_kernel.kstk_esp, data.proc_kernel.kstk_eip,
+		 data.proc_kernel.kstk_esp, data.proc_kernel.kstk_eip,
-		data.proc_kernel.wchan);
+		 data.proc_kernel.wchan);
 
-	for (c = 0; c < count; c++)
+	glibtop_get_proc_segment (&data.proc_segment, 1);
-		glibtop_get_proc_segment (&data.proc_segment, 1);
 
-	printf ("Proc_Segment INIT %5u (0x%08lx): "
+	fprintf (stderr, "Proc_Segment INIT %5u (0x%08lx): "
-		"%ld %ld %ld %ld %lu %lu %lu\n", 1, data.proc_segment.flags,
+		 "%ld %ld %ld %ld %lu %lu %lu\n", 1, data.proc_segment.flags,
-		data.proc_segment.trs, data.proc_segment.lrs,
+		 data.proc_segment.trs, data.proc_segment.lrs,
-		data.proc_segment.drs, data.proc_segment.dt,
+		 data.proc_segment.drs, data.proc_segment.dt,
-		data.proc_segment.start_code, data.proc_segment.end_code,
+		 data.proc_segment.start_code, data.proc_segment.end_code,
-		data.proc_segment.start_stack);
+		 data.proc_segment.start_stack);
 
 	exit (0);
 }

examples/second.c

@@ -41,7 +41,7 @@ main (int argc, char *argv [])
 	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
 	textdomain (PACKAGE);
 	
-	glibtop_init ();
+	glibtop_init__r (&glibtop_global_server);
 
 	glibtop_get_sysdeps (&sysdeps);
 

examples/test.scm

@@ -1,80 +0,0 @@
-(display (glibtop-names-sysdeps)) (newline)
-(display (glibtop-labels-sysdeps)) (newline)
-(display (glibtop-descriptions-sysdeps)) (newline)
-(display (glibtop-types-sysdeps)) (newline)
-
-(newline)
-
-(display (glibtop-names-cpu)) (newline)
-(display (glibtop-names-mem)) (newline)
-(display (glibtop-names-swap)) (newline)
-(display (glibtop-names-uptime)) (newline)
-(display (glibtop-names-loadavg)) (newline)
-(display (glibtop-names-shm_limits)) (newline)
-(display (glibtop-names-msg_limits)) (newline)
-(display (glibtop-names-sem_limits)) (newline)
-(display (glibtop-names-proclist)) (newline)
-(display (glibtop-names-proc_state)) (newline)
-(display (glibtop-names-proc_uid)) (newline)
-(display (glibtop-names-proc_mem)) (newline)
-(display (glibtop-names-proc_time)) (newline)
-(display (glibtop-names-proc_signal)) (newline)
-(display (glibtop-names-proc_kernel)) (newline)
-(display (glibtop-names-proc_segment)) (newline)
-
-(newline)
-
-(display (glibtop-labels-cpu)) (newline)
-(display (glibtop-labels-mem)) (newline)
-(display (glibtop-labels-swap)) (newline)
-(display (glibtop-labels-uptime)) (newline)
-(display (glibtop-labels-loadavg)) (newline)
-(display (glibtop-labels-shm_limits)) (newline)
-(display (glibtop-labels-msg_limits)) (newline)
-(display (glibtop-labels-sem_limits)) (newline)
-(display (glibtop-labels-proclist)) (newline)
-(display (glibtop-labels-proc_state)) (newline)
-(display (glibtop-labels-proc_uid)) (newline)
-(display (glibtop-labels-proc_mem)) (newline)
-(display (glibtop-labels-proc_time)) (newline)
-(display (glibtop-labels-proc_signal)) (newline)
-(display (glibtop-labels-proc_kernel)) (newline)
-(display (glibtop-labels-proc_segment)) (newline)
-
-(newline)
-
-(display (glibtop-descriptions-cpu)) (newline)
-(display (glibtop-descriptions-mem)) (newline)
-(display (glibtop-descriptions-swap)) (newline)
-(display (glibtop-descriptions-uptime)) (newline)
-(display (glibtop-descriptions-loadavg)) (newline)
-(display (glibtop-descriptions-shm_limits)) (newline)
-(display (glibtop-descriptions-msg_limits)) (newline)
-(display (glibtop-descriptions-sem_limits)) (newline)
-(display (glibtop-descriptions-proclist)) (newline)
-(display (glibtop-descriptions-proc_state)) (newline)
-(display (glibtop-descriptions-proc_uid)) (newline)
-(display (glibtop-descriptions-proc_mem)) (newline)
-(display (glibtop-descriptions-proc_time)) (newline)
-(display (glibtop-descriptions-proc_signal)) (newline)
-(display (glibtop-descriptions-proc_kernel)) (newline)
-(display (glibtop-descriptions-proc_segment)) (newline)
-
-(newline)
-
-(display (glibtop-types-cpu)) (newline)
-(display (glibtop-types-mem)) (newline)
-(display (glibtop-types-swap)) (newline)
-(display (glibtop-types-uptime)) (newline)
-(display (glibtop-types-loadavg)) (newline)
-(display (glibtop-types-shm_limits)) (newline)
-(display (glibtop-types-msg_limits)) (newline)
-(display (glibtop-types-sem_limits)) (newline)
-(display (glibtop-types-proclist)) (newline)
-(display (glibtop-types-proc_state)) (newline)
-(display (glibtop-types-proc_uid)) (newline)
-(display (glibtop-types-proc_mem)) (newline)
-(display (glibtop-types-proc_time)) (newline)
-(display (glibtop-types-proc_signal)) (newline)
-(display (glibtop-types-proc_kernel)) (newline)
-(display (glibtop-types-proc_segment)) (newline)

features.def

@@ -1,16 +0,0 @@
-cpu		ulong(total,user,nice,sys,idle,frequency)
-mem		ulong(total,used,free,shared,buffer,cached,user,locked)
-swap		ulong(total,used,free)
-uptime		double(uptime,idletime)
-loadavg		double(loadavg[0],loadavg[1],loadavg[2])
-shm_limits	ulong(shmmax,shmmin,shmmni,shmseg,shmall)
-msg_limits	ulong(msgpool,msgmap,msgmax,msgmnb,msgmni,msgssz,msgtql)
-sem_limits	ulong(semmap,semmni,semmns,semmnu,semmsl,semopm,semume,semusz,semvmx,semaem)
-proclist	ulong(number,size,total)
-proc_state	str(cmd):char(state):ulong(uid,gid)
-proc_uid	long(uid,euid,gid,egid,pid,ppid,pgrp,session,tty,tpgid,priority,nice)
-proc_mem	long(size,vsize,resident,share,rss,rss_rlim)
-proc_time	long(start_time,utime,stime,cutime,cstime,timeout,it_real_value)
-proc_signal	long(signal,blocked,sigignore,sigcatch)
-proc_kernel	ulong(k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt,kstk_esp,kstk_eip,wchan)
-proc_segment	long(trs,lrs,drs,dt):ulong(start_code,end_code,start_stack)

glibtop.h

@@ -24,9 +24,6 @@
 
 #include <glibtop/global.h>
 
-#include <glibtop_server.h>
-#include <glibtop/types.h>
-
 #ifdef HAVE_GLIBTOP_MACHINE_H
 #include <glibtop_machine.h>
 #endif
@@ -35,34 +32,22 @@ typedef struct _glibtop		glibtop;
 
 struct _glibtop
 {
-	unsigned flags;
+	int fd;				/* Server file descriptor */
-	unsigned method;		/* Server Method */
 #ifdef HAVE_GLIBTOP_MACHINE_H
 	glibtop_machine machine;	/* Machine dependent data */
 #endif
 	int input [2];			/* Pipe client <- server */
 	int output [2];			/* Pipe client -> server */
-	int socket;			/* Accepted connection of a socket */
 	unsigned long os_version_code;	/* Version code of the operating system */
 	const char *name;		/* Program name for error messages */
-	const char *server_command;	/* Command used to invoke server */
-	const char *server_host;	/* Host the server should run on */
-	const char *server_user;	/* Name of the user on the target host */
-	const char *server_rsh;		/* Command used to connect to the target host */
-	unsigned long features;		/* Server is required for this features */
-	unsigned long server_port;	/* Port on which daemon is listening */
 	pid_t pid;			/* PID of the server */
 };
 
 extern glibtop *glibtop_global_server;
 
-extern const unsigned long glibtop_server_features;
+#define glibtop_init()	glibtop_init__r(&glibtop_global_server);
 
-#define glibtop_init()	glibtop_init_r(&glibtop_global_server, 0, 0);
+extern glibtop *glibtop_init__r __P((glibtop **));
-
-#define glibtop_close()	glibtop_close_r(&glibtop_global_server);
-
-extern glibtop *glibtop_init_r __P((glibtop **, const unsigned long, const unsigned));
 
 #ifdef HAVE_GUILE
 

include/glibtop/Makefile.am

@@ -5,5 +5,4 @@ glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  proctime.h shm_limits.h version.h cpu.h msg_limits.h \
 			  procmem.h procuid.h swap.h write.h error.h open.h \
 			  procsegment.h read.h sysdeps.h xmalloc.h global.h \
-			  output.h procsignal.h read_data.h union.h types.h \
+			  output.h procsignal.h read_data.h union.h
-			  parameter.h

include/glibtop/close.h

@@ -26,7 +26,7 @@
 
 __BEGIN_DECLS
 
-extern void glibtop_close_r __P((glibtop *));
+extern void glibtop_close __P((glibtop *));
 
 __END_DECLS
 

include/glibtop/command.h

@@ -29,7 +29,6 @@ __BEGIN_DECLS
 
 #define GLIBTOP_CMND_QUIT		0
 #define GLIBTOP_CMND_SYSDEPS		1
-
 #define GLIBTOP_CMND_CPU		2
 #define GLIBTOP_CMND_MEM		3
 #define GLIBTOP_CMND_SWAP		4
@@ -50,36 +49,18 @@ __BEGIN_DECLS
 
 #define GLIBTOP_MAX_CMND		18
 
-#define _GLIBTOP_PARAM_SIZE		16
+typedef struct _glibtop_command	glibtop_command;
-
-typedef struct _glibtop_command		glibtop_command;
-typedef struct _glibtop_response	glibtop_response;
 
 struct _glibtop_command
 {
-	glibtop		server;
+  glibtop	server;
-	unsigned	command;
+  unsigned	command;
-	size_t		size, data_size;
+  size_t	size;
-	char		parameter [_GLIBTOP_PARAM_SIZE];
 };
 
-union _glibtop_response_union
+#define glibtop_call(p1, p2, p3, p4)	glibtop_call__r(glibtop_global_server, p1, p2, p3, p4)
-{
-	glibtop_union	data;
-	glibtop_sysdeps	sysdeps;
-};
 
-struct _glibtop_response
+extern void *glibtop_call__r __P((glibtop *, unsigned, size_t, void *, size_t, void *));
-{
-	off_t offset;
-	size_t size, data_size;
-	union _glibtop_response_union u;
-};
-
-#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, void *, size_t, void *));
-extern void *glibtop_call_s __P((glibtop *, unsigned, size_t, void *, size_t, void *));
 
 __END_DECLS
 

include/glibtop/cpu.h

@@ -49,21 +49,9 @@ struct _glibtop_cpu
 		frequency;	/* GLIBTOP_CPU_FREQUENCY	*/
 };
 
-#define glibtop_get_cpu(cpu)	glibtop_get_cpu_l(glibtop_global_server, cpu)
+#define glibtop_get_cpu(cpu)	glibtop_get_cpu__r(glibtop_global_server, cpu)
 
-#if GLIBTOP_SUID_CPU
+extern void glibtop_get_cpu__r __P((glibtop *, glibtop_cpu *));
-#define glibtop_get_cpu_r	glibtop_get_cpu_p
-#else
-#define glibtop_get_cpu_r	glibtop_get_cpu_s
-#endif
-
-extern void glibtop_get_cpu_l __P((glibtop *, glibtop_cpu *));
-
-#if GLIBTOP_SUID_CPU
-extern void glibtop_get_cpu_p __P((glibtop *, glibtop_cpu *));
-#else
-extern void glibtop_get_cpu_s __P((glibtop *, glibtop_cpu *));
-#endif
 
 #ifdef HAVE_GUILE
 
@@ -89,7 +77,7 @@ extern SCM glibtop_guile_descriptions_cpu __P((void));
 /* You need to link with -lgtop_names to get this stuff here. */
 
 extern const char *glibtop_names_cpu [];
-extern const unsigned glibtop_types_cpu [];
+extern const char *glibtop_types_cpu [];
 extern const char *glibtop_labels_cpu [];
 extern const char *glibtop_descriptions_cpu [];
 

include/glibtop/error.h

@@ -26,17 +26,9 @@
 
 __BEGIN_DECLS
 
-#define glibtop_error(p1, args...)	glibtop_error_r(glibtop_global_server , p1 , ## args)
+#define glibtop_error(p1, args...)	glibtop_error__r(glibtop_global_server , p1 , ## args)
-#define glibtop_warn(p1, args...)	glibtop_warn_r(glibtop_global_server , p1 , ## args)
 
-#define glibtop_error_io(p1, args...)	glibtop_error_io_r(glibtop_global_server , p1 , ## args)
+extern void glibtop_error__r __P((glibtop *, char *, ...));
-#define glibtop_warn_io(p1, args...)	glibtop_warn_io_r(glibtop_global_server , p1 , ## args)
-
-extern void glibtop_error_r __P((glibtop *, char *, ...));
-extern void glibtop_warn_r __P((glibtop *, char *, ...));
-
-extern void glibtop_error_io_r __P((glibtop *, char *, ...));
-extern void glibtop_warn_io_r __P((glibtop *, char *, ...));
 
 __END_DECLS
 

include/glibtop/global.h

@@ -51,22 +51,6 @@
 # define __P(protos) ()
 #endif
 
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#ifdef WITHOUT_GUILE
-#undef HAVE_GUILE
-#undef GLIBTOP_GUILE_NAMES
-#endif
-
 #ifdef HAVE_GUILE
 #include <guile/gh.h>
 #endif
@@ -83,10 +67,7 @@
 #include <stdlib.h>
 
 #include <stdarg.h>
-
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 
 #ifdef HAVE_MEMORY_H
 #include <memory.h>
@@ -94,9 +75,7 @@
 
 #include <string.h>
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/stat.h>
 #include <signal.h>
 #include <errno.h>
 

include/glibtop/gnuserv.h

@@ -1,193 +0,0 @@
-/* -*-C-*-
-
- Header file for the GNU Emacs server and client C code.
-
- This file is part of GNU Emacs.
-
- Copying is permitted under those conditions described by the GNU
- General Public License.
-
- Copyright (C) 1989 Free Software Foundation, Inc.
-
- Author: Andy Norman (ange@hplb.hpl.hp.com), based on 
-         'etc/server.c' and 'etc/emacsclient.c' from the 18.52 GNU
-         Emacs distribution.
-
- Please mail bugs and suggestions to the author at the above address.
-*/
-
-/* HISTORY 
- * 11-Nov-1990		bristor@simba	
- *    Added EOT stuff.
- */
-
-/*
- * This file incorporates new features added by Bob Weiner <weiner@mot.com>,
- * Darrell Kindred <dkindred@cmu.edu> and Arup Mukherjee <arup@cmu.edu>.
- * Please see the note at the end of the README file for details.
- *
- * (If gnuserv came bundled with your emacs, the README file is probably
- * ../etc/gnuserv.README relative to the directory containing this file)
- */
-
-#if 0
-static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup alpha !";
-#endif
-
-#define NO_SHORTNAMES
-
-#define PATCHLEVEL 2
-
-#define NO_SHORTNAMES
-/* gnuserv should not be compiled using SOCKS */
-#define DO_NOT_SOCKSIFY
-#include <glibtop.h>
-#include <glibtop/error.h>
-#undef read
-#undef write
-#undef open
-#undef close
-#undef signal
-
-/* Define the communication method between server and clients:
- *   You can have either or both kinds of sockets, but you can't mix
- *   sockets with sysv ipc
- */
-
-
-#define INTERNET_DOMAIN_SOCKETS
-// #define UNIX_DOMAIN_SOCKETS 
-// #define SYSV_IPC
-
-/*
- * Define additional authentication protocols to be used. These methods will
- * be tried before falling back to the default gnuserv protocol (based on
- * the GNU_SECURE environment variable). Currently, only MIT-MAGIC-COOKIE-1
- * is also supported.
- *
- * Comment out the next line(s) if you don't want to enable the
- * appropriate authentication protocol.
- */
-
-#if defined (HAVE_XAUTH)
-#define AUTH_MAGIC_COOKIE
-#endif /* HAVE_XAUTH */
-
-/*
- * stuff related to supporting MIT-MAGIC-COOKIE-1
- */
-
-#define MCOOKIE_SCREEN "42980"   /* screen # to use as the gnuserv cookie */
-#define MCOOKIE_NAME   "MAGIC-1" /* authentication protocol name */
-#define MCOOKIE_X_NAME "MIT-MAGIC-COOKIE-1"  /* as needed by X */
-
-
-#define DEFAUTH_NAME "GNU-SECURE"  /* name of default auth protocol */
-#define AUTH_TIMEOUT  15           /* # seconds to wait for auth data */
-#define AUTH_NAMESZ   15           /* max allows auth protocol name size */
-
-
-/*
- * Pick a default communication scheme, if none was specified.
- */
-
-#if !defined(SYSV_IPC) && !defined(UNIX_DOMAIN_SOCKETS) && !defined(INTERNET_DOMAIN_SOCKETS)
-
-#ifdef HAVE_SYSVIPC
-#define SYSV_IPC		/* SYSV systems use SYSV IPC by default */
-#endif /* HAVE_SYSVIPC */
-
-#ifdef BSD
-#define UNIX_DOMAIN_SOCKETS	/* BSD systems use Unix Domain sockets by default */
-#endif /* BSD */
-
-#endif /* No communication method pre-defined */
-
-/*
- * If you are using SYSV_IPC, you might want to make the buffer size bigger
- * since it limits the size of requests and responses. Don't make it bigger
- * than your system's max message size though (usually a couple of k) or else
- * msgsend will start failing. For sockets, using the system BUFSIZ is usually
- * what you want. 
- */
-
-# define GSERV_BUFSZ BUFSIZ
-
-
-#ifdef SYSV_IPC
-#include <sys/ipc.h>
-#include <sys/msg.h>
-
-#define send_string(s,str) \
-  if (strlen(msgp->mtext) + strlen(str) < GSERV_BUFSZ) \
-     strcat(msgp->mtext,str); \
-  else \
-  { \
-    fprintf(stderr,"%s: not enough message buffer space\n",progname); \
-     exit(1); \
-  } \
-
-#endif /* SYSV_IPC */
-
-#if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
-#include <sys/socket.h>
-#endif /* INTERNET_DOMAIN_SOCKETS || UNIX_DOMAIN_SOCKETS */
-
-#ifdef INTERNET_DOMAIN_SOCKETS
-#include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#define TABLE_SIZE 101		/* The number of entries in the hash table */
-#define HASH(host) host		/* Rather simplistic hash function */
-#define DEFAULT_PORT 21490	/* default port number to use is
-				 * DEFAULT_PORT + uid */
-#endif /* INTERNET_DOMAIN_SOCKETS */
-
-#ifdef UNIX_DOMAIN_SOCKETS
-#include <sys/un.h>
-#define HIDE_UNIX_SOCKET	/* put the unix socket in a protected dir */
-#endif /* UNIX_DOMAIN_SOCKETS */
-
-#define HOSTNAMSZ 255		/* max size of a hostname */
-#define REPLYSIZ 300		/* max size of reply from server to client */
-#undef FALSE
-#define FALSE 0
-#undef TRUE
-#define TRUE 1
-
-// extern char *optarg;
-// extern int optind;
-
-/* The casts shut Sun's compiler up and are safe in the context these
-   are actually used. */
-#define max2(x,y) (((int) (x) > (int) (y)) ? (x) : (y))
-#define min2(x,y) (((int) (x) < (int) (y)) ? (x) : (y))
-
-#ifndef _NFILE            /* rough guess at maximum number of open files */
-#define _NFILE 20
-#endif
-
-#define EOT_STR "\004"
-#define EOT_CHR '\004'
-
-/* connection types */
-#define CONN_UNIX     0
-#define CONN_INTERNET 1
-#define CONN_IPC      2
-
-/* function declarations */
-extern int glibtop_make_connection __P((const char *, int, int *));
-
-#ifdef SYSV_IPC
-void disconnect_from_ipc_server();
-#endif
-
-#if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
-// void send_string (int s, const char *msg);
-// void disconnect_from_server (int s, int echo);
-// int read_line (int s, char *dest);
-#endif
-
-#ifdef INTERNET_DOMAIN_SOCKETS
-extern long glibtop_internet_addr __P((const char *));
-#endif

include/glibtop/loadavg.h

@@ -39,21 +39,9 @@ struct _glibtop_loadavg
 	double loadavg [3];		/* GLIBTOP_LOADAVG_LOADAVG	*/
 };
 
-#define glibtop_get_loadavg(loadavg)	glibtop_get_loadavg_l(glibtop_global_server, loadavg)
+#define glibtop_get_loadavg(loadavg)	glibtop_get_loadavg__r(glibtop_global_server, loadavg)
 
-#if GLIBTOP_SUID_LOADAVG
+extern void glibtop_get_loadavg__r __P((glibtop *, glibtop_loadavg *));
-#define glibtop_get_loadavg_r		glibtop_get_loadavg_p
-#else
-#define glibtop_get_loadavg_r		glibtop_get_loadavg_s
-#endif
-
-extern void glibtop_get_loadavg_l __P((glibtop *, glibtop_loadavg *));
-
-#if GLIBTOP_SUID_LOADAVG
-extern void glibtop_get_loadavg_p __P((glibtop *, glibtop_loadavg *));
-#else
-extern void glibtop_get_loadavg_s __P((glibtop *, glibtop_loadavg *));
-#endif
 
 #ifdef HAVE_GUILE
 
@@ -79,7 +67,7 @@ extern SCM glibtop_guile_descriptions_loadavg __P((void));
 /* You need to link with -lgtop_names to get this stuff here. */
 
 extern const char *glibtop_names_loadavg [];
-extern const unsigned glibtop_types_loadavg [];
+extern const char *glibtop_types_loadavg [];
 extern const char *glibtop_labels_loadavg [];
 extern const char *glibtop_descriptions_loadavg [];
 

include/glibtop/mem.h

@@ -53,21 +53,9 @@ struct _glibtop_mem
 		locked;		/* GLIBTOP_MEM_LOCKED	*/
 };
 
-#define glibtop_get_mem(mem)	glibtop_get_mem_l(glibtop_global_server, mem)
+#define glibtop_get_mem(mem)	glibtop_get_mem__r(glibtop_global_server, mem)
 
-#if GLIBTOP_SUID_MEM
+extern void glibtop_get_mem__r __P((glibtop *, glibtop_mem *));
-#define glibtop_get_mem_r		glibtop_get_mem_p
-#else
-#define glibtop_get_mem_r		glibtop_get_mem_s
-#endif
-
-extern void glibtop_get_mem_l __P((glibtop *, glibtop_mem *));
-
-#if GLIBTOP_SUID_MEM
-extern void glibtop_get_mem_p __P((glibtop *, glibtop_mem *));
-#else
-extern void glibtop_get_mem_s __P((glibtop *, glibtop_mem *));
-#endif
 
 #ifdef HAVE_GUILE
 
@@ -93,7 +81,7 @@ extern SCM glibtop_guile_descriptions_mem __P((void));
 /* You need to link with -lgtop_names to get this stuff here. */
 
 extern const char *glibtop_names_mem [];
-extern const unsigned glibtop_types_mem [];
+extern const char *glibtop_types_mem [];
 extern const char *glibtop_labels_mem [];
 extern const char *glibtop_descriptions_mem [];
 

include/glibtop/msg_limits.h

@@ -51,21 +51,9 @@ struct _glibtop_msg_limits
 		msgtql;		/* GLIBTOP_IPC_MSGTQL	*/
 };
 
-#define glibtop_get_msg_limits(msg)	glibtop_get_msg_limits_l(glibtop_global_server, msg)
+#define glibtop_get_msg_limits(msg)	glibtop_get_msg_limits__r(glibtop_global_server, msg)
 
-#if GLIBTOP_SUID_MSG_LIMITS
+extern void glibtop_get_msg_limits__r __P((glibtop *, glibtop_msg_limits *));
-#define glibtop_get_msg_limits_r	glibtop_get_msg_limits_p
-#else
-#define glibtop_get_msg_limits_r	glibtop_get_msg_limits_s
-#endif
-
-extern void glibtop_get_msg_limits_l __P((glibtop *, glibtop_msg_limits *));
-
-#if GLIBTOP_SUID_MSG_LIMITS
-extern void glibtop_get_msg_limits_p __P((glibtop *, glibtop_msg_limits *));
-#else
-extern void glibtop_get_msg_limits_s __P((glibtop *, glibtop_msg_limits *));
-#endif
 
 #ifdef HAVE_GUILE
 
@@ -91,7 +79,7 @@ extern SCM glibtop_guile_descriptions_msg_limits __P((void));
 /* You need to link with -lgtop_names to get this stuff here. */
 
 extern const char *glibtop_names_msg_limits [];
-extern const unsigned glibtop_types_msg_limits [];
+extern const char *glibtop_types_msg_limits [];
 extern const char *glibtop_labels_msg_limits [];
 extern const char *glibtop_descriptions_msg_limits [];
 

include/glibtop/open.h

@@ -26,22 +26,7 @@
 
 __BEGIN_DECLS
 
-#define _GLIBTOP_INIT_STATE_INIT	0x10000
+extern void glibtop_open __P((glibtop *, const char *));
-#define _GLIBTOP_INIT_STATE_OPEN	0x20000
-#define _GLIBTOP_INIT_STATE_SERVER	0x40000
-
-#define GLIBTOP_INIT_NO_OPEN		1
-#define GLIBTOP_INIT_NO_INIT		2
-
-#define GLIBTOP_OPEN_NO_OVERRIDE	1
-
-#define GLIBTOP_METHOD_DIRECT		1
-#define GLIBTOP_METHOD_PIPE		2
-#define GLIBTOP_METHOD_INET		3
-
-extern void glibtop_open_l __P((glibtop *, const char *, const unsigned long, const unsigned));
-
-extern void glibtop_open_r __P((glibtop *, const char *, const unsigned long, const unsigned));
 
 __END_DECLS
 

include/glibtop/prockernel.h

@@ -60,21 +60,9 @@ struct _glibtop_proc_kernel
 				 * proc is sleeping in */
 };
 
-#define glibtop_get_proc_kernel(p1, p2)	glibtop_get_proc_kernel_l(glibtop_global_server, p1, p2)
+#define glibtop_get_proc_kernel(p1, p2)	glibtop_get_proc_kernel__r(glibtop_global_server, p1, p2)
 
-#if GLIBTOP_SUID_PROC_KERNEL
+extern void glibtop_get_proc_kernel__r __P((glibtop *, glibtop_proc_kernel *, pid_t));
-#define glibtop_get_proc_kernel_r	glibtop_get_proc_kernel_p
-#else
-#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));
-
-#if GLIBTOP_SUID_PROC_KERNEL
-extern void glibtop_get_proc_kernel_p __P((glibtop *, glibtop_proc_kernel *, pid_t));
-#else
-extern void glibtop_get_proc_kernel_s __P((glibtop *, glibtop_proc_kernel *, pid_t));
-#endif
 
 #ifdef HAVE_GUILE
 
@@ -99,8 +87,8 @@ extern SCM glibtop_guile_descriptions_proc_kernel __P((void));
 
 /* You need to link with -lgtop_names to get this stuff here. */
 
+extern const char *glibtop_types_proc_kernel [];
 extern const char *glibtop_names_proc_kernel [];
-extern const unsigned glibtop_types_proc_kernel [];
 extern const char *glibtop_labels_proc_kernel [];
 extern const char *glibtop_descriptions_proc_kernel [];
 

include/glibtop/proclist.h

@@ -43,21 +43,9 @@ struct _glibtop_proclist
 		size;			/* GLIBTOP_PROCLIST_SIZE	*/
 };
 
-#define glibtop_get_proclist(proclist)	glibtop_get_proclist_l(glibtop_global_server, proclist)
+#define glibtop_get_proclist(proclist)	glibtop_get_proclist__r(glibtop_global_server, proclist)
 
-#if GLIBTOP_SUID_PROCLIST
+extern unsigned *glibtop_get_proclist__r __P((glibtop *, glibtop_proclist *));
-#define glibtop_get_proclist_r		glibtop_get_proclist_p
-#else
-#define glibtop_get_proclist_r		glibtop_get_proclist_s
-#endif
-
-extern unsigned *glibtop_get_proclist_l __P((glibtop *, glibtop_proclist *));
-
-#if GLIBTOP_SUID_PROCLIST
-extern unsigned *glibtop_get_proclist_p __P((glibtop *, glibtop_proclist *));
-#else
-extern unsigned *glibtop_get_proclist_s __P((glibtop *, glibtop_proclist *));
-#endif
 
 #ifdef HAVE_GUILE
 
@@ -83,7 +71,7 @@ extern SCM glibtop_guile_descriptions_proclist __P((void));
 /* You need to link with -lgtop_names to get this stuff here. */
 
 extern const char *glibtop_names_proclist [];
-extern const unsigned glibtop_types_proclist [];
+extern const char *glibtop_types_proclist [];
 extern const char *glibtop_labels_proclist [];
 extern const char *glibtop_descriptions_proclist [];
 

include/glibtop/procmem.h

@@ -53,21 +53,9 @@ struct _glibtop_proc_mem
 				 * of the process; usually 2,147,483,647 */
 };
 
-#define glibtop_get_proc_mem(p1, p2)	glibtop_get_proc_mem_l(glibtop_global_server, p1, p2)
+#define glibtop_get_proc_mem(p1, p2)	glibtop_get_proc_mem__r(glibtop_global_server, p1, p2)
 
-#if GLIBTOP_SUID_PROC_MEM
+extern void glibtop_get_proc_mem__r __P((glibtop *, glibtop_proc_mem *, pid_t));
-#define glibtop_get_proc_mem_r		glibtop_get_proc_mem_p
-#else
-#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));
-
-#if GLIBTOP_SUID_PROC_MEM
-extern void glibtop_get_proc_mem_p __P((glibtop *, glibtop_proc_mem *, pid_t));
-#else
-extern void glibtop_get_proc_mem_s __P((glibtop *, glibtop_proc_mem *, pid_t));
-#endif
 
 #ifdef HAVE_GUILE
 
@@ -93,7 +81,7 @@ extern SCM glibtop_guile_descriptions_proc_mem __P((void));
 /* You need to link with -lgtop_names to get this stuff here. */
 
 extern const char *glibtop_names_proc_mem [];
-extern const unsigned glibtop_types_proc_mem [];
+extern const char *glibtop_types_proc_mem [];
 extern const char *glibtop_labels_proc_mem [];
 extern const char *glibtop_descriptions_proc_mem [];
 

include/glibtop/procsegment.h

@@ -54,21 +54,9 @@ struct _glibtop_proc_segment
 		start_stack;	/* address of the bottom of stack segment */
 };
 
-#define glibtop_get_proc_segment(p1, p2)	glibtop_get_proc_segment_l(glibtop_global_server, p1, p2)
+#define glibtop_get_proc_segment(p1, p2)	glibtop_get_proc_segment__r(glibtop_global_server, p1, p2)
 
-#if GLIBTOP_SUID_PROC_SEGMENT
+extern void glibtop_get_proc_segment__r __P((glibtop *, glibtop_proc_segment *, pid_t));
-#define glibtop_get_proc_segment_r	glibtop_get_proc_segment_p
-#else
-#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));
-
-#if GLIBTOP_SUID_PROC_SEGMENT
-extern void glibtop_get_proc_segment_p __P((glibtop *, glibtop_proc_segment *, pid_t));
-#else
-extern void glibtop_get_proc_segment_s __P((glibtop *, glibtop_proc_segment *, pid_t));
-#endif
 
 #ifdef HAVE_GUILE
 
@@ -93,8 +81,8 @@ extern SCM glibtop_guile_descriptions_proc_segment __P((void));
 
 /* You need to link with -lgtop_names to get this stuff here. */
 
+extern const char *glibtop_types_proc_segment [];
 extern const char *glibtop_names_proc_segment [];
-extern const unsigned glibtop_types_proc_segment [];
 extern const char *glibtop_labels_proc_segment [];
 extern const char *glibtop_descriptions_proc_segment [];
 

include/glibtop/procsignal.h

@@ -47,21 +47,9 @@ struct _glibtop_proc_signal
 		sigcatch;	/* mask of caught  signals */
 };
 
-#define glibtop_get_proc_signal(p1, p2)	glibtop_get_proc_signal_l(glibtop_global_server, p1, p2)
+#define glibtop_get_proc_signal(p1, p2)	glibtop_get_proc_signal__r(glibtop_global_server, p1, p2)
 
-#if GLIBTOP_SUID_PROC_SIGNAL
+extern void glibtop_get_proc_signal__r __P((glibtop *, glibtop_proc_signal *, pid_t));
-#define glibtop_get_proc_signal_r	glibtop_get_proc_signal_p
-#else
-#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));
-
-#if GLIBTOP_SUID_PROC_SIGNAL
-extern void glibtop_get_proc_signal_p __P((glibtop *, glibtop_proc_signal *, pid_t));
-#else
-extern void glibtop_get_proc_signal_s __P((glibtop *, glibtop_proc_signal *, pid_t));
-#endif
 
 #ifdef HAVE_GUILE
 
@@ -87,7 +75,7 @@ extern SCM glibtop_guile_descriptions_proc_signal __P((void));
 /* You need to link with -lgtop_names to get this stuff here. */
 
 extern const char *glibtop_names_proc_signal [];
-extern const unsigned glibtop_types_proc_signal [];
+extern const char *glibtop_types_proc_signal [];
 extern const char *glibtop_labels_proc_signal [];
 extern const char *glibtop_descriptions_proc_signal [];
 

include/glibtop/procstate.h

@@ -54,21 +54,9 @@ struct _glibtop_proc_state
 		gid;		/* GID of process */
 };
 
-#define glibtop_get_proc_state(p1, p2)	glibtop_get_proc_state_l(glibtop_global_server, p1, p2)
+#define glibtop_get_proc_state(p1, p2)	glibtop_get_proc_state__r(glibtop_global_server, p1, p2)
 
-#if GLIBTOP_SUID_PROC_STATE
+extern void glibtop_get_proc_state__r __P((glibtop *, glibtop_proc_state *, pid_t));
-#define glibtop_get_proc_state_r	glibtop_get_proc_state_p
-#else
-#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));
-
-#if GLIBTOP_SUID_PROC_STATE
-extern void glibtop_get_proc_state_p __P((glibtop *, glibtop_proc_state *, pid_t));
-#else
-extern void glibtop_get_proc_state_s __P((glibtop *, glibtop_proc_state *, pid_t));
-#endif
      
 #ifdef HAVE_GUILE
 
@@ -94,7 +82,7 @@ extern SCM glibtop_guile_descriptions_proc_state __P((void));
 /* You need to link with -lgtop_names to get this stuff here. */
 
 extern const char *glibtop_names_proc_state [];
-extern const unsigned glibtop_types_proc_state [];
+extern const char *glibtop_types_proc_state [];
 extern const char *glibtop_labels_proc_state [];
 extern const char *glibtop_descriptions_proc_state [];
 

include/glibtop/proctime.h

@@ -59,21 +59,9 @@ struct _glibtop_proc_time
 				 * due to an interval timer. */
 };
 
-#define glibtop_get_proc_time(p1, p2)	glibtop_get_proc_time_l(glibtop_global_server, p1, p2)
+#define glibtop_get_proc_time(p1, p2)	glibtop_get_proc_time__r(glibtop_global_server, p1, p2)
 
-#if GLIBTOP_SUID_PROC_TIME
+extern void glibtop_get_proc_time__r __P((glibtop *, glibtop_proc_time *, pid_t));
-#define glibtop_get_proc_time_r	glibtop_get_proc_time_p
-#else
-#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));
-
-#if GLIBTOP_SUID_PROC_TIME
-extern void glibtop_get_proc_time_p __P((glibtop *, glibtop_proc_time *, pid_t));
-#else
-extern void glibtop_get_proc_time_s __P((glibtop *, glibtop_proc_time *, pid_t));
-#endif
 
 #ifdef HAVE_GUILE
 
@@ -99,7 +87,7 @@ extern SCM glibtop_guile_descriptions_proc_time __P((void));
 /* You need to link with -lgtop_names to get this stuff here. */
 
 extern const char *glibtop_names_proc_time [];
-extern const unsigned glibtop_types_proc_time [];
+extern const char *glibtop_types_proc_time [];
 extern const char *glibtop_labels_proc_time [];
 extern const char *glibtop_descriptions_proc_time [];
 

include/glibtop/procuid.h

@@ -63,21 +63,9 @@ struct _glibtop_proc_uid
 		nice;		/* standard unix nice level of process */
 };
 
-#define glibtop_get_proc_uid(p1, p2)	glibtop_get_proc_uid_l(glibtop_global_server, p1, p2)
+#define glibtop_get_proc_uid(p1, p2)	glibtop_get_proc_uid__r(glibtop_global_server, p1, p2)
 
-#if GLIBTOP_SUID_PROC_UID
+extern void glibtop_get_proc_uid__r __P((glibtop *, glibtop_proc_uid *, pid_t));
-#define glibtop_get_proc_uid_r		glibtop_get_proc_uid_p
-#else
-#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));
-
-#if GLIBTOP_SUID_PROC_UID
-extern void glibtop_get_proc_uid_p __P((glibtop *, glibtop_proc_uid *, pid_t));
-#else
-extern void glibtop_get_proc_uid_s __P((glibtop *, glibtop_proc_uid *, pid_t));
-#endif
 
 #ifdef HAVE_GUILE
 
@@ -103,7 +91,7 @@ extern SCM glibtop_guile_descriptions_proc_uid __P((void));
 /* You need to link with -lgtop_names to get this stuff here. */
 
 extern const char *glibtop_names_proc_uid [];
-extern const unsigned glibtop_types_proc_uid [];
+extern const char *glibtop_types_proc_uid [];
 extern const char *glibtop_labels_proc_uid [];
 extern const char *glibtop_descriptions_proc_uid [];
 

include/glibtop/read.h

@@ -29,8 +29,7 @@ __BEGIN_DECLS
 
 #define glibtop_read(p1, p2)	glibtop_read(glibtop_global_server, p1, p2)
 
-extern void glibtop_read_l __P((glibtop *, size_t, void *));
+extern void glibtop_read__r __P((glibtop *, size_t, void *));
-extern void glibtop_read_s __P((glibtop *, size_t, void *));
 
 __END_DECLS
 

include/glibtop/read_data.h

@@ -27,10 +27,9 @@
 
 __BEGIN_DECLS
 
-#define glibtop_read_data()	glibtop_read_data_r(glibtop_global_server)
+#define glibtop_read_data()	glibtop_read_data__r(glibtop_global_server)
 
-extern void *glibtop_read_data_l __P((glibtop *));
+extern void *glibtop_read_data__r __P((glibtop *));
-extern void *glibtop_read_data_s __P((glibtop *));
 
 __END_DECLS
 

include/glibtop/sem_limits.h

@@ -57,21 +57,9 @@ struct _glibtop_sem_limits
 		semaem;		/* GLIBTOP_IPC_SEMAEM	*/
 };
 
-#define glibtop_get_sem_limits(sem)	glibtop_get_sem_limits_l(glibtop_global_server, sem)
+#define glibtop_get_sem_limits(sem)	glibtop_get_sem_limits__r(glibtop_global_server, sem)
 
-#if GLIBTOP_SUID_SEM_LIMITS
+extern void glibtop_get_sem_limits__r __P((glibtop *, glibtop_sem_limits *));
-#define glibtop_get_sem_limits_r	glibtop_get_sem_limits_p
-#else
-#define glibtop_get_sem_limits_r	glibtop_get_sem_limits_s
-#endif
-
-extern void glibtop_get_sem_limits_l __P((glibtop *, glibtop_sem_limits *));
-
-#if GLIBTOP_SUID_SEM_LIMITS
-extern void glibtop_get_sem_limits_p __P((glibtop *, glibtop_sem_limits *));
-#else
-extern void glibtop_get_sem_limits_s __P((glibtop *, glibtop_sem_limits *));
-#endif
 
 #ifdef HAVE_GUILE
 
@@ -97,7 +85,7 @@ extern SCM glibtop_guile_descriptions_sem_limits __P((void));
 /* You need to link with -lgtop_names to get this stuff here. */
 
 extern const char *glibtop_names_sem_limits [];
-extern const unsigned glibtop_types_sem_limits [];
+extern const char *glibtop_types_sem_limits [];
 extern const char *glibtop_labels_sem_limits [];
 extern const char *glibtop_descriptions_sem_limits [];
 

include/glibtop/shm_limits.h

@@ -47,21 +47,9 @@ struct _glibtop_shm_limits
 		shmall;		/* GLIBTOP_IPC_SHMALL	*/
 };
 
-#define glibtop_get_shm_limits(shm)	glibtop_get_shm_limits_l(glibtop_global_server, shm)
+#define glibtop_get_shm_limits(shm)	glibtop_get_shm_limits__r(glibtop_global_server, shm)
 
-#if GLIBTOP_SUID_SHM_LIMITS
+extern void glibtop_get_shm_limits__r __P((glibtop *, glibtop_shm_limits *));
-#define glibtop_get_shm_limits_r	glibtop_get_shm_limits_p
-#else
-#define glibtop_get_shm_limits_r	glibtop_get_shm_limits_s
-#endif
-
-extern void glibtop_get_shm_limits_l __P((glibtop *, glibtop_shm_limits *));
-
-#if GLIBTOP_SUID_SHM_LIMITS
-extern void glibtop_get_shm_limits_p __P((glibtop *, glibtop_shm_limits *));
-#else
-extern void glibtop_get_shm_limits_s __P((glibtop *, glibtop_shm_limits *));
-#endif
 
 #ifdef HAVE_GUILE
 
@@ -87,7 +75,7 @@ extern SCM glibtop_guile_descriptions_shm_limits __P((void));
 /* You need to link with -lgtop_names to get this stuff here. */
 
 extern const char *glibtop_names_shm_limits [];
-extern const unsigned glibtop_types_shm_limits [];
+extern const char *glibtop_types_shm_limits [];
 extern const char *glibtop_labels_shm_limits [];
 extern const char *glibtop_descriptions_shm_limits [];
 

include/glibtop/swap.h

@@ -43,21 +43,9 @@ struct _glibtop_swap
 		free;		/* GLIBTOP_SWAP_FREE	*/
 };
 
-#define glibtop_get_swap(swap)	glibtop_get_swap_l(glibtop_global_server, swap)
+#define glibtop_get_swap(swap)	glibtop_get_swap__r(glibtop_global_server, swap)
 
-#if GLIBTOP_SUID_SWAP
+extern void glibtop_get_swap__r __P((glibtop *, glibtop_swap *));
-#define glibtop_get_swap_r		glibtop_get_swap_p
-#else
-#define glibtop_get_swap_r		glibtop_get_swap_s
-#endif
-
-extern void glibtop_get_swap_l __P((glibtop *, glibtop_swap *));
-
-#if GLIBTOP_SUID_SWAP
-extern void glibtop_get_swap_p __P((glibtop *, glibtop_swap *));
-#else
-extern void glibtop_get_swap_s __P((glibtop *, glibtop_swap *));
-#endif
 
 #ifdef HAVE_GUILE
 
@@ -83,7 +71,7 @@ extern SCM glibtop_guile_descriptions_swap __P((void));
 /* You need to link with -lgtop_names to get this stuff here. */
 
 extern const char *glibtop_names_swap [];
-extern const unsigned glibtop_types_swap [];
+extern const char *glibtop_types_swap [];
 extern const char *glibtop_labels_swap [];
 extern const char *glibtop_descriptions_swap [];
 

include/glibtop/sysdeps.h

@@ -27,34 +27,30 @@
 
 __BEGIN_DECLS
 
-#define GLIBTOP_SYSDEPS_FEATURES	0
+#define GLIBTOP_SYSDEPS_CPU		0
-#define GLIBTOP_SYSDEPS_CPU		1
+#define GLIBTOP_SYSDEPS_MEM		1
-#define GLIBTOP_SYSDEPS_MEM		2
+#define GLIBTOP_SYSDEPS_SWAP		2
-#define GLIBTOP_SYSDEPS_SWAP		3
+#define GLIBTOP_SYSDEPS_UPTIME		3
-#define GLIBTOP_SYSDEPS_UPTIME		4
+#define GLIBTOP_SYSDEPS_LOADAVG		4
-#define GLIBTOP_SYSDEPS_LOADAVG		5
+#define GLIBTOP_SYSDEPS_SHM_LIMITS	5
-#define GLIBTOP_SYSDEPS_SHM_LIMITS	6
+#define GLIBTOP_SYSDEPS_MSG_LIMITS	6
-#define GLIBTOP_SYSDEPS_MSG_LIMITS	7
+#define GLIBTOP_SYSDEPS_SEM_LIMITS	7
-#define GLIBTOP_SYSDEPS_SEM_LIMITS	8
+#define GLIBTOP_SYSDEPS_PROCLIST	8
-#define GLIBTOP_SYSDEPS_PROCLIST	9
+#define GLIBTOP_SYSDEPS_PROC_STATE	9
-#define GLIBTOP_SYSDEPS_PROC_STATE	10
+#define GLIBTOP_SYSDEPS_PROC_UID	10
-#define GLIBTOP_SYSDEPS_PROC_UID	11
+#define GLIBTOP_SYSDEPS_PROC_MEM	11
-#define GLIBTOP_SYSDEPS_PROC_MEM	12
+#define GLIBTOP_SYSDEPS_PROC_TIME	12
-#define GLIBTOP_SYSDEPS_PROC_TIME	13
+#define GLIBTOP_SYSDEPS_PROC_SIGNAL	13
-#define GLIBTOP_SYSDEPS_PROC_SIGNAL	14
+#define GLIBTOP_SYSDEPS_PROC_KERNEL	14
-#define GLIBTOP_SYSDEPS_PROC_KERNEL	15
+#define GLIBTOP_SYSDEPS_PROC_SEGMENT	15
-#define GLIBTOP_SYSDEPS_PROC_SEGMENT	16
 
-#define GLIBTOP_MAX_SYSDEPS		17
+#define GLIBTOP_MAX_SYSDEPS		16
-
-#define GLIBTOP_SYSDEPS_ALL		((1 << GLIBTOP_MAX_SYSDEPS) - 1)
 
 typedef struct _glibtop_sysdeps	glibtop_sysdeps;
 
 struct _glibtop_sysdeps
 {
 	unsigned long	flags,
-		features,		/* server features	*/
 		cpu,			/* glibtop_cpu		*/
 		mem,			/* glibtop_mem		*/
 		swap,			/* glibtop_swap		*/
@@ -73,9 +69,9 @@ struct _glibtop_sysdeps
 		proc_segment;		/* glibtop_proc_segment	*/
 };
 
-#define glibtop_get_sysdeps(sysdeps)	glibtop_get_sysdeps_r(glibtop_global_server,sysdeps)
+#define glibtop_get_sysdeps(sysdeps)	glibtop_get_sysdeps__r(glibtop_global_server,sysdeps)
 
-extern void glibtop_get_sysdeps_r __P((glibtop *, glibtop_sysdeps *));
+extern void glibtop_get_sysdeps__r __P((glibtop *, glibtop_sysdeps *));
 
 #ifdef HAVE_GUILE
 
@@ -101,7 +97,7 @@ extern SCM glibtop_guile_descriptions_sysdeps __P((void));
 /* You need to link with -lgtop_names to get this stuff here. */
 
 extern const char *glibtop_names_sysdeps [];
-extern const unsigned glibtop_types_sysdeps [];
+extern const char *glibtop_types_sysdeps [];
 extern const char *glibtop_labels_sysdeps [];
 extern const char *glibtop_descriptions_sysdeps [];
 

include/glibtop/uptime.h

@@ -41,21 +41,9 @@ struct _glibtop_uptime
 		idletime;	/* GLIBTOP_UPTIME_IDLETIME	*/
 };
 
-#define glibtop_get_uptime(uptime)	glibtop_get_uptime_l(glibtop_global_server, uptime)
+#define glibtop_get_uptime(uptime)	glibtop_get_uptime__r(glibtop_global_server, uptime)
 
-#if GLIBTOP_SUID_UPTIME
+extern void glibtop_get_uptime__r __P((glibtop *, glibtop_uptime *));
-#define glibtop_get_uptime_r		glibtop_get_uptime_p
-#else
-#define glibtop_get_uptime_r		glibtop_get_uptime_s
-#endif
-
-extern void glibtop_get_uptime_l __P((glibtop *, glibtop_uptime *));
-
-#if GLIBTOP_SUID_UPTIME
-extern void glibtop_get_uptime_p __P((glibtop *, glibtop_uptime *));
-#else
-extern void glibtop_get_uptime_s __P((glibtop *, glibtop_uptime *));
-#endif
 
 #ifdef HAVE_GUILE
 
@@ -81,7 +69,7 @@ extern SCM glibtop_guile_descriptions_uptime __P((void));
 /* You need to link with -lgtop_names to get this stuff here. */
 
 extern const char *glibtop_names_uptime [];
-extern const unsigned glibtop_types_uptime [];
+extern const char *glibtop_types_uptime [];
 extern const char *glibtop_labels_uptime [];
 extern const char *glibtop_descriptions_uptime [];
 

include/glibtop/write.h

@@ -29,8 +29,7 @@ __BEGIN_DECLS
 
 #define glibtop_write(p1, p2)	glibtop_write(glibtop_global_server, p1, p2)
 
-extern void glibtop_write_l __P((glibtop *, size_t, void *));
+extern void glibtop_write__r __P((glibtop *, size_t, void *));
-extern void glibtop_write_s __P((glibtop *, size_t, void *));
 
 __END_DECLS
 

include/glibtop/xmalloc.h

@@ -27,17 +27,15 @@
 
 __BEGIN_DECLS
 
-#define glibtop_malloc(p1)	glibtop_malloc_r(glibtop_global_server, p1)
+#define glibtop_malloc(p1)	glibtop_malloc__r(glibtop_global_server, p1)
-#define glibtop_calloc(p1, p2)	glibtop_calloc_r(glibtop_global_server, p1, p2)
+#define glibtop_calloc(p1, p2)	glibtop_calloc__r(glibtop_global_server, p1, p2)
-#define glibtop_realloc(p1, p2)	glibtop_realloc_r(glibtop_global_server, p1, p2)
+#define glibtop_realloc(p1, p2)	glibtop_realloc__r(glibtop_global_server, p1, p2)
-#define glibtop_strdup(p2)	glibtop_strdup_r(glibtop_global_server, p1)
+#define glibtop_free(p1)	glibtop_free__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));
+extern void *glibtop_malloc__r	__P((glibtop *, size_t));
-extern void *glibtop_calloc_r	__P((glibtop *, size_t, size_t));
+extern void *glibtop_calloc__r	__P((glibtop *, size_t, size_t));
-extern void *glibtop_realloc_r	__P((glibtop *, void *, size_t));
+extern void *glibtop_realloc__r	__P((glibtop *, void *, size_t));
-extern char *glibtop_strdup_r	__P((glibtop *, const char *));
+extern void glibtop_free__r	__P((glibtop *, void *));
-extern void glibtop_free_r	__P((glibtop *, void *));
 
 __END_DECLS
 

kernel/ChangeLog

@@ -1,6 +0,0 @@
-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/Makefile

@@ -1,13 +0,0 @@
-#
-# Makefile for the linux system information tables.
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := table.o
-O_OBJS   := main.o
-
-include $(TOPDIR)/Rules.make

kernel/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/kernel.patch

@@ -1,49 +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,6 @@
- 	.long SYMBOL_NAME(sys_mremap)
- 	.long 0,0
- 	.long SYMBOL_NAME(sys_vm86)
--	.space (NR_syscalls-166)*4
-+	.long 0
-+	.long SYMBOL_NAME(sys_table)
-+	.space (NR_syscalls-168)*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		168
- 
- /* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
- #define _syscall0(type,name) \

kernel/main.c

@@ -1,423 +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;
-	pid_t pid;
-	int err;
-
-	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;
-	}
-
-	/* Main function dispatcher */
-
-	switch (type) {
-	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]->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;
-	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/table.h

@@ -1,154 +0,0 @@
-#ifndef _LINUX_TABLE_H
-#define _LINUX_TABLE_H
-
-#ifdef _KERNEL
-#include <linux/types.h>
-#endif
-
-#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_PROC_UID		6
-#define TABLE_PROC_MEM		7
-#define TABLE_PROC_SEGMENT	8
-#define TABLE_PROC_TIME		9
-#define TABLE_PROC_STATE	10
-#define TABLE_PROC_SIGNAL	11
-#define TABLE_PROC_KERNEL	12
-
-/* 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		*/
-};
-
-/* 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;
-};
-
-/* Information about processes. */
-
-struct table_proc_state
-{
-	long state;
-	unsigned long flags;
-	char comm[16];
-};
-
-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;
-	int size, resident, shared;
-	int trs, lrs, drs, 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 signal;
-	unsigned long blocked;	/* bitmap of masked signals */
-	unsigned long ignored;  /* mask of ignored signals */
-	unsigned long 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_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/test.c

@@ -1,85 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <unistd.h>
-#include <linux/unistd.h>
-#include <linux/table.h>
-
-#include <syscall.h>
-
-static inline _syscall3 (int, table, int, type, union table *, tbl, const void *, param);
-
-int
-main (void)
-{
-	union table tbl;
-	unsigned count;
-	int ret;
-
-	ret = table (TABLE_VERSION, NULL, NULL);
-
-	if (ret == -1) {
-		fprintf (stderr, "table(%u): %s\n", TABLE_VERSION, sys_errlist [errno]);
-		exit (-errno);
-	}
-
-	fprintf (stderr, "Table (%u) = %u\n", TABLE_VERSION, ret);
-
-	for (count = 0; count < 5; count++) {
-		ret = table (TABLE_CPU, &tbl, NULL);
-
-		if (ret == -1) {
-			fprintf (stderr, "table(%u): %s\n", TABLE_CPU, sys_errlist [errno]);
-			exit (-errno);
-		}
-
-		fprintf (stderr, "Table (%u) = %lu, %lu, %lu, %lu, %lu, %lu\n",
-			 TABLE_CPU, tbl.cpu.total, tbl.cpu.user, tbl.cpu.nice,
-			 tbl.cpu.sys, tbl.cpu.idle, tbl.cpu.frequency);
-	}
-
-	ret = table (TABLE_MEM, &tbl, NULL);
-
-	if (ret == -1) {
-		fprintf (stderr, "table(%u): %s\n", TABLE_MEM, sys_errlist [errno]);
-		exit (-errno);
-	}
-
-	fprintf (stderr, "Table (%u) = %lu, %lu, %lu, %lu, %lu, %lu\n",
-		 TABLE_MEM, tbl.mem.total, tbl.mem.used, tbl.mem.free,
-		 tbl.mem.shared, tbl.mem.buffer, tbl.mem.cached);
-
-	ret = table (TABLE_SWAP, &tbl, NULL);
-
-	if (ret == -1) {
-		fprintf (stderr, "table(%u): %s\n", TABLE_SWAP, sys_errlist [errno]);
-		exit (-errno);
-	}
-
-	fprintf (stderr, "Table (%u) = %lu, %lu, %lu\n",
-		 TABLE_SWAP, tbl.swap.total, tbl.swap.used, tbl.swap.free);
-	
-	ret = table (TABLE_LOADAVG, &tbl, NULL);
-
-	if (ret == -1) {
-		fprintf (stderr, "table(%u): %s\n", TABLE_LOADAVG, sys_errlist [errno]);
-		exit (-errno);
-	}
-
-	fprintf (stderr, "Table (%u) = (%lu, %lu, %lu) - %u, %u, %u\n",
-		 TABLE_LOADAVG, tbl.loadavg.loadavg [0], tbl.loadavg.loadavg [1],
-		 tbl.loadavg.loadavg [2], tbl.loadavg.nr_running,
-		 tbl.loadavg.nr_tasks, tbl.loadavg.last_pid);
-	
-	ret = table (TABLE_UPTIME, &tbl, NULL);
-
-	if (ret == -1) {
-		fprintf (stderr, "table(%u): %s\n", TABLE_UPTIME, sys_errlist [errno]);
-		exit (-errno);
-	}
-
-	fprintf (stderr, "Table (%u) = %lu, %lu\n",
-		 TABLE_UPTIME, tbl.uptime.uptime, tbl.uptime.idle);
-	
-	exit (0);
-}

kernel/version.h

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

lib/.cvsignore

@@ -32,4 +32,3 @@ sysinfo.lo
 uptime.lo
 write.lo
 xmalloc.lo
-lib.c

lib/Makefile.am

@@ -4,20 +4,14 @@ INCLUDES			= -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
 				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
 				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
-CFLAGS				= -Wall -W @CFLAGS@ -DGTOP_SERVER=\""@LIBGTOP_SERVER@"\" -DDEBUG
+CFLAGS				= -Wall -W @CFLAGS@ -DGTOP_SERVER=\""@LIBGTOP_SERVER@"\"
 
 lib_LTLIBRARIES			= libgtop.la
 
-libgtop_la_SOURCES		= init.c open.c close.c command.c read.c read_data.c \
+libgtop_la_SOURCES		= init.c open.c close.c read.c read_data.c \
-				  write.c lib.c parameter.c
+				  write.c command.c cpu.c mem.c swap.c uptime.c \
-
+				  loadavg.c shm_limits.c msg_limits.c \
-BUILT_SOURCES			= lib.c
+				  sem_limits.c proclist.c procstate.c procuid.c \
-
+				  proctime.c procmem.c procsignal.c prockernel.c \
-lib.c: lib.awk $(top_builddir)/config.h $(top_builddir)/features.def
+				  procsegment.c
-	$(AWK) -f $(srcdir)/lib.awk < $(top_builddir)/features.def > lib-t
-	mv lib-t lib.c
-
-EXTRA_DIST			= lib.awk
-
-CLEANFILES			= lib.c
 

lib/close.c

@@ -24,7 +24,7 @@
 /* Closes pipe to gtop server. */
 
 void
-glibtop_close_r (glibtop *server)
+glibtop_close (glibtop *server)
 {
 	kill (server->pid, SIGKILL);
 	close (server->input [0]);

lib/command.c

@@ -27,53 +27,28 @@
 #include <glibtop/xmalloc.h>
 
 void *
-glibtop_call_l (glibtop *server, unsigned command, size_t send_size, void *send_buf,
+glibtop_call__r (glibtop *server, unsigned command, size_t send_size, void *send_buf,
-		size_t recv_size, void *recv_buf)
+		 size_t recv_size, void *recv_buf)
 {
-	glibtop_command cmnd;
+	glibtop_command *cmnd;
-	glibtop_response response;
+	void *ptr;
 
-	glibtop_init_r (&server, 0, 0);
+	glibtop_init__r (&server);
 
-	memset (&cmnd, 0, sizeof (glibtop_command));
+	cmnd = glibtop_calloc__r (server, 1, sizeof (glibtop_command));
 	
-	memcpy (&cmnd.server, server, sizeof (glibtop));
+	memcpy (&cmnd->server, server, sizeof (glibtop));
 	
-	cmnd.command = command;
+	cmnd->command = command;
+	cmnd->size = send_size;
 	
-	/* If send_size is less than _GLIBTOP_PARAM_SIZE (normally 16 Bytes), we
+	glibtop_write__r (server, sizeof (glibtop_command), cmnd);
-	 * send it together with command, so we only need one system call instead
+	glibtop_write__r (server, send_size, send_buf);
-	 * of two. */
+	glibtop_read__r  (server, recv_size, recv_buf);
 	
-#ifdef DEBUG
+	ptr = glibtop_read_data__r (server);
-	//	fprintf (stderr, "COMMAND: send_size = %d; command = %d; sizeof (cmnd) = %d\n",
-	// send_size, command, sizeof (glibtop_command));
-#endif
 	
-	if (send_size <= _GLIBTOP_PARAM_SIZE) {
+	glibtop_free__r (server, cmnd);
-		memcpy (cmnd.parameter, send_buf, send_size);
-		cmnd.size = send_size;
-	} else {
-		cmnd.data_size = send_size;
-	}
 	
-	glibtop_write_l (server, sizeof (glibtop_command), &cmnd);
+	return ptr;
-	//	glibtop_write_l (server, cmnd.data_size, send_buf);
-
-	glibtop_read_l (server, sizeof (glibtop_response), &response);
-
-	fprintf (stderr, "RESPONSE: %d - %d\n", response.offset, response.data_size);
-
-	if (recv_buf)
-		memcpy (recv_buf, ((char *) &response) + response.offset, recv_size);
-
-	if (response.data_size) {
-		void *ptr = glibtop_malloc_r (server, response.data_size);
-
-		glibtop_read_l (server, response.data_size, ptr);
-
-		return ptr;
-	}
-
-	return NULL;
 }

lib/cpu.c

@@ -19,13 +19,14 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <glibtop/output.h>
+#include <glibtop/cpu.h>
+#include <glibtop/command.h>
+
+/* Provides information about cpu usage. */
 
 void
-glibtop_output (size_t size, const void *buf)
+glibtop_get_cpu__r (glibtop *server, glibtop_cpu *buf)
 {
-	if (write (1, &size, sizeof (size_t)) < 0)
+	glibtop_init__r (&server);
-		_exit (2);
+	glibtop_call__r (server, GLIBTOP_CMND_CPU, 0, NULL, sizeof (glibtop_cpu), buf);
-	if (write (1, buf, size) < 0)
-		_exit (2);
 }

lib/init.c

@@ -20,168 +20,21 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <glibtop.h>
-#include <glibtop/xmalloc.h>
+#include <glibtop/open.h>
-#include <glibtop/parameter.h>
 
-#ifndef DEFAULT_PORT
+static glibtop	_glibtop_global_server;
-#define DEFAULT_PORT 42800
+glibtop		*glibtop_global_server = NULL;
-#endif
-
-static glibtop _glibtop_global_server;
-glibtop *glibtop_global_server = &_glibtop_global_server;
-
-
-void
-_init_server (glibtop *server, const unsigned features)
-{
-	char *command, *temp;
-
-	/* Try to get server command, but don't override if already
-	 * set via glibtop_set_parameter () */
-
-	if (server->server_command == NULL) {
-		const char *temp = getenv ("LIBGTOP_SERVER") ?
-			getenv ("LIBGTOP_SERVER") : GTOP_SERVER;
-
-		server->server_command = glibtop_strdup_r (server, temp);
-	}
-
-	if (server->server_rsh == NULL) {
-		const char *temp = getenv ("LIBGTOP_RSH") ?
-			getenv ("LIBGTOP_RSH") : "/usr/bin/ssh";
-		
-		server->server_rsh = glibtop_strdup_r (server, temp);
-	}
-
-	/* Try to get server method, but don't override if already
-	 * set via  glibtop_set_parameter () */
-
-	if (server->method) return;
-
-	/* If server->command doesn't start with a colon, then it is
-	 * the full pathname of the server executable. */
-
-	if (server->server_command [0] != ':') {
-		if (features & glibtop_server_features) {
-			
-			/* We really need the server. */
-			
-			server->method = GLIBTOP_METHOD_PIPE;
-				
-		} else {
-				
-			/* Fine. No server is needed, so we call the
-			 * sysdeps functions directly. */
-			
-			server->method = GLIBTOP_METHOD_DIRECT;
-		}
-
-		return;
-	}
-
-
-	/* If the first character of 'server_command' is a colon,
-	 * the first field is the method to connect to the server. */
-	
-	/* Everything up to the next colon is the method. */
-	
-	command = glibtop_strdup_r (server, server->server_command+1);
-	temp = strstr (command, ":");
-	if (temp) *temp = 0;
-	
-	/* Dispatch method. */
-			
-	if (!strcmp (command, "direct")) {
-
-				/* Use sysdeps dir instead of connecting to server
-				 * even if using the server would be required on
-				 * the current system. */
-
-		server->method = GLIBTOP_METHOD_DIRECT;
-			
-	} else if (!strcmp (command, "inet")) {
-
-		server->method = GLIBTOP_METHOD_INET;
-
-				/* Connect to internet server. */
-
-		if (temp == NULL) {
-				/* If no value was set, we use 'localhost'. */
-			if (server->server_host == NULL)
-				server->server_host = glibtop_strdup_r
-					(server, "localhost");
-		} else {
-			char *temp2 = strstr (temp+1, ":");
-			if (temp2) *temp2 = 0;
-					
-				/* Override default. */
-			if (server->server_host)
-				glibtop_free_r (server, (char *) server->server_host);
-
-			server->server_host = glibtop_strdup_r
-				(server, temp+1);
-					
-			temp = temp2;
-		}
-			
-		if (temp == NULL) {
-				/* If no value was set, we use DEFAULT_PORT. */
-			if (server->server_port == 0)
-				server->server_port = DEFAULT_PORT;
-		} else {
-			char *temp2 = strstr (temp+1, ":");
-			if (temp2) *temp2 = 0;
-					
-			if (sscanf (temp+1, "%ld", &server->server_port) != 1)
-				server->server_port = DEFAULT_PORT;
-					
-			temp = temp2 ? temp2 + 1 : temp2;
-		}
-	} else {
-		glibtop_error_r (server, "Unknown server method '%s'",
-				 server->server_command+1);
-	}
-			
-	glibtop_free_r (server, command);
-}
 
 glibtop *
-glibtop_init_r (glibtop **server_ptr, const unsigned long features,
+glibtop_init__r (glibtop **server)
-		const unsigned flags)
 {
-	glibtop *server;
+	if (*server != NULL)
+		return *server;
 
-	if (server_ptr == NULL)
+	if (glibtop_global_server == NULL) {
-		return NULL;
+		glibtop_global_server = &_glibtop_global_server;
-
+		glibtop_open (glibtop_global_server, "glibtop");
-	if (*server_ptr == NULL)
-		*server_ptr = glibtop_global_server;
-
-	server = *server_ptr;
-
-	/* Should we do the initialization? */
-
-	if (flags & GLIBTOP_INIT_NO_INIT)
-		return server;
-
-	/* Do the initialization, but only if not already initialized. */
-
-	if ((server->flags & _GLIBTOP_INIT_STATE_INIT) == 0) {
-		_init_server (server, features);
-		
-		server->flags |= _GLIBTOP_INIT_STATE_INIT;
 	}
 	
-	/* Should we open the server? */
+	return *server = glibtop_global_server;
-
-	if (flags & GLIBTOP_INIT_NO_OPEN)
-		return server;
-
-	/* Open server, but only if not already opened. */
-	
-	if ((server->flags & _GLIBTOP_INIT_STATE_OPEN) == 0)
-		glibtop_open_l (glibtop_global_server, "glibtop",
-				features, flags);
-	
-	return server;
 }

lib/lib.awk

@@ -1,55 +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 "#include <glibtop/sysdeps.h>";
-  print "#include <glibtop/command.h>";
-
-  print "";
-
-}
-
-function output(feature) {
-  if (feature ~ /^proclist$/) {
-    print "unsigned *";
-    prefix = "return ";
-  } else {
-    prefix = "";
-    print "void";
-  }
-  if (feature ~ /^proc_/) {
-    param = ", pid_t pid";
-  } else {
-    param = "";
-  }
-
-  print "glibtop_get_"feature"_l (glibtop *server, glibtop_"feature" *buf"param")";
-  print "{";
-  print "\tglibtop_init_r (&server, GLIBTOP_SYSDEPS_"toupper(feature)", 0);";
-  print "";
-  print "\tif ((server->flags & _GLIBTOP_INIT_STATE_SERVER) &&";
-  print "\t    (server->features & GLIBTOP_SYSDEPS_"toupper(feature)"))";
-  print "\t{";
-
-  if (feature ~ /^proc_/) {
-    print "\t\t"prefix"glibtop_call_l (server, GLIBTOP_CMND_"toupper(feature)", sizeof (pid_t),";
-    print "\t\t\t\t&pid, sizeof (glibtop_"feature"), buf);";
-    print "\t} else {";
-    print "\t\t"prefix"glibtop_get_"feature"_r (server, buf, pid);";
-  } else {
-    print "\t\t"prefix"glibtop_call_l (server, GLIBTOP_CMND_"toupper(feature)", 0, NULL,";
-    print "\t\t\t  sizeof (glibtop_"feature"), buf);";
-    print "\t} else {";
-    print "\t\t"prefix"glibtop_get_"feature"_r (server, buf);";
-  }
-  print "\t}";
-  print "}";
-  print "";
-}
-
-/^(\w+)/	{ output($1) }
-
-

lib/loadavg.c

@@ -19,18 +19,15 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifndef __GLIBTOP_TYPES_H__
+#include <config.h>
-#define __GLIBTOP_TYPES_H__
+#include <glibtop/loadavg.h>
+#include <glibtop/command.h>
 
-__BEGIN_DECLS
+/* Provides load averange. */
 
-#define GLIBTOP_TYPE_LONG	1
+void
-#define GLIBTOP_TYPE_ULONG	2
+glibtop_get_loadavg__r (glibtop *server, glibtop_loadavg *buf)
-#define GLIBTOP_TYPE_DOUBLE	3
+{
-#define GLIBTOP_TYPE_INT	4
+	glibtop_init__r (&server);
-#define GLIBTOP_TYPE_CHAR	5
+	glibtop_call__r (server, GLIBTOP_CMND_LOADAVG, 0, NULL, sizeof (glibtop_loadavg), buf);
-#define GLIBTOP_TYPE_STRING	6
+}
-
-__END_DECLS
-
-#endif

lib/mem.c

@@ -19,13 +19,14 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <glibtop/version.h>
+#include <glibtop/mem.h>
+#include <glibtop/command.h>
+
+/* Provides information about memory usage. */
 
 void
-glibtop_version (void)
+glibtop_get_mem__r (glibtop *server, glibtop_mem *buf)
 {
-	char buffer [BUFSIZ];
+	glibtop_init__r (&server);
-	
+	glibtop_call__r (server, GLIBTOP_CMND_MEM, 0, NULL, sizeof (glibtop_mem), buf);
-	sprintf (buffer, "%s server %s ready.\n", PACKAGE, VERSION);
-	glibtop_output (strlen (buffer), buffer);
 }

lib/msg_limits.c

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

lib/open.c

@@ -19,50 +19,42 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <glibtop.h>
 #include <glibtop/open.h>
-#include <glibtop/sysdeps.h>
-#include <glibtop/command.h>
-#include <glibtop/xmalloc.h>
-
-#include <glibtop/gnuserv.h>
 
 /* Opens pipe to gtop server. Returns 0 on success and -1 on error. */
 
 void
-glibtop_open_l (glibtop *server, const char *program_name,
+glibtop_open (glibtop *server, const char *program_name)
-		const unsigned long features, const unsigned flags)
 {
+	char	version [BUFSIZ], buffer [BUFSIZ];
+
+	memset (server, 0, sizeof (glibtop));
+
 	server->name = program_name;
 
-	/* It is important to set _GLIBTOP_INIT_STATE_OPEN here when we
+	if (pipe (server->input) || pipe (server->output))
-	 * do recursive calls to glibtop_init_r (). */
+		glibtop_error__r (server, _("cannot make a pipe: %s\n"), strerror (errno));
 
-	server->flags |= _GLIBTOP_INIT_STATE_OPEN;
+	server->pid  = fork ();
 
-	if (server->method == GLIBTOP_METHOD_INET) {
+	if (server->pid < 0) {
-		int connect_type;
+		glibtop_error__r (server, _("%s: fork failed: %s\n"), strerror (errno));
-
+	} else if (server->pid == 0) {
-		fprintf (stderr, "Connecting to '%s' port %d.\n",
+		close (0); close (1); /* close (2); */
-			 server->server_host, server->server_port);
+		close (server->input [0]); close (server->output [1]);
-		
+		dup2 (server->input [1], 1); /* dup2 (server->input [1], 2); */
-		connect_type = glibtop_make_connection
+		dup2 (server->output [0], 0);
-			(server->server_host, server->server_port,
+		execl (GTOP_SERVER, NULL);
-			 &server->socket);
+		_exit (2);
-		
-		server->features = -1;
-
-		return;
 	}
 
-	/* If the server has been started, ask it for its features. */
+	close (server->input [1]);
+	close (server->output [0]);
 
-	if (server->flags & _GLIBTOP_INIT_STATE_SERVER) {
+	sprintf (version, "%s server %s ready.\n", PACKAGE, VERSION);
-		glibtop_sysdeps sysdeps;
 
-		glibtop_call_l (server, GLIBTOP_CMND_SYSDEPS, 0, NULL,
+	glibtop_read__r (server, strlen (version), buffer);
-				sizeof (glibtop_sysdeps), &sysdeps);
 
-		server->features = sysdeps.features;
+	if (memcmp (version, buffer, strlen (version)))
-	}
+		glibtop_error__r (server, _("server version is not %s"), VERSION);
 }

lib/parameter.c

@@ -1,62 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/parameter.h>
-
-#define _write_data(ptr,size)	\
-	if ((data_ptr == NULL) || (data_size < size)) return -size; \
-	if (ptr == NULL) { strcpy (data_ptr, ""); return 1; } \
-	memcpy (data_ptr, ptr, size);	\
-	return size;
-
-#define _strlen(ptr)	(ptr ? strlen (ptr) : 0)
-
-size_t
-glibtop_get_parameter_l (glibtop *server, const unsigned parameter,
-			 void *data_ptr, size_t data_size)
-{
-	switch (parameter) {
-	case GLIBTOP_PARAM_METHOD:
-		_write_data (&server->method,
-			     sizeof (server->method));
-	case GLIBTOP_PARAM_FEATURES:
-		_write_data (&server->features,
-			     sizeof (server->features));
-	case GLIBTOP_PARAM_COMMAND:
-		_write_data (server->server_command,
-			     _strlen(server->server_command));
-	case GLIBTOP_PARAM_HOST:
-		_write_data (server->server_host,
-			     _strlen(server->server_host));
-	case GLIBTOP_PARAM_PORT:
-		_write_data (&server->server_port,
-			     sizeof (server->server_port));
-	}
-
-	return 0;
-}
-
-void
-glibtop_set_parameter_l (glibtop *server, const unsigned parameter,
-			 const void *data_ptr, size_t data_size)
-{
-}

lib/prockernel.c

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

lib/proclist.c

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

lib/procmem.c

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

lib/procsegment.c

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

lib/procsignal.c

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

lib/procstate.c

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

lib/proctime.c

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

lib/procuid.c

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

lib/read.c

@@ -23,48 +23,19 @@
 
 /* Reads some data from server. */
 
-static void
-do_read (int s, void *ptr, size_t total_size)
-{
-	int nread;
-	size_t already_read = 0, remaining = total_size;
-	
-	while (already_read < total_size) {
-		nread = recv (s, ptr, remaining, 0);
-
-		if (nread == 0) {
-			close (s);
-			continue;
-		}
-		
-		if (nread <= 0) {
-			glibtop_error_io ("recv");
-			return;
-		}
-		
-		already_read += nread;
-		remaining -= nread;
-		(char *) ptr += nread;
-	}
-}
-
 void
-glibtop_read_l (glibtop *server, size_t size, void *buf)
+glibtop_read__r (glibtop *server, size_t size, void *buf)
 {
-	int ret = 0;
+	size_t	ssize;
 
-	glibtop_init_r (&server, 0, 0);
+	glibtop_init__r (&server);
 	
-#ifdef DEBUG
+	if (read (server->input [0], &ssize, sizeof (size_t)) < 0)
-	fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size);
+		glibtop_error__r (server, _("read size: %s"), strerror (errno));
-#endif
 	
-	if (server->socket) {
+	if (size != ssize)
-		do_read (server->socket, buf, size);
+		glibtop_error__r (server, _("got %d bytes but requested %d"), ssize, size);
-	} else {
-		ret = read (server->input [0], buf, size);
-	}
 	
-	if (ret < 0)
+	if (read (server->input [0], buf, size) < 0)
-		glibtop_error_io_r (server, _("read %d bytes"), size);
+		glibtop_error__r (server, _("read %d bytes: %s"), size, strerror (errno));
 }

lib/read_data.c

@@ -25,43 +25,24 @@
 /* Reads some data from server. */
 
 void *
-glibtop_read_data_l (glibtop *server)
+glibtop_read_data__r (glibtop *server)
 {
 	size_t	size;
 	void *ptr;
-	int ret;
 
-	glibtop_init_r (&server, 0, 0);
+	glibtop_init__r (&server);
 
-#ifdef DEBUG
+	if (read (server->input [0], &size, sizeof (size_t)) < 0)
-	fprintf (stderr, "LIBRARY: reading %d data bytes.\n", sizeof (size_t));
+		glibtop_error__r (server, _("read data size: %s"), strerror (errno));
-#endif
-
-	if (server->socket) {
-		ret = recv (server->socket, &size, sizeof (size_t), 0);
-	} else {
-		ret = read (server->input [0], &size, sizeof (size_t));
-	}
-
-	if (ret < 0)
-		glibtop_error_io_r (server, _("read data size"));
-
-#ifdef DEBUG
-	fprintf (stderr, "LIBRARY: really reading %d data bytes (ret = %d).\n", size, ret);
-#endif
 
 	if (!size) return NULL;	
 
-	ptr = glibtop_malloc_r (server, size);
+	fprintf (stderr, "Server has %d bytes of data.\n", size);
 	
-	if (server->socket) {
+	ptr = glibtop_malloc__r (server, size);
-		ret = recv (server->socket, ptr, size, 0);
-	} else {
-		ret = read (server->input [0], ptr, size);
-	}
 	
-	if (ret < 0)
+	if (read (server->input [0], ptr, size) < 0)
-		glibtop_error_io_r (server, _("read data %d bytes"));
+		glibtop_error__r (server, _("read data %d bytes: %s"), size, strerror (errno));
 
 	return ptr;
 }

lib/sem_limits.c

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

lib/shm_limits.c

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

lib/swap.c

@@ -19,10 +19,14 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <glibtop/close.h>
+#include <glibtop/swap.h>
+#include <glibtop/command.h>
 
-/* Closes pipe to gtop server. */
+/* Provides information about swap usage. */
 
 void
-glibtop_close_l (glibtop *server)
+glibtop_get_swap__r (glibtop *server, glibtop_swap *buf)
-{ }
+{
+	glibtop_init__r (&server);
+	glibtop_call__r (server, GLIBTOP_CMND_SWAP, 0, NULL, sizeof (glibtop_swap), buf);
+}

lib/uptime.c

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

lib/write.c

@@ -24,24 +24,15 @@
 /* Writes some data to server. */
 
 void
-glibtop_write_l (glibtop *server, size_t size, void *buf)
+glibtop_write__r (glibtop *server, size_t size, void *buf)
 {
-	int ret;
+	glibtop_init__r (&server);
 
-	glibtop_init_r (&server, 0, 0);
+	if (write (server->output [1], &size, sizeof (size_t)) < 0)
+		glibtop_error__r (server, _("write size: %s"), strerror (errno));
 
-	if (size == 0) return;
+	if (!size) return;
 	
-#ifdef DEBUG
+	if (write (server->output [1], buf, size) < 0)
-	fprintf (stderr, "LIBRARY: really writing %d bytes.\n", size);
+		glibtop_error__r (server, _("write %d bytes: %s"), size, strerror (errno));
-#endif
-
-	if (server->socket) {
-		ret = send (server->socket, buf, size, 0);
-	} else {
-		ret = write (server->output [1], buf, size);
-	}
-
-	if (ret < 0)
-		glibtop_error_io_r (server, _("write %d bytes"), size);
 }

libgtop.spec

@@ -3,32 +3,39 @@
 %define rel      SNAP
 %define prefix   /usr
 
-Summary: libgtop library
+Summary: GNOME Top Library
 Name: libgtop
 Version: %ver
 Release: %rel
 Copyright: LGPL
-Group: X11/Libraries
+Group: X11/gnome
 Source: ftp://ftp.gnome.org/pub/libgtop-%{ver}.tar.gz
 BuildRoot: /tmp/libgtop-root
-Packager: Michael Fulbright <msf@redhat.com>
+Obsoletes: gnome
-URL: http://www.gnome.org
+Packager: Marc Ewing <marc@redhat.com>
-Prereq: /sbin/install-info
+URL: http://www.gnome.org/
 Docdir: %{prefix}/doc
 
 %description
+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.
 
-A library that fetches 
+Main idea was to have the same interface for all operating systems,
-information about the running system such as cpu and memory usage,
+thus all system dependent details are hidden in the implementation
-active processes etc. On Linux systems, these information are taken
+of that server.
-directly from the /proc filesystem. 
 
+%package devel
+Summary: Libraries, includes, etc to use libgtop in GNOME applications
+Group: X11/gnome
+Requires: libgtop
+Obsoletes: gnome
 
-%changelog
+%description devel
-
+Libraries, include files, etc you need to use libgtop in GNOME applications.
-* Tue Jun  2 1998 Michael Fulbright <msf@redhat.com>
-
-- first version of the RPM
 
 %prep
 %setup
@@ -36,9 +43,9 @@ directly from the /proc filesystem.
 %build
 # Needed for snapshot releases.
 if [ ! -f configure ]; then
-  CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --disable-libgtop-examples
+  CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix
 else
-  CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --disable-libgtop-examples
+  CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix
 fi
 
 if [ "$SMP" != "" ]; then
@@ -53,29 +60,30 @@ rm -rf $RPM_BUILD_ROOT
 
 make prefix=$RPM_BUILD_ROOT%{prefix} install
 
-#
-# msf - remove these as they are really supposed to come from gnome-libs
-#
-rm -f $RPM_BUILD_ROOT/%{prefix}/lib/libgnomesupport.a
-rm -f $RPM_BUILD_ROOT/%{prefix}/lib/libgnomesupport.la
-rm -f $RPM_BUILD_ROOT/%{prefix}/lib/libgnomesupport.so.0
-rm -f $RPM_BUILD_ROOT/%{prefix}/lib/libgnomesupport.so.0.0.0
-
-rm -fr $RPM_BUILD_ROOT/%{prefix}/include/libgtop
-
 %clean
-#rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%post 
+if ! grep %{prefix}/lib /etc/ld.so.conf > /dev/null ; then
+  echo "%{prefix}/lib" >> /etc/ld.so.conf
+fi
+
+/sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
 %defattr(-, root, root)
 
-%doc ANNOUNCE AUTHORS ChangeLog NEWS README README.LATEST copyright.txt doc
+%doc AUTHORS COPYING ChangeLog NEWS README
-%{prefix}/bin/*
 %{prefix}/lib/lib*.so.*
-%{prefix}/lib/libgtopConf.sh
+%{prefix}/bin/*
+
+%files devel
+%defattr(-, root, root)
+
+%{prefix}/lib/lib*.so
 %{prefix}/lib/*a
+%{prefix}/lib/*.sh
+%{prefix}/lib/libgtop
 %{prefix}/include/*

perl/.cvsignore

@@ -1 +0,0 @@
-Libgtop.xs Makefile blib pm_to_blib Libgtop.c Libgtop.bs Makefile.PL

perl/Changes

@@ -1,5 +0,0 @@
-Revision history for Perl extension Libgtop.
-
-0.01  Sun Jun 21 21:00:59 1998
-	- original version; created by h2xs 1.18
-

perl/Libgtop.pm

@@ -1,26 +0,0 @@
-package Libgtop;
-
-use strict;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-
-require Exporter;
-require DynaLoader;
-require AutoLoader;
-
-@ISA = qw(Exporter DynaLoader);
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-@EXPORT = qw(
-	
-);
-$VERSION = '0.01';
-
-bootstrap Libgtop $VERSION;
-
-# Preloaded methods go here.
-
-# Autoload methods go after __END__, and are processed by the autosplit program.
-
-1;
-__END__

perl/MANIFEST

@@ -1,8 +0,0 @@
-.cvsignore
-Changes
-Libgtop.pm
-MANIFEST
-Makefile.PL.in
-new.pl
-perl.awk
-test.pl

perl/Makefile.PL.in

@@ -1,10 +0,0 @@
-# -*-cperl-*-
-use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-WriteMakefile('NAME'		=> 'Libgtop',
-	      'VERSION_FROM'	=> 'Libgtop.pm',
-	      'LIBS'		=> ['@LIBGTOP_GUILE_LIBS@'],
-	      'DEFINE'		=> '',
-	      'INC'		=> '@LIBGTOP_GUILE_INCS@',
-	     );

perl/new.pl

@@ -1,13 +0,0 @@
-#!/usr/bin/perl -w
-
-require 5.004;
-
-use blib;
-use strict;
-use Libgtop;
-
-print "CPU Usage: ".join (':', Libgtop::cpu)."\n";
-print "Memory Usage: ".join (':', Libgtop::mem)."\n";
-print "Swap Usage: ".join (':', Libgtop::swap)."\n";
-
-

perl/perl.awk

@@ -1,86 +0,0 @@
-BEGIN {
-  print "/* Libgtop.xs */";
-  print "/* This is a generated file.  Please modify `perl.awk' */";
-  print "";
-
-  print "#ifdef __cplusplus";
-  print "extern \"C\" {";
-  print "#endif";
-  print "#include \"EXTERN.h\"";
-  print "#include \"perl.h\"";
-  print "#include \"XSUB.h\"";
-  print "#ifdef __cplusplus";
-  print "}";
-  print "#endif";
-  print "";
-  print "#undef PACKAGE";
-  print "";
-  print "#include <glibtop.h>";
-  print "#include <glibtop/union.h>";
-  print "";
-  print "MODULE = Libgtop\t\tPACKAGE = Libgtop";
-  print "";
-
-  convert["long"]   = "newSViv";
-  convert["ulong"]  = "newSViv";
-  convert["double"] = "newSVnv";
-}
-
-/^(\w+)/ {
-  feature = $1;
-
-  print "void";
-  if (feature ~ /^proc_/) {
-    print feature"(pid)";
-    print "\tunsigned\tpid;";
-  } else {
-    print feature"()";
-  }
-
-  print "PREINIT:";
-  print "\tglibtop_"feature" "feature";";
-
-  if (feature ~ /^proclist/) {
-    print "\tunsigned i, *ptr;";
-    print "PPCODE:";
-    print "\tptr = glibtop_get_proclist (&proclist);";
-    print "";
-    print "\tif (ptr) {";
-    print "\t\tfor (i = 0; i < proclist.number; i++)";
-    print "\t\t\tXPUSHs (sv_2mortal (newSViv (ptr [i])));";
-    print "\t}";
-    print "";
-    print "\tglibtop_free (ptr);";
-  } else {
-    print "PPCODE:";
-    if (feature ~ /^proc_/) {
-      print "\tglibtop_get_"feature" (&"feature", pid);";
-    } else {
-      print "\tglibtop_get_"feature" (&"feature");";
-    }
-    print "";
-    
-    nr_elements = split ($2, elements, /:/);
-    for (element = 1; element <= nr_elements; element++) {
-      list = elements[element];
-      type = elements[element];
-      sub(/\(.*/, "", type);
-      sub(/^\w+\(/, "", list); sub(/\)$/, "", list);
-      count = split (list, fields, /,/);
-      for (field = 1; field <= count; field++) {
-	if (type ~ /^str$/) {
-	  print "\tXPUSHs (sv_2mortal (newSVpv ("$1"."fields[field]", 0)));";
-	} else {
-	  if (type ~ /^char$/) {
-	    print "\tXPUSHs (sv_2mortal (newSVpv (&"$1"."fields[field]", 1)));";
-	  } else {
-	    print "\tXPUSHs (sv_2mortal ("convert[type]" ("$1"."fields[field]")));";
-	  }
-	}
-      }
-    }
-  }
-    
-  print "";
-}
-

perl/test.pl

@@ -1,20 +0,0 @@
-# Before `make install' is performed this script should be runnable with
-# `make test'. After `make install' it should work as `perl test.pl'
-
-######################### We start with some black magic to print on failure.
-
-# Change 1..1 below to 1..last_test_to_print .
-# (It may become useful if the test is moved to ./t subdirectory.)
-
-BEGIN { $| = 1; print "1..1\n"; }
-END {print "not ok 1\n" unless $loaded;}
-use Libgtop;
-$loaded = 1;
-print "ok 1\n";
-
-######################### End of black magic.
-
-# Insert your test code below (better if it prints "ok 13"
-# (correspondingly "not ok 13") depending on the success of chunk 13
-# of the test code):
-

po/.cvsignore

@@ -2,5 +2,4 @@ Makefile
 Makefile.in
 POTFILES
 cat-id-tbl.c
-fr.gmo
 libgtop.pot

po/ChangeLog

@@ -1,7 +1,3 @@
-Sun, 31 May 1998 22:38:59 +0200  Vincent Renardias  <vincent@waw.com>
-
-	* fr.po: new file - ChangeLog isn't empty anymore _(;
-
 1998-05-21  Martin Baulig  <martin@home-of-linux.org>
 
 	* ChangeLog: new file - currently empty

po/POTFILES.in

@@ -1,8 +1,17 @@
 lib/close.c
 lib/command.c
+lib/cpu.c
+lib/mem.c
 lib/open.c
 lib/read.c
+lib/swap.c
 lib/write.c
+lib/uptime.c
+lib/loadavg.c
+lib/shm_limits.c
+lib/msg_limits.c
+lib/sem_limits.c
+lib/proclist.c
 lib/read_data.c
 acconfig.h
 glibtop.h

po/fr.po

@@ -1,402 +0,0 @@
-# libgtop fr.po
-# Copyright (C) 1998 Free Software Foundation, Inc.
-# Vincent Renardias <vincent@waw.com>, 1998.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: libgtop VERSION\n"
-"POT-Creation-Date: 1998-06-20 15:28+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Vincent Renardias <vincent@waw.com>\n"
-"Language-Team: Vincent Renardias <vincent@waw.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: lib/open.c:36
-#, c-format
-msgid "cannot make a pipe: %s\n"
-msgstr "impossible de cr<63><72>r un tube: %s\n"
-
-#: lib/open.c:41
-#, c-format
-msgid "%s: fork failed: %s\n"
-msgstr "%s: duplication <20>chou<6F>e: %s\n"
-
-#: lib/open.c:59
-#, c-format
-msgid "server version is not %s"
-msgstr "la version du serveur n'est pas %s"
-
-#: lib/read.c:34
-#, c-format
-msgid "read size: %s"
-msgstr "taille lue: %s"
-
-#: lib/read.c:37
-#, c-format
-msgid "got %d bytes but requested %d"
-msgstr "obtenu %d octets, mais %d <20>taient demand<6E>s"
-
-#: lib/read.c:40
-#, c-format
-msgid "read %d bytes: %s"
-msgstr "lecture de %d octets: %s"
-
-#: lib/write.c:32
-#, c-format
-msgid "write size: %s"
-msgstr "taille <20>crite: %s"
-
-#: lib/write.c:37
-#, c-format
-msgid "write %d bytes: %s"
-msgstr "<22>crit %d octets: %s"
-
-#: lib/read_data.c:36
-#, c-format
-msgid "read data size: %s"
-msgstr "taille de la lecture: %s"
-
-#: lib/read_data.c:46
-#, c-format
-msgid "read data %d bytes: %s"
-msgstr "lecture de %d octets de donn<6E>es: %s"
-
-#: sysdeps/common/xmalloc.c:32
-#, c-format
-msgid "malloc %d bytes: %s"
-msgstr "malloc de %d octets: %s"
-
-#: sysdeps/common/xmalloc.c:44
-#, c-format
-msgid "calloc %d block (%d bytes each): %s"
-msgstr "calloc de %d blocks (%d octets chacuns): %s"
-
-#: sysdeps/common/xmalloc.c:56
-#, c-format
-msgid "realloc %d bytes: %s"
-msgstr "realloc de %d octets: %s"
-
-#: sysdeps/names/sysdeps.c:42 sysdeps/names/sysdeps.c:62
-msgid "CPU Usage"
-msgstr "Utilisation CPU"
-
-#: sysdeps/names/sysdeps.c:43 sysdeps/names/sysdeps.c:63
-msgid "Memory Usage"
-msgstr "Utilisation M<>moire"
-
-#: sysdeps/names/sysdeps.c:44 sysdeps/names/sysdeps.c:64
-msgid "Swap Usage"
-msgstr "Utilisation du Swap"
-
-#: sysdeps/names/sysdeps.c:45 sysdeps/names/sysdeps.c:65
-msgid "System Uptime"
-msgstr "Uptime du syst<73>me"
-
-#: sysdeps/names/sysdeps.c:46 sysdeps/names/sysdeps.c:66
-msgid "Load Averange"
-msgstr "Charge moyenne"
-
-#: sysdeps/names/sysdeps.c:47 sysdeps/names/sysdeps.c:67
-msgid "Shared Memory Limits"
-msgstr "Limites de la m<>moire partag<61>e"
-
-#: sysdeps/names/sysdeps.c:48 sysdeps/names/sysdeps.c:68
-msgid "Message Queue Limits"
-msgstr "Limites de la queue de messages"
-
-#: sysdeps/names/sysdeps.c:49 sysdeps/names/sysdeps.c:69
-msgid "Semaphore Set Limits"
-msgstr "Limites de l'ensemble de s<>maphores"
-
-#: sysdeps/names/sysdeps.c:50 sysdeps/names/sysdeps.c:70
-msgid "List of running Processes"
-msgstr "Liste des taches en cours d'<27>x<EFBFBD>cution"
-
-#: sysdeps/names/sysdeps.c:51 sysdeps/names/sysdeps.c:71
-msgid "Process Status information"
-msgstr "Information sur l'<27>tat du processus"
-
-#: sysdeps/names/sysdeps.c:52 sysdeps/names/sysdeps.c:72
-msgid "Process UID and TTY information"
-msgstr "Information UID et TTY du processus"
-
-#: sysdeps/names/sysdeps.c:53 sysdeps/names/sysdeps.c:73
-msgid "Process Memory information"
-msgstr "Information M<>moire du Processus"
-
-#: sysdeps/names/sysdeps.c:54 sysdeps/names/sysdeps.c:74
-msgid "Process Time information"
-msgstr "Information Temporelle sur le processus"
-
-#: sysdeps/names/sysdeps.c:55 sysdeps/names/sysdeps.c:75
-msgid "Process Signal information"
-msgstr "Information sur les signaux du processus"
-
-#: sysdeps/names/sysdeps.c:56 sysdeps/names/sysdeps.c:76
-msgid "Process Kernel Data information"
-msgstr "Information sur les donn<6E>es noyau du processus"
-
-#: sysdeps/names/sysdeps.c:57 sysdeps/names/sysdeps.c:77
-msgid "Process Segment information"
-msgstr "Information sur la segmentation du processus"
-
-#: sysdeps/names/cpu.c:37
-msgid "Total CPU Time"
-msgstr "Temps CPU Total"
-
-#: sysdeps/names/cpu.c:38
-msgid "CPU Time in User Mode"
-msgstr "Temps CPU en mode utilisateur"
-
-#: sysdeps/names/cpu.c:39
-msgid "CPU Time in User Mode (nice)"
-msgstr "Temps CPU en mode utilisateur (nice)"
-
-#: sysdeps/names/cpu.c:40
-msgid "CPU Time in System Mode"
-msgstr "Temps CPU en mode syst<73>me"
-
-#: sysdeps/names/cpu.c:41
-msgid "CPU Time in the Idle Task"
-msgstr "Temps CPU pour la tache inactive"
-
-#: sysdeps/names/cpu.c:42
-msgid "Tick Frequency"
-msgstr "Fr<46>quence des ticks"
-
-#: sysdeps/names/cpu.c:47
-msgid "The number of jiffies (1/100ths of a second) since system boot"
-msgstr "Nombre de jiffies (1/100e de seconde) depuis le boot du syst<73>me"
-
-#: sysdeps/names/cpu.c:49
-msgid ""
-"The number of jiffies (1/100ths of a second) that the system spent in user "
-"mode"
-msgstr "Le nombre de jiffies (1/100<30>me de seconde) que le systme a pass<73> en mode utilisateur"
-
-#: sysdeps/names/cpu.c:51
-msgid ""
-"The number of jiffies (1/100ths of a second) that the system spent in user "
-"mode with low priority (nice)"
-msgstr "Le nombre de jiffies (1/100<30>me de seconde) que le syst<73>me a pass<73> en mode utilisateur en priorit<69> basse (nice)"
-
-#: sysdeps/names/cpu.c:53
-msgid ""
-"The number of jiffies (1/100ths of a second) that the system spent in system "
-"mode"
-msgstr "Le nombre de jiffies (1/100<30>me de seconde) que le syst<73>me a pass<73> en mode syst<73>me"
-
-#: sysdeps/names/cpu.c:55
-msgid ""
-"The number of jiffies (1/100ths of a second) that the system spend in the "
-"idle task"
-msgstr "Le nombre de jiffies (1/100<30>me de seconde) que le systme a pass<73> dans le processus inactif (idle task)"
-
-#: sysdeps/names/cpu.c:57
-msgid ""
-"All of the above values are in jiffies (1/100ths of a second) unless "
-"otherwise stated in this field (i.e. 'frequency != 100')"
-msgstr "Toutes les valeurs ci-dessus sont exprim<69>es en jiffies (1/100<30>me de seconde) sauf pr<70>cision contraire (i.e.: fr<66>quence != 100)"
-
-#: sysdeps/names/loadavg.c:36
-msgid "Load Average"
-msgstr "Charge Moyenne"
-
-#: sysdeps/names/loadavg.c:41
-msgid "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
-msgstr "Nombre de processus tournant simultannement en moyenne sur 1, 5 et 15 minutes"
-
-#: sysdeps/names/mem.c:39
-msgid "Total Memory"
-msgstr "M<>moire Totale"
-
-#: sysdeps/names/mem.c:40
-msgid "Used Memory"
-msgstr "M<>moire Utilis<69>e"
-
-#: sysdeps/names/mem.c:41
-msgid "Free Memory"
-msgstr "M<>moire Libre"
-
-#: sysdeps/names/mem.c:42
-msgid "Shared Memory"
-msgstr "M<>moire Partag<61>e"
-
-#: sysdeps/names/mem.c:43
-msgid "Buffers"
-msgstr "Tampons"
-
-#: sysdeps/names/mem.c:44
-msgid "Cached"
-msgstr "Dans le cache"
-
-#: sysdeps/names/mem.c:45
-msgid "User"
-msgstr "Utilisateur"
-
-#: sysdeps/names/mem.c:46
-msgid "Locked"
-msgstr "V<>rouill<6C>"
-
-#: sysdeps/names/mem.c:51
-msgid "Total physical memory in kB"
-msgstr "M<>moire physique totalle en Ko"
-
-#: sysdeps/names/mem.c:52
-msgid "Used memory size in kB"
-msgstr "M<>moire utilis<69>e en Ko"
-
-#: sysdeps/names/mem.c:53
-msgid "Free memory size in kB"
-msgstr "M<>moire libre en Ko"
-
-#: sysdeps/names/mem.c:54
-msgid "Shared memory size in kB"
-msgstr "M<>moire partag<61>e en Ko"
-
-#: sysdeps/names/mem.c:55
-msgid "Size of buffers kB"
-msgstr "Taille des tampons en Ko"
-
-#: sysdeps/names/mem.c:56
-msgid "Size of cached memory in kB"
-msgstr "Taille de la m<>moire dans le cache en Ko"
-
-#: sysdeps/names/mem.c:57
-msgid "Memory used from user processes in kB"
-msgstr "M<>moire utilis<69>e par les processus utilisateurs en Ko"
-
-#: sysdeps/names/mem.c:58
-msgid "Memory in locked pages in kB"
-msgstr "M<>moire dans les pages v<>rouill<6C>es en Ko"
-
-#: sysdeps/names/swap.c:36 sysdeps/names/swap.c:43
-msgid "Total Swap Space"
-msgstr "Taille totalle de la zone d'<27>change"
-
-#: sysdeps/names/swap.c:37 sysdeps/names/swap.c:44
-msgid "Used Swap Space"
-msgstr "Taille utilis<69>e de la zone d'<27>change"
-
-#: sysdeps/names/swap.c:38 sysdeps/names/swap.c:45
-msgid "Free Swap Space"
-msgstr "Espace libre de la zone d'<27>change"
-
-#: sysdeps/names/uptime.c:36
-msgid "Uptime"
-msgstr "Uptime"
-
-#: sysdeps/names/uptime.c:37
-msgid "Idletime"
-msgstr "Idletime"
-
-#: sysdeps/names/uptime.c:42
-msgid "Time in seconds since system boot"
-msgstr "Temps en secondes depuis le d<>marrage du syst<73>me"
-
-#: sysdeps/names/uptime.c:43
-msgid "Time in seconds the system spent in the idle task since system boot"
-msgstr "Temps en secondes pass<73> dans le processus inactif depuis le d<>marrage du syst<73>me"
-
-#: sysdeps/names/shm_limits.c:37 sysdeps/names/shm_limits.c:46
-msgid "Max segment size"
-msgstr "Taille maximum des segments"
-
-#: sysdeps/names/shm_limits.c:38 sysdeps/names/shm_limits.c:47
-msgid "Min segment size"
-msgstr "Taille minimum des segments"
-
-#: sysdeps/names/shm_limits.c:39 sysdeps/names/shm_limits.c:48
-msgid "Max number of segments"
-msgstr "Nombre maximum des segments"
-
-#: sysdeps/names/shm_limits.c:40 sysdeps/names/shm_limits.c:49
-msgid "Max shared segments per process"
-msgstr "Nombre maximum de segments partag<61>s par processus"
-
-#: sysdeps/names/shm_limits.c:41 sysdeps/names/shm_limits.c:50
-msgid "Max total shared memory"
-msgstr "Taille totalle de la m<>moire partag<61>e"
-
-#: sysdeps/names/msg_limits.c:37 sysdeps/names/msg_limits.c:48
-msgid "Size in kilobytes of message pool"
-msgstr "Taille en kilo-octets du pool de messages"
-
-#: sysdeps/names/msg_limits.c:38 sysdeps/names/msg_limits.c:49
-msgid "Number of entries in message map"
-msgstr ""
-
-#: sysdeps/names/msg_limits.c:39 sysdeps/names/msg_limits.c:50
-msgid "Max size of message"
-msgstr "Taille maximum des messages"
-
-#: sysdeps/names/msg_limits.c:40 sysdeps/names/msg_limits.c:51
-msgid "Default max size of queue"
-msgstr "Taille maximum par d<>faut de la queue"
-
-#: sysdeps/names/msg_limits.c:41 sysdeps/names/msg_limits.c:52
-msgid "Max queues system wide"
-msgstr "Nombre maximum de queues dans le syst<73>me"
-
-#: sysdeps/names/msg_limits.c:42 sysdeps/names/msg_limits.c:53
-msgid "Message segment size"
-msgstr "Taille des segments de messages"
-
-#: sysdeps/names/msg_limits.c:43 sysdeps/names/msg_limits.c:54
-msgid "Number of system message headers"
-msgstr "Nombre d'entetes de messages syst<73>me"
-
-#: sysdeps/names/sem_limits.c:39 sysdeps/names/sem_limits.c:53
-msgid "Number of entries in semaphore map"
-msgstr ""
-
-#: sysdeps/names/sem_limits.c:40 sysdeps/names/sem_limits.c:54
-msgid "Max number of arrays"
-msgstr "Nombre maximum de tables"
-
-#: sysdeps/names/sem_limits.c:41 sysdeps/names/sem_limits.c:55
-msgid "Max semaphores system wide"
-msgstr "Nombre maximum de s<>maphores dans le syst<73>me"
-
-#: sysdeps/names/sem_limits.c:42 sysdeps/names/sem_limits.c:56
-msgid "Number of undo structures system wide"
-msgstr "Nombre de structures 'undo' dans le syst<73>me"
-
-#: sysdeps/names/sem_limits.c:43 sysdeps/names/sem_limits.c:57
-msgid "Max semaphores per array"
-msgstr "Nombre maximum de s<>maphores par table"
-
-#: sysdeps/names/sem_limits.c:44 sysdeps/names/sem_limits.c:58
-msgid "Max ops per semop call"
-msgstr ""
-
-#: sysdeps/names/sem_limits.c:45 sysdeps/names/sem_limits.c:59
-msgid "Max number of undo entries per process"
-msgstr ""
-
-#: sysdeps/names/sem_limits.c:46 sysdeps/names/sem_limits.c:60
-msgid "sizeof struct sem_undo"
-msgstr "sizeof struct sem_undo"
-
-#: sysdeps/names/sem_limits.c:47 sysdeps/names/sem_limits.c:61
-msgid "Semaphore max value"
-msgstr "Valeur maximum d'un s<>maphore"
-
-#: sysdeps/names/sem_limits.c:48 sysdeps/names/sem_limits.c:62
-msgid "Adjust on exit max value"
-msgstr ""
-
-#: sysdeps/names/proclist.c:36 sysdeps/names/proclist.c:43
-msgid "Number of list elements"
-msgstr ""
-
-#: sysdeps/names/proclist.c:37 sysdeps/names/proclist.c:44
-msgid "Total size of list"
-msgstr "Taille totalle de la liste"
-
-#: sysdeps/names/proclist.c:38 sysdeps/names/proclist.c:45
-msgid "Size of a single list element"
-msgstr ""

src/Makefile.am

@@ -1 +1 @@
-SUBDIRS			= server proxy daemon
+SUBDIRS			= server

src/daemon/.cvsignore

@@ -1,3 +0,0 @@
-Makefile.in
-Makefile
-gnuserv

src/daemon/Makefile.am

@@ -1,25 +0,0 @@
-LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-
-INCLUDES			= -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
-				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
-				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
-
-CFLAGS				= -Wall -W @CFLAGS@ -DGTOP_SERVER=\""@LIBGTOP_SERVER@"\" -DDEBUG -DREAL_DEBUG
-
-bin_PROGRAMS			= gnuserv
-
-EXTRA_PROGRAMS			= gtop_daemon
-
-gnuserv_SOURCES			= gnuserv.c main.c
-gnuserv_LDADD			= $(top_builddir)/lib/libgtop.la \
-				  $(top_builddir)/sysdeps/common/libgtop_common.la \
-				  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-				  @INTLLIBS@ @LIBSUPPORT@ @X_LIBS@ -lXau
-gnuserv_LDFLAGS			= -static
-
-gtop_daemon_SOURCES		= main.c inet.c loop.c output.c version.c
-gtop_daemon_LDADD		= $(top_builddir)/lib/libgtop.la \
-				  $(top_builddir)/sysdeps/common/libgtop_common.la \
-				  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-				  @INTLLIBS@ @LIBSUPPORT@
-gtop_daemon_LDFLAGS		= -static

src/daemon/gnuserv.c

@@ -1,835 +0,0 @@
-/* -*-C-*-
- Server code for handling requests from clients and forwarding them
- on to the GNU Emacs process.
-
- This file is part of GNU Emacs.
-
- Copying is permitted under those conditions described by the GNU
- General Public License.
-
- Copyright (C) 1989 Free Software Foundation, Inc.
-
- Author: Andy Norman (ange@hplb.hpl.hp.com), based on 'etc/server.c'
-         from the 18.52 GNU Emacs distribution.
-
- Please mail bugs and suggestions to the author at the above address.
-*/
-
-/* HISTORY 
- * 11-Nov-1990		bristor@simba	
- *    Added EOT stuff.
- */
-
-/*
- * This file incorporates new features added by Bob Weiner <weiner@mot.com>,
- * Darrell Kindred <dkindred@cmu.edu> and Arup Mukherjee <arup@cmu.edu>.
- * Please see the note at the end of the README file for details.
- *
- * (If gnuserv came bundled with your emacs, the README file is probably
- * ../etc/gnuserv.README relative to the directory containing this file)
- */
-
-#if 0
-static char rcsid [] = "!Header: gnuserv.c,v 2.1 95/02/16 11:58:27 arup alpha !";
-#endif
-
-#define DEBUG
-
-#include <glibtop/gnuserv.h>
-#include <glibtop/open.h>
-
-#ifdef AIX
-#include <sys/select.h>
-#endif
-
-extern void handle_socket_connection __P((glibtop *, int));
-
-#if !defined(SYSV_IPC) && !defined(UNIX_DOMAIN_SOCKETS) && !defined(INTERNET_DOMAIN_SOCKETS)
-main ()
-{
-  fprintf (stderr,"Sorry, the Emacs server is only supported on systems that have\n");
-  fprintf (stderr,"Unix Domain sockets, Internet Domain sockets or System V IPC\n");
-  exit (1);
-} /* main */
-#else /* SYSV_IPC || UNIX_DOMAIN_SOCKETS || INTERNET_DOMAIN_SOCKETS */
-
-#ifdef SYSV_IPC
-
-int ipc_qid = 0;		/* ipc message queue id */
-int ipc_wpid = 0;		/* watchdog task pid */
-
-
-/*
-  ipc_exit -- clean up the queue id and queue, then kill the watchdog task
-              if it exists. exit with the given status.
-*/
-void
-ipc_exit (int stat)
-{
-  msgctl (ipc_qid,IPC_RMID,0);
-  
-  if  (ipc_wpid != 0)
-    kill (ipc_wpid, SIGKILL);
-  
-  exit (stat);
-} /* ipc_exit */
-
-
-/*
-  ipc_handle_signal -- catch the signal given and clean up.
-*/
-void
-ipc_handle_signal(int sig)
-{
-  ipc_exit (0);
-} /* ipc_handle_signal */
-
-
-/* 
-  ipc_spawn_watchdog -- spawn a watchdog task to clean up the message queue should the
-			server process die.
-*/
-void
-ipc_spawn_watchdog (void)
-{
-  if ((ipc_wpid = fork ()) == 0)
-    { /* child process */
-      int ppid = getppid ();	/* parent's process id */
-      
-      setpgrp();		/* gnu kills process group on exit */
-      
-      while (1)
-	{
-	  if (kill (ppid, 0) < 0) /* ppid is no longer valid, parent
-				     may have died */
-	    {
-	      ipc_exit (0);
-	    } /* if */
-	  
-	  sleep(10);		/* have another go later */
-	} /* while */
-    } /* if */
-  
-} /* ipc_spawn_watchdog */
-
-
-/*
-  ipc_init -- initialize server, setting the global msqid that can be listened on.
-*/
-void
-ipc_init (struct msgbuf **msgpp)
-{
-  key_t key;			/* messge key */
-  char buf[GSERV_BUFSZ];	/* pathname for key */
-
-  sprintf (buf,"/tmp/lgtd%d",(int)geteuid ());
-  creat (buf,0600);
-  key = ftok (buf,1);
-
-  if ((ipc_qid = msgget (key,0600|IPC_CREAT)) == -1)
-	  glibtop_error_io ("unable to create msg queue");
-
-  ipc_spawn_watchdog ();
-
-  signal (SIGTERM,ipc_handle_signal);
-  signal (SIGINT,ipc_handle_signal);
-
-  if ((*msgpp = (struct msgbuf *)
-       malloc (sizeof **msgpp + GSERV_BUFSZ)) == NULL)
-    {
-      glibtop_warn_io ("unable to allocate space for message buffer");
-      ipc_exit(1);
-    } /* if */
-} /* ipc_init */
-
-
-/*
-  handle_ipc_request -- accept a request from a client, pass the request on
-  			to the GNU Emacs process, then wait for its reply and
-			pass that on to the client.
-*/
-void
-handle_ipc_request (struct msgbuf *msgp)
-{
-  struct msqid_ds msg_st;	/* message status */
-  char buf[GSERV_BUFSZ];
-  int len;			/* length of message / read */
-  int s, result_len;            /* tag fields on the response from emacs */
-  int offset = 0;
-  int total = 1;                /* # bytes that will actually be sent off */
-
-  if ((len = msgrcv (ipc_qid, msgp, GSERV_BUFSZ - 1, 1, 0)) < 0)
-    {
-      glibtop_warn_io ("msgrcv");
-      ipc_exit (1);
-    } /* if */
-
-  msgctl (ipc_qid, IPC_STAT, &msg_st);
-  strncpy (buf, msgp->mtext, len);
-  buf[len] = '\0';		/* terminate */
-  
-  printf ("%d %s", ipc_qid, buf);
-  fflush (stdout);
-
-  /* now for the response from gnu */
-  msgp->mtext[0] = '\0';
-
-#if 0
-  if ((len = read(0,buf,GSERV_BUFSZ-1)) < 0)
-    {
-      glibtop_warn_io ("read");
-      ipc_exit (1);
-  } /* if */
-
-  sscanf (buf, "%d:%[^\n]\n", &junk, msgp->mtext);
-#else
-
-  /* read in "n/m:" (n=client fd, m=message length) */
-
-  while (offset < (GSERV_BUFSZ-1) && 
-	 ((len = read (0, buf + offset, 1)) > 0) &&
-	 buf[offset] != ':')
-    {
-      offset += len;
-    }
-
-  if (len < 0)
-    glibtop_error_io ("read");
-
-  /* parse the response from emacs, getting client fd & result length */
-  buf[offset] = '\0';
-  sscanf (buf, "%d/%d", &s, &result_len);
-
-  while (result_len > 0)
-    {
-      if ((len = read(0, buf, min2 (result_len, GSERV_BUFSZ - 1))) < 0)
-	glibtop_error_io ("read");
-
-      /* Send this string off, but only if we have enough space */ 
-
-      if (GSERV_BUFSZ > total)
-	{
-	  if (total + len <= GSERV_BUFSZ)
-	    buf[len] = 0;
-	  else
-	    buf[GSERV_BUFSZ - total] = 0;
-
-	  send_string(s,buf);
-	  total += strlen(buf);
-	}
-
-      result_len -= len;
-    }
-
-  /* eat the newline */
-  while ((len = read (0,buf,1)) == 0)
-    ;
-  if (len < 0)
-    glibtop_error_io ("read");
-
-  if (buf[0] != '\n')
-    glibtop_error ("garbage after result [%c]", buf[0]);
-#endif
-
-  /* Send a response back to the client. */
-
-  msgp->mtype = msg_st.msg_lspid;
-  if (msgsnd (ipc_qid,msgp,strlen(msgp->mtext)+1,0) < 0)
-    glibtop_warn_io ("msgsend(gnuserv)");
-
-} /* handle_ipc_request */
-#endif /* SYSV_IPC */
-
-
-#if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
-/*
-  echo_request -- read request from a given socket descriptor, and send the information
-                  to stdout (the gnu process).
-*/
-static void
-echo_request (int s)
-{
-  char buf[GSERV_BUFSZ];
-  int len;
-
-  printf("%d ",s);
-  
-  /* read until we get a newline or no characters */
-  while ((len = recv(s,buf,GSERV_BUFSZ-1,0)) > 0) {
-    buf[len] = '\0';
-    printf("%s",buf);
-
-    if (buf[len-1] == EOT_CHR) {
-      fflush(stdout);
-      break;			/* end of message */
-    }
-
-  } /* while */
-
-  if (len < 0)
-    glibtop_error_io ("recv");
-  
-} /* echo_request */
-
-
-/*
-  handle_response -- accept a response from stdin (the gnu process) and pass the
-                     information on to the relevant client.
-*/
-static void
-handle_response (void)
-{
-#if 0
-  char buf[GSERV_BUFSZ+1];
-  int offset=0;
-  int s;
-  int len;
-  int result_len;
-
-  /* read in "n/m:" (n=client fd, m=message length) */
-  while (offset < GSERV_BUFSZ && 
-	 ((len = read(0,buf+offset,1)) > 0) &&
-	 buf[offset] != ':') {
-    offset += len;
-  }
-
-  if (len < 0)
-    glibtop_error_io ("read");
-      
-  /* parse the response from emacs, getting client fd & result length */
-  buf[offset] = '\0';
-  sscanf(buf,"%d/%d", &s, &result_len);
-
-  while (result_len > 0) {
-    if ((len = read(0,buf,min2(result_len,GSERV_BUFSZ))) < 0)
-      glibtop_error_io ("read");
-
-    buf[len] = '\0';
-    send_string(s,buf);
-    result_len -= len;
-  }
-
-  /* eat the newline */
-  while ((len = read(0,buf,1)) == 0)
-    ;
-  if (len < 0)
-    glibtop_error_io ("read");
-
-  if (buf[0] != '\n')
-    glibtop_error ("garbage after result");
-
-  /* send the newline */
-  buf[1] = '\0';
-  send_string(s,buf);
-  close(s); 
-#else
-  glibtop_error ("handle_response (): Function not implemented");
-#endif
-
-} /* handle_response */
-#endif /* INTERNET_DOMAIN_SOCKETS || UNIX_DOMAIN_SOCKETS */
-
-
-#ifdef INTERNET_DOMAIN_SOCKETS
-struct entry {
-  u_long host_addr;
-  struct entry *next;
-};
-
-struct entry *permitted_hosts[TABLE_SIZE];
-
-#ifdef AUTH_MAGIC_COOKIE
-# include <X11/X.h>
-# include <X11/Xauth.h>
-
-static Xauth *server_xauth = NULL;
-#endif 
-
-static int 
-timed_read (int fd, char *buf, int max, int timeout, int one_line)
-{
-  fd_set rmask;
-  struct timeval tv; /* = {timeout, 0}; */
-  char c = 0;
-  int nbytes = 0;
-  int r;
-  
-  tv.tv_sec = timeout;
-  tv.tv_usec = 0;
-
-  FD_ZERO(&rmask);
-  FD_SET(fd, &rmask);
-  
-  do
-    {
-      r = select(fd + 1, &rmask, NULL, NULL, &tv);
-
-      if (r > 0)
-	{
-	  if (read (fd, &c, 1) == 1 )
-	    {
-	      *buf++ = c;
-	      ++nbytes;
-	    }
-	  else
-	    {
-	      glibtop_warn_io ("read error on socket");
-	      return -1;
-	    }
-	}
-      else if (r == 0)
-	{
-	  glibtop_warn ("read timed out");
-	  return -1;
-	}
-      else
-	{
-	  glibtop_warn_io ("error in select");
-	  return -1;
-	}
-    } while ((nbytes < max) &&  !(one_line && (c == '\n')));
-
-  --buf;
-  if (one_line && *buf == '\n')
-    {
-      *buf = 0;
-    }
-
-  return nbytes;
-}
-	
-	
-
-/*
-  permitted -- return whether a given host is allowed to connect to the server.
-*/
-static int
-permitted (u_long host_addr, int fd)
-{
-  int key;
-  struct entry *entry;
-
-  char auth_protocol[128]; 
-  char buf[1024];
-  int  auth_data_len;
-
-  if (fd > 0)
-    {
-      /* we are checking permission on a real connection */
-
-      /* Read auth protocol name */
-  
-      if (timed_read(fd, auth_protocol, AUTH_NAMESZ, AUTH_TIMEOUT, 1) <= 0)
-	return FALSE;
-
-#ifdef DEBUG
-      fprintf (stderr, "Client sent authenticatin protocol '%s'\n", auth_protocol);
-#endif
-
-      if (strcmp (auth_protocol, DEFAUTH_NAME) &&
-	  strcmp (auth_protocol, MCOOKIE_NAME))
-	{
-	  glibtop_warn ("Authentication protocol from client is invalid", auth_protocol);
-	  
-	  return FALSE;
-	}
-
-      if (!strcmp (auth_protocol, MCOOKIE_NAME))
-	{
-
-	  /*
-	   * doing magic cookie auth
-	   */
-
-	  if (timed_read (fd, buf, 10, AUTH_TIMEOUT, 1) <= 0)
-	    return FALSE;
-
-	  auth_data_len = atoi (buf);
-
-	  if (timed_read (fd, buf, auth_data_len, AUTH_TIMEOUT, 0) != auth_data_len)
-	    return FALSE;
-      
-#ifdef AUTH_MAGIC_COOKIE
-	  if (server_xauth && server_xauth->data &&
-	      !memcmp (buf, server_xauth->data, auth_data_len))
-	    {
-	      return TRUE;
-	    }
-#else 
-	  glibtop_warn ("client tried Xauth, but server is not compiled with Xauth");
-#endif
-      
-      /*
-       * auth failed, but allow this to fall through to the GNU_SECURE
-       * protocol....
-       */
-
-	  glibtop_warn ("Xauth authentication failed, trying GNU_SECURE auth...");
-	  
-	}
-    
-      /* Other auth protocols go here, and should execute only if the
-       * auth_protocol name matches.
-       */
-
-    }
-
-
-  /* Now, try the old GNU_SECURE stuff... */
-  
-  /* First find the hash key */
-  key = HASH(host_addr) % TABLE_SIZE;
-
-#ifdef DEBUG
-  fprintf (stderr, "Doing GNU_SECURE auth ...\n");
-#endif
-  
-  /* Now check the chain for that hash key */
-  for(entry = permitted_hosts [key]; entry != NULL; entry = entry->next) {
-#ifdef DEBUG
-    fprintf (stderr, "Trying %ld\n", entry->host_addr);
-#endif
-    if (host_addr == entry->host_addr) 
-      return(TRUE);
-  }
-  
-  return(FALSE);
-
-} /* permitted */
-
-
-/* 
-  add_host -- add the given host to the list of permitted hosts, provided it isn't
-              already there.
-*/	
-static void
-add_host (u_long host_addr)
-{
-  int key;
-  struct entry *new_entry;
-  
-  if (!permitted (host_addr, -1))
-    {
-      if ((new_entry = (struct entry *) malloc(sizeof(struct entry))) == NULL)
-	glibtop_error_io ("unable to malloc space for permitted host entry");
-
-      new_entry->host_addr = host_addr;
-      key = HASH(host_addr) % TABLE_SIZE;
-      new_entry->next = permitted_hosts[key];
-      permitted_hosts[key] = new_entry;
-    } /* if */
-
-} /* add_host */
-
-
-/*
-  setup_table -- initialise the table of hosts allowed to contact the server,
-                 by reading from the file specified by the GNU_SECURE
-		 environment variable
-                 Put in the local machine, and, if a security file is specifed,
-                 add each host that is named in the file.
-		 Return the number of hosts added.
-*/
-static int
-setup_table (void)
-{
-  FILE *host_file;
-  char *file_name;
-  char hostname[HOSTNAMSZ];
-  u_int host_addr;
-  int i, hosts=0;
-  
-  /* Make sure every entry is null */
-  for (i = 0; i < TABLE_SIZE; i++)
-    permitted_hosts [i] = NULL;
-
-  gethostname (hostname, HOSTNAMSZ);
-
-  if (((long) host_addr = glibtop_internet_addr (hostname)) == -1)
-    glibtop_error ("unable to find %s in /etc/hosts or from YP", hostname);
-
-#ifdef AUTH_MAGIC_COOKIE
-  
-  server_xauth = XauGetAuthByAddr (FamilyInternet, 
-				   sizeof(host_addr), (char *)&host_addr,
-				   strlen(MCOOKIE_SCREEN), MCOOKIE_SCREEN, 
-				   strlen(MCOOKIE_X_NAME), MCOOKIE_X_NAME);
-  hosts++;
-
-#endif /* AUTH_MAGIC_COOKIE */
-  
-
-#if 0 /* Don't even want to allow access from the local host by default */
-  add_host (host_addr);					/* add local host */
-  hosts++;
-#endif 
-
-  if (((file_name = getenv ("GNU_SECURE")) != NULL &&    /* security file  */
-       (host_file = fopen (file_name, "r")) != NULL))	/* opened ok */
-    {
-      while ((fscanf (host_file, "%s", hostname) != EOF))	/* find a host */
-	if (((long) host_addr = glibtop_internet_addr (hostname)) != -1)/* get its addr */
-	  {
-	    add_host (host_addr);				/* add the addr */
-	    hosts++;
-	  }
-      fclose (host_file);
-    } /* if */
-
-  return hosts;
-} /* setup_table */
-
-
-/*
-  internet_init -- initialize server, returning an internet socket that can
-                    be listened on.
-*/
-static int
-internet_init (void)
-{
-  int ls;			/* socket descriptor */
-  struct servent *sp;		/* pointer to service information */
-  struct sockaddr_in server;	/* for local socket address */
-  char *ptr;			/* ptr to return from getenv */
-
-  if (setup_table() == 0) 
-    return -1;
-
-  /* clear out address structure */
-  memset((char *)&server, 0, sizeof (struct sockaddr_in));
-  
-  /* Set up address structure for the listen socket. */
-  server.sin_family = AF_INET;
-  server.sin_addr.s_addr = INADDR_ANY;
-
-  /* Find the information for the gnu server
-   * in order to get the needed port number.
-   */
-  if ((ptr = getenv ("GNU_PORT")) != NULL)
-    server.sin_port = htons (atoi (ptr));
-  else if ((sp = getservbyname ("gnuserv", "tcp")) == NULL)
-    server.sin_port = htons (DEFAULT_PORT+getuid());
-  else
-    server.sin_port = sp->s_port;
-  
-  /* Create the listen socket. */
-  if ((ls = socket (AF_INET,SOCK_STREAM, 0)) == -1)
-    glibtop_error_io ("unable to create socket");
-  
-  /* Bind the listen address to the socket. */
-  if (bind(ls,(struct sockaddr *) &server,sizeof(struct sockaddr_in)) == -1)
-    glibtop_error_io ("bind");
-
-  /* Initiate the listen on the socket so remote users
-   * can connect. 
-   */
-  if (listen(ls,20) == -1)
-    glibtop_error_io ("listen");
-
-  return(ls);
-
-} /* internet_init */
-
-
-/*
-  handle_internet_request -- accept a request from a client and send the information
-                             to stdout (the gnu process).
-*/
-static void
-handle_internet_request (int ls)
-{
-  int s;
-  size_t addrlen = sizeof(struct sockaddr_in);
-  struct sockaddr_in peer;	/* for peer socket address */
-
-  memset((char *)&peer, 0, sizeof (struct sockaddr_in));
-
-  if ((s = accept (ls, (struct sockaddr *)&peer, (void *) &addrlen)) == -1)
-    glibtop_error_io ("accept");
-
-#ifdef DEBUG
-  fprintf (stderr, "Connection was made from %s.\n", inet_ntoa (peer.sin_addr));
-#endif
-  
-  /* Check that access is allowed - if not return crud to the client */
-  if (!permitted (peer.sin_addr.s_addr, s))
-    {
-      close(s);
-      glibtop_warn ("Refused connection from %s.", inet_ntoa (peer.sin_addr));
-      return;
-    } /* if */
-
-#ifdef DEBUG
-  fprintf (stderr, "Accepted connection from %s.\n", inet_ntoa (peer.sin_addr));
-#endif
-
-  handle_socket_connection (&glibtop_global_server, s);
-
-  close (s);
-
-#ifdef DEBUG
-  fprintf (stderr, "Closed connection to %s.\n", inet_ntoa (peer.sin_addr));
-#endif
-  
-} /* handle_internet_request */
-#endif /* INTERNET_DOMAIN_SOCKETS */
-
-
-#ifdef UNIX_DOMAIN_SOCKETS
-/*
-  unix_init -- initialize server, returning an unix-domain socket that can
-               be listened on.
-*/
-static int
-unix_init (void)
-{
-  int ls;			/* socket descriptor */
-  struct sockaddr_un server; 	/* unix socket address */
-  int bindlen;
-
-  if ((ls = socket (AF_UNIX,SOCK_STREAM, 0)) < 0)
-    glibtop_error_io ("unable to create socket");
-
-  /* Set up address structure for the listen socket. */
-#ifdef HIDE_UNIX_SOCKET
-  sprintf (server.sun_path, "/tmp/lgtddir%d", (int)geteuid());
-  if (mkdir (server.sun_path, 0700) < 0)
-    {
-      /* assume it already exists, and try to set perms */
-      if (chmod (server.sun_path, 0700) < 0)
-	glibtop_error_io ("Can't set permissions on %s", server.sun_path);
-    }
-  strcat(server.sun_path, "/lgtd");
-  unlink(server.sun_path);	/* remove old file if it exists */
-#else /* HIDE_UNIX_SOCKET */
-  sprintf(server.sun_path, "/tmp/lgtd%d", (int)geteuid());
-  unlink(server.sun_path);	/* remove old file if it exists */
-#endif /* HIDE_UNIX_SOCKET */
-
-  server.sun_family = AF_UNIX;
-#ifdef HAVE_SOCKADDR_SUN_LEN
-  /* See W. R. Stevens "Advanced Programming in the Unix Environment"
-     p. 502 */
-  bindlen = (sizeof (server.sun_len) + sizeof (server.sun_family)
-	     + strlen (server.sun_path) + 1);
-  server.sun_len = bindlen;
-#else
-  bindlen = strlen (server.sun_path) + sizeof (server.sun_family);
-#endif
- 
-  if (bind (ls, (struct sockaddr *)&server, bindlen) < 0)
-    glibtop_error_io ("bind");
-
-  chmod(server.sun_path,0700);	/* only this user can send commands */
-
-  if (listen(ls,20) < 0)
-    glibtop_error_io ("listen");
-
-  /* #### there are also better ways of dealing with this when
-     sigvec() is present. */
-#if  defined (HAVE_SIGPROCMASK)
-  {						
-  sigset_t _mask;
-  sigemptyset (&_mask);
-  sigaddset (&_mask, SIGPIPE);
-  sigprocmask (SIG_BLOCK, &_mask, NULL);
-  }
-#else
-  signal (SIGPIPE, SIG_IGN);	/* in case user kills client */
-#endif
-
-  return (ls);
-
-} /* unix_init */
-
-
-/*
-  handle_unix_request -- accept a request from a client and send the information
-                         to stdout (the gnu process).
-*/
-static void
-handle_unix_request (int ls)
-{
-  int s;
-  size_t len = sizeof(struct sockaddr_un);
-  struct sockaddr_un server; 	/* for unix socket address */
-
-  server.sun_family = AF_UNIX;
-
-  if ((s = accept (ls, (struct sockaddr *)&server, (void *)&len)) < 0)
-    glibtop_error_io ("accept");
-
-  echo_request(s);
-  
-} /* handle_unix_request */
-#endif /* UNIX_DOMAIN_SOCKETS */
-
-
-int
-main(argc,argv)
-     int argc;
-     char *argv[];
-{
-  int chan;			/* temporary channel number */
-  int ils = -1;			/* internet domain listen socket */
-  int uls = -1;			/* unix domain listen socket */
-#ifdef SYSV_IPC
-  struct msgbuf *msgp;		/* message buffer */
-#endif /* SYSV_IPC */
-
-  glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_OPEN_NO_OVERRIDE);
-
-  for(chan=3; chan < _NFILE; close(chan++)) /* close unwanted channels */
-    ;
-
-#ifdef SYSV_IPC
-  ipc_init(&msgp);		/* get a msqid to listen on, and a message buffer */
-#endif /* SYSV_IPC */
-
-#ifdef INTERNET_DOMAIN_SOCKETS
-  ils = internet_init();	/* get a internet domain socket to listen on */
-#endif /* INTERNET_DOMAIN_SOCKETS */
-
-#ifdef UNIX_DOMAIN_SOCKETS
-  uls = unix_init();		/* get a unix domain socket to listen on */
-#endif /* UNIX_DOMAIN_SOCKETS */
-
-  while (1) {
-#ifdef SYSV_IPC
-    handle_ipc_request(msgp);
-#else /* NOT SYSV_IPC */
-    fd_set rmask;
-    FD_ZERO(&rmask);
-    FD_SET(fileno(stdin), &rmask);
-    if (uls >= 0)
-      FD_SET(uls, &rmask);
-    if (ils >= 0)
-      FD_SET(ils, &rmask);
-
-#ifdef DEBUG
-    fprintf (stderr, "Server ready and waiting for connections.\n");
-#endif
-    
-    if (select(max2(fileno(stdin),max2(uls,ils)) + 1, &rmask, 
-	       (fd_set *)NULL, (fd_set *)NULL, (struct timeval *)NULL) < 0)
-      glibtop_error_io ("select");
-
-#ifdef UNIX_DOMAIN_SOCKETS
-    if (uls > 0 && FD_ISSET(uls, &rmask))
-      handle_unix_request(uls);
-#endif
-
-#ifdef INTERNET_DOMAIN_SOCKETS
-    if (ils > 0 && FD_ISSET(ils, &rmask))
-      handle_internet_request(ils);
-#endif /* INTERNET_DOMAIN_SOCKETS */
-
-    if (FD_ISSET(fileno(stdin), &rmask))      /* from stdin (gnu process) */
-      handle_response();
-#endif /* NOT SYSV_IPC */
-  } /* while */
-
-  return 0;
-} /* main */
-
-#endif /* SYSV_IPC || UNIX_DOMAIN_SOCKETS || INTERNET_DOMAIN_SOCKETS */

src/daemon/main.c

@@ -1,218 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop/gnuserv.h>
-
-#include <glibtop/command.h>
-#include <glibtop/version.h>
-#include <glibtop/xmalloc.h>
-#include <glibtop/union.h>
-#include <glibtop/open.h>
-
-#include <fcntl.h>
-#include <locale.h>
-
-#if defined(HAVE_GETDTABLESIZE)
-#define GET_MAX_FDS() getdtablesize()
-#else
-/* Fallthrough case - please add other #elif cases above
-   for different OS's as necessary */
-#define GET_MAX_FDS() 256
-#endif
-
-#define _offset_union(p)	((char *) &response.u.p - (char *) &response)
-#define _offset_data(p)		_offset_union (data.p)
-
-static void
-do_output (int s, glibtop_response *response, off_t offset,
-	   size_t data_size, const void *data)
-{
-#ifdef REAL_DEBUG
-	fprintf (stderr, "Really writing %d bytes at offset %d.\n",
-		 sizeof (glibtop_response), offset);
-#endif
-
-	response->offset = offset;
-	response->data_size = data_size;
-	
-	if (send (s, response, sizeof (glibtop_response), 0) < 0)
-		glibtop_warn_io ("send");
-
-	if (response->data_size) {
-#ifdef REAL_DEBUG
-		fprintf (stderr, "Writing %d bytes of data.\n", response->data_size);
-#endif
-
-		if (send (s, data, response->data_size, 0) , 0)
-			glibtop_warn_io ("send");
-	}
-}
-
-static void
-do_read (int s, void *ptr, size_t total_size)
-{
-	int nread;
-	size_t already_read = 0, remaining = total_size;
-
-	while (already_read < total_size) {
-		nread = recv (s, ptr, remaining, 0);
-
-		if (nread <= 0) {
-			glibtop_error_io ("recv");
-			return;
-		}
-
-		already_read += nread;
-		remaining -= nread;
-		(char *) ptr += nread;
-
-		fprintf (stderr, "READ (%d): %d - %d - %d\n",
-			 nread, already_read, remaining, total_size);
-	}
-}
-
-void
-handle_socket_connection (glibtop *server, int s)
-{
-	pid_t pid;
-	char parameter [BUFSIZ];
-	struct timeval tv;
-	glibtop_response response;
-	glibtop_command cmnd;
-	void *ptr;
-
-	tv.tv_sec = 5;
-	tv.tv_usec = 0;
-  
-	while(1) {
-		do_read (s, &cmnd, sizeof (glibtop_command));
-
-#ifdef REAL_DEBUG
-		fprintf (stderr, "Received command %d from client.\n", cmnd.command);
-#endif
-
-		if (cmnd.data_size >= BUFSIZ) {
-			glibtop_warn ("Client sent %d bytes, but buffer is %d", cmnd.size, BUFSIZ);
-			return;
-		}
-
-		memset (parameter, 0, sizeof (parameter));
-    
-		if (cmnd.data_size) {
-#ifdef REAL_DEBUG
-			fprintf (stderr, "Client has %d bytes of data.\n", cmnd.data_size);
-#endif
-
-			do_read (s, parameter, cmnd.data_size);
-
-		} else if (cmnd.size) {
-			memcpy (parameter, cmnd.parameter, cmnd.size);
-		}
-    
-		switch (cmnd.command) {
-		case GLIBTOP_CMND_SYSDEPS:
-			response.u.sysdeps.features = GLIBTOP_SYSDEPS_ALL;
-			do_output (s, &response, _offset_union (sysdeps), 0, NULL);
-			break;
-		case GLIBTOP_CMND_CPU:
-			glibtop_get_cpu_l (server, &response.u.data.cpu);
-			do_output (s, &response, _offset_data (cpu), 0, NULL);
-			break;
-		case GLIBTOP_CMND_MEM:
-			glibtop_get_mem_l (server, &response.u.data.mem);
-			do_output (s, &response, _offset_data (mem), 0, NULL);
-			break;
-		case GLIBTOP_CMND_SWAP:
-			glibtop_get_swap_l (server, &response.u.data.swap);
-			do_output (s, &response, _offset_data (swap), 0, NULL);
-			break;
-		case GLIBTOP_CMND_UPTIME:
-			glibtop_get_uptime_l (server, &response.u.data.uptime);
-			do_output (s, &response, _offset_data (uptime), 0, NULL);
-			break;
-		case GLIBTOP_CMND_LOADAVG:
-			glibtop_get_loadavg_l (server, &response.u.data.loadavg);
-			do_output (s, &response, _offset_data (loadavg), 0, NULL);
-			break;
-		case GLIBTOP_CMND_SHM_LIMITS:
-			glibtop_get_shm_limits_l (server, &response.u.data.shm_limits);
-			do_output (s, &response, _offset_data (shm_limits), 0, NULL);
-			break;
-		case GLIBTOP_CMND_MSG_LIMITS:
-			glibtop_get_msg_limits_l (server, &response.u.data.msg_limits);
-			do_output (s, &response, _offset_data (msg_limits), 0, NULL);
-			break;
-		case GLIBTOP_CMND_SEM_LIMITS:
-			glibtop_get_sem_limits_l (server, &response.u.data.sem_limits);
-			do_output (s, &response, _offset_data (sem_limits), 0, NULL);
-			break;
-		case GLIBTOP_CMND_PROCLIST:
-			ptr = glibtop_get_proclist_l (server, &response.u.data.proclist);
-			do_output (s, &response, _offset_data (proclist),
-				   response.u.data.proclist.total, ptr);
-			glibtop_free_r (server, ptr);
-			break;
-		case GLIBTOP_CMND_PROC_STATE:
-			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_state_l
-				(server, &response.u.data.proc_state, pid);
-			do_output (s, &response, _offset_data (proc_state), 0, NULL);
-			break;
-		case GLIBTOP_CMND_PROC_UID:
-			pid = 1;
-			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_uid_l
-				(server, &response.u.data.proc_uid, pid);
-			do_output (s, &response, _offset_data (proc_uid), 0, NULL);
-			break;
-		case GLIBTOP_CMND_PROC_MEM:
-			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_mem_l
-				(server, &response.u.data.proc_mem, pid);
-			do_output (s, &response, _offset_data (proc_mem), 0, NULL);
-			break;
-		case GLIBTOP_CMND_PROC_TIME:
-			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_time_l
-				(server, &response.u.data.proc_time, pid);
-			do_output (s, &response, _offset_data (proc_time), 0, NULL);
-			break;
-		case GLIBTOP_CMND_PROC_SIGNAL:
-			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_signal_l
-				(server, &response.u.data.proc_signal, pid);
-			do_output (s, &response, _offset_data (proc_signal), 0, NULL);
-			break;
-		case GLIBTOP_CMND_PROC_KERNEL:
-			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_kernel_l
-				(server, &response.u.data.proc_kernel, pid);
-			do_output (s, &response, _offset_data (proc_kernel), 0, NULL);
-			break;
-		case GLIBTOP_CMND_PROC_SEGMENT:
-			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_segment_l
-				(server, &response.u.data.proc_segment, pid);
-			do_output (s, &response, _offset_data (proc_segment), 0, NULL);
-			break;
-		}
-	}
-}

src/proxy/.cvsignore

@@ -1,5 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-gtop_proxy

src/proxy/Makefile.am

@@ -1,16 +0,0 @@
-LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-
-INCLUDES			= -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
-				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
-				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
-
-CFLAGS				= -Wall -W @CFLAGS@ -DGTOP_SERVER=\""@LIBGTOP_SERVER@"\"
-
-bin_PROGRAMS			= gtop_proxy
-
-gtop_proxy_SOURCES		= main.c output.c version.c
-gtop_proxy_LDADD		= $(top_builddir)/lib/libgtop.la \
-				  $(top_builddir)/sysdeps/common/libgtop_common.la \
-				  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
-				  @INTLLIBS@ @LIBSUPPORT@ @libs_xauth@
-gtop_proxy_LDFLAGS		= -static

src/proxy/main.c

@@ -1,234 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop/command.h>
-#include <glibtop/version.h>
-#include <glibtop/xmalloc.h>
-#include <glibtop/union.h>
-#include <glibtop/open.h>
-
-#include <fcntl.h>
-#include <locale.h>
-
-#if defined(HAVE_GETDTABLESIZE)
-#define GET_MAX_FDS() getdtablesize()
-#else
-/* Fallthrough case - please add other #elif cases above
-   for different OS's as necessary */
-#define GET_MAX_FDS() 256
-#endif
-
-int
-main(int argc, char *argv[])
-{
-	pid_t pid;
-	int fd, max_fd, nread;
-	size_t size, dsize;
-	char parameter [BUFSIZ];
-	glibtop_union data;
-	glibtop_command cmnd;
-	glibtop_sysdeps sysdeps;
-	glibtop server;
-	void *ptr;
-
-	setlocale (LC_ALL, "");
-	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
-	textdomain (PACKAGE);
-
-	glibtop_version ();
-
-	glibtop_open_l (&server, argv [0], 0, GLIBTOP_OPEN_NO_OVERRIDE);
-
-	/* close all file descriptors except ones used by the pipes (0 and 1). */
-	max_fd = GET_MAX_FDS();
-	for(fd = 3 /* The first fd after the pipes */; fd < max_fd; fd++)
-		close(fd);
-	
-	while(1) {
-		/* block on read from client */
-		/* fprintf (stderr, "waiting for input ...\n"); */
-		nread = read (0, &size, sizeof (size_t));
-
-		/* will return 0 if parent exits. */
-
-		if (nread == 0)
-			_exit(0);
-
-		if (nread != sizeof (size_t))
-			_exit(1);
-
-		if (size != sizeof (glibtop_command))
-			_exit(2);
-
-		nread = read (0, &cmnd, size);
-		
-		/* will return 0 if parent exits. */
-
-		if (nread == 0)
-			_exit(0);
-		
-		if (nread < 0)
-			_exit(1);
-
-		nread = read (0, &dsize, sizeof (size_t));
-
-		/* will return 0 if parent exits. */
-
-		if (nread == 0)
-			_exit(0);
-		
-		if (nread < 0)
-			_exit(1);
-
-		if (dsize >= BUFSIZ)
-			_exit(3);
-
-		memset (parameter, 0, sizeof (parameter));
-
-		if (dsize) {
-			nread = read (0, parameter, dsize);
-		
-			/* will return 0 if parent exits. */
-
-			if (nread == 0)
-				_exit(0);
-		
-			if (nread < 0)
-				_exit(1);
-		}
-
-		switch (cmnd.command) {
-		case GLIBTOP_CMND_SYSDEPS:
-			sysdeps.features = GLIBTOP_SYSDEPS_ALL;
-			glibtop_output (sizeof (glibtop_sysdeps), &sysdeps);
-			glibtop_output (0, NULL);
-			break;
-		case GLIBTOP_CMND_CPU:
-			glibtop_get_cpu_l (&server, &data.cpu);
-			glibtop_output (sizeof (glibtop_cpu), &data.cpu);
-			glibtop_output (0, NULL);
-			break;
-		case GLIBTOP_CMND_MEM:
-			glibtop_get_mem_l (&server, &data.mem);
-			glibtop_output (sizeof (glibtop_mem), &data.mem);
-			glibtop_output (0, NULL);
-			break;
-		case GLIBTOP_CMND_SWAP:
-			glibtop_get_swap_l (&server, &data.swap);
-			glibtop_output (sizeof (glibtop_swap), &data.swap);
-			glibtop_output (0, NULL);
-			break;
-		case GLIBTOP_CMND_UPTIME:
-			glibtop_get_uptime_l (&server, &data.uptime);
-			glibtop_output (sizeof (glibtop_uptime), &data.uptime);
-			glibtop_output (0, NULL);
-			break;
-		case GLIBTOP_CMND_LOADAVG:
-			glibtop_get_loadavg_l (&server, &data.loadavg);
-			glibtop_output (sizeof (glibtop_loadavg), &data.loadavg);
-			glibtop_output (0, NULL);
-			break;
-		case GLIBTOP_CMND_SHM_LIMITS:
-			glibtop_get_shm_limits_l (&server, &data.shm_limits);
-			glibtop_output (sizeof (glibtop_shm_limits),
-					&data.shm_limits);
-			glibtop_output (0, NULL);
-			break;
-		case GLIBTOP_CMND_MSG_LIMITS:
-			glibtop_get_msg_limits_l (&server, &data.msg_limits);
-			glibtop_output (sizeof (glibtop_msg_limits),
-					&data.msg_limits);
-			glibtop_output (0, NULL);
-			break;
-		case GLIBTOP_CMND_SEM_LIMITS:
-			glibtop_get_sem_limits_l (&server, &data.sem_limits);
-			glibtop_output (sizeof (glibtop_sem_limits),
-					&data.sem_limits);
-			glibtop_output (0, NULL);
-			break;
-		case GLIBTOP_CMND_PROCLIST:
-			ptr = glibtop_get_proclist_l (&server, &data.proclist);
-			glibtop_output (sizeof (glibtop_proclist),
-					&data.proclist);
-			glibtop_output (data.proclist.total, ptr);
-			glibtop_free_r (&server, ptr);
-			break;
-		case GLIBTOP_CMND_PROC_STATE:
-			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_state_l
-				(&server, &data.proc_state, pid);
-			glibtop_output (sizeof (glibtop_proc_state),
-					&data.proc_state);
-			glibtop_output (0, NULL);
-			break;
-		case GLIBTOP_CMND_PROC_UID:
-			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_uid_l
-				(&server, &data.proc_uid, pid);
-			glibtop_output (sizeof (glibtop_proc_uid),
-					&data.proc_uid);
-			glibtop_output (0, NULL);
-			break;
-		case GLIBTOP_CMND_PROC_MEM:
-			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_mem_l
-				(&server, &data.proc_mem, pid);
-			glibtop_output (sizeof (glibtop_proc_mem),
-					&data.proc_mem);
-			glibtop_output (0, NULL);
-			break;
-		case GLIBTOP_CMND_PROC_TIME:
-			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_time_l
-				(&server, &data.proc_time, pid);
-			glibtop_output (sizeof (glibtop_proc_time),
-					&data.proc_time);
-			glibtop_output (0, NULL);
-			break;
-		case GLIBTOP_CMND_PROC_SIGNAL:
-			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_signal_l
-				(&server, &data.proc_signal, pid);
-			glibtop_output (sizeof (glibtop_proc_signal),
-					&data.proc_signal);
-			glibtop_output (0, NULL);
-			break;
-		case GLIBTOP_CMND_PROC_KERNEL:
-			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_kernel_l
-				(&server, &data.proc_kernel, pid);
-			glibtop_output (sizeof (glibtop_proc_kernel),
-					&data.proc_kernel);
-			glibtop_output (0, NULL);
-			break;
-		case GLIBTOP_CMND_PROC_SEGMENT:
-			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_segment_l
-				(&server, &data.proc_segment, pid);
-			glibtop_output (sizeof (glibtop_proc_segment),
-					&data.proc_segment);
-			glibtop_output (0, NULL);
-			break;
-
-		}
-	}
-	_exit(0);
-}

src/server/main.c

@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
 
 	setreuid (uid, euid); setregid (gid, egid);
 	
-	glibtop_open_r (&server, argv [0], 0, 0);
+	glibtop_open (&server, argv [0]);
 
 	if (setreuid (euid, uid)) _exit (1);
 
@@ -142,146 +142,112 @@ int main(int argc, char *argv[])
 
 		switch (cmnd.command) {
 		case GLIBTOP_CMND_SYSDEPS:
-			sysdeps.features = GLIBTOP_SYSDEPS_ALL;
+			glibtop_get_sysdeps__r (&server, &sysdeps);
 			glibtop_output (sizeof (glibtop_sysdeps), &sysdeps);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_CPU:
-#if GLIBTOP_SUID_CPU
+			glibtop_get_cpu__r (&server, &data.cpu);
-			glibtop_get_cpu_p (&server, &data.cpu);
-#endif
 			glibtop_output (sizeof (glibtop_cpu), &data.cpu);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_MEM:
-#if GLIBTOP_SUID_MEM
+			glibtop_get_mem__r (&server, &data.mem);
-			glibtop_get_mem_p (&server, &data.mem);
-#endif
 			glibtop_output (sizeof (glibtop_mem), &data.mem);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_SWAP:
-#if GLIBTOP_SUID_SWAP
+			glibtop_get_swap__r (&server, &data.swap);
-			glibtop_get_swap_p (&server, &data.swap);
-#endif
 			glibtop_output (sizeof (glibtop_swap), &data.swap);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_UPTIME:
-#if GLIBTOP_SUID_UPTIME
+			glibtop_get_uptime__r (&server, &data.uptime);
-			glibtop_get_uptime_p (&server, &data.uptime);
-#endif
 			glibtop_output (sizeof (glibtop_uptime), &data.uptime);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_LOADAVG:
-#if GLIBTOP_SUID_LOADAVG
+			glibtop_get_loadavg__r (&server, &data.loadavg);
-			glibtop_get_loadavg_p (&server, &data.loadavg);
-#endif
 			glibtop_output (sizeof (glibtop_loadavg), &data.loadavg);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_SHM_LIMITS:
-#if GLIBTOP_SUID_SHM_LIMITS
+			glibtop_get_shm_limits__r (&server, &data.shm_limits);
-			glibtop_get_shm_limits_p (&server, &data.shm_limits);
-#endif
 			glibtop_output (sizeof (glibtop_shm_limits),
 					&data.shm_limits);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_MSG_LIMITS:
-#if GLIBTOP_SUID_MSG_LIMITS
+			glibtop_get_msg_limits__r (&server, &data.msg_limits);
-			glibtop_get_msg_limits_p (&server, &data.msg_limits);
-#endif
 			glibtop_output (sizeof (glibtop_msg_limits),
 					&data.msg_limits);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_SEM_LIMITS:
-#if GLIBTOP_SUID_SEM_LIMITS
+			glibtop_get_sem_limits__r (&server, &data.sem_limits);
-			glibtop_get_sem_limits_p (&server, &data.sem_limits);
-#endif
 			glibtop_output (sizeof (glibtop_sem_limits),
 					&data.sem_limits);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_PROCLIST:
-#if GLIBTOP_SUID_PROCLIST
+			ptr = glibtop_get_proclist__r (&server, &data.proclist);
-			ptr = glibtop_get_proclist_p (&server, &data.proclist);
-#else
-			ptr = NULL;
-#endif
 			glibtop_output (sizeof (glibtop_proclist),
 					&data.proclist);
 			glibtop_output (data.proclist.total, ptr);
-			glibtop_free_r (&server, ptr);
+			glibtop_free__r (&server, ptr);
 			break;
 		case GLIBTOP_CMND_PROC_STATE:
 			memcpy (&pid, parameter, sizeof (pid_t));
-#if GLIBTOP_SUID_PROC_STATE
+			glibtop_get_proc_state__r
-			glibtop_get_proc_state_p
 				(&server, &data.proc_state, pid);
-#endif
 			glibtop_output (sizeof (glibtop_proc_state),
 					&data.proc_state);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_PROC_UID:
 			memcpy (&pid, parameter, sizeof (pid_t));
-#if GLIBTOP_SUID_PROC_UID
+			glibtop_get_proc_uid__r
-			glibtop_get_proc_uid_p
 				(&server, &data.proc_uid, pid);
-#endif
 			glibtop_output (sizeof (glibtop_proc_uid),
 					&data.proc_uid);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_PROC_MEM:
 			memcpy (&pid, parameter, sizeof (pid_t));
-#if GLIBTOP_SUID_PROC_MEM
+			glibtop_get_proc_mem__r
-			glibtop_get_proc_mem_p
 				(&server, &data.proc_mem, pid);
-#endif
 			glibtop_output (sizeof (glibtop_proc_mem),
 					&data.proc_mem);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_PROC_TIME:
 			memcpy (&pid, parameter, sizeof (pid_t));
-#if GLIBTOP_SUID_PROC_TIME
+			glibtop_get_proc_time__r
-			glibtop_get_proc_time_p
 				(&server, &data.proc_time, pid);
-#endif
 			glibtop_output (sizeof (glibtop_proc_time),
 					&data.proc_time);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_PROC_SIGNAL:
 			memcpy (&pid, parameter, sizeof (pid_t));
-#if GLIBTOP_SUID_PROC_SIGNAL
+			glibtop_get_proc_signal__r
-			glibtop_get_proc_signal_p
 				(&server, &data.proc_signal, pid);
-#endif
 			glibtop_output (sizeof (glibtop_proc_signal),
 					&data.proc_signal);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_PROC_KERNEL:
 			memcpy (&pid, parameter, sizeof (pid_t));
-#if GLIBTOP_SUID_PROC_KERNEL
+			glibtop_get_proc_kernel__r
-			glibtop_get_proc_kernel_p
 				(&server, &data.proc_kernel, pid);
-#endif
 			glibtop_output (sizeof (glibtop_proc_kernel),
 					&data.proc_kernel);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_PROC_SEGMENT:
 			memcpy (&pid, parameter, sizeof (pid_t));
-#if GLIBTOP_SUID_PROC_SEGMENT
+			glibtop_get_proc_segment__r
-			glibtop_get_proc_segment_p
 				(&server, &data.proc_segment, pid);
-#endif
 			glibtop_output (sizeof (glibtop_proc_segment),
 					&data.proc_segment);
 			glibtop_output (0, NULL);

sysdeps/Makefile.am

@@ -12,4 +12,4 @@ endif
 
 SUBDIRS			= @sysdeps_dir@ common $(names_SUBDIRS) $(guile_SUBDIRS)
 
-DIST_SUBDIRS		= common guile linux kernel names osf1 stub sun4
+DIST_SUBDIRS		= common guile linux names osf1 stub sun4

sysdeps/common/Makefile.am

@@ -8,4 +8,5 @@ CFLAGS				= -Wall -W @CFLAGS@
 
 lib_LTLIBRARIES			= libgtop_common.la
 
-libgtop_common_la_SOURCES	= sysdeps.c xmalloc.c error.c gnuslib.c
+libgtop_common_la_SOURCES	= sysdeps.c xmalloc.c error.c
+

sysdeps/common/error.c

@@ -24,7 +24,7 @@
 /* Prints error message and exits. */
 
 void
-glibtop_error_r (glibtop *server, char *format, ...)
+glibtop_error__r (glibtop *server, char *format, ...)
 {
 	va_list	ap;
 	
@@ -37,46 +37,3 @@ glibtop_error_r (glibtop *server, char *format, ...)
 	va_end (ap);
 	exit (1);
 }
-
-void
-glibtop_error_io_r (glibtop *server, char *format, ...)
-{
-	va_list	ap;
-	
-	va_start (ap, format);
-	
-	fprintf (stderr, "%s: ", server->name);
-	vfprintf (stderr, format, ap);
-	fprintf (stderr, ": %s\n", strerror (errno));
-	
-	va_end (ap);
-	exit (1);
-}
-
-void
-glibtop_warn_r (glibtop *server, char *format, ...)
-{
-	va_list	ap;
-	
-	va_start (ap, format);
-	
-	fprintf (stderr, "%s: ", server->name);
-	vfprintf (stderr, format, ap);
-	fprintf (stderr, "\n");
-	
-	va_end (ap);
-}
-
-void
-glibtop_warn_io_r (glibtop *server, char *format, ...)
-{
-	va_list	ap;
-	
-	va_start (ap, format);
-	
-	fprintf (stderr, "%s: ", server->name);
-	vfprintf (stderr, format, ap);
-	fprintf (stderr, ": %s\n", strerror (errno));
-	
-	va_end (ap);
-}