Prepared release 2.33.91

libgtop fails to build on musl libc, due to the header
resulting in the headers that would be loaded for libc 5 being
loaded on musl libc.
musl defines headers which are also defined in linux-headers'
in.h, causing redefinition errors.

https://bugzilla.gnome.org/show_bug.cgi?id=760655

Signed-off-by: Benoît Dejean <bdejean@gmail.com>

.gitignore

@@ -1,46 +1,35 @@
-sysdeps/Makefile
+*~
-sysdeps/Makefile.in
+*.bak
-sysdeps/*/Makefile
+*.o
-sysdeps/*/Makefile.in
+*.out
-sysdeps/*/.deps
+*.a
-sysdeps/*/.libs
+*.gmo
-sysdeps/*/*.o
+*.lo
-sysdeps/*/*.lo
+*.la
-sysdeps/*/*.la
+*.core
-src/*/Makefile
+*.s
-src/*/Makefile.in
+*.stamp
-src/*/.deps
+.libs
-src/Makefile
+.deps
-src/Makefile.in
+Makefile
+Makefile.in
+src/daemon/libgtop_daemon2
+src/daemon/libgtop_server2
 stamp-h1
-po/*.gmo
 po/stamp-it
 po/POTFILES
 po/Makefile.in.in
-po/Makefile.in
-po/Makefile
 missing
-misc/Makefile
-misc/Makefile.in
 m4/
 ltmain.sh
 libtool
 libgtopconfig.h
 libgtop.spec
 libgtop-2.0.pc
-lib/Makefile
-lib/Makefile.in
-lib/.deps
-lib/.libs
-lib/*.o
-lib/*.lo
-lib/*.la
 lib/lib.c
 lib/GTop-2.0.gir
 lib/GTop-2.0.typelib
 INSTALL
-Makefile
-Makefile.in
 aclocal.m4
 autom4te.cache/
 config.guess
@@ -52,30 +41,29 @@ config.sub
 configure
 compile
 depcomp
-doc/Makefile
-doc/Makefile.in
 doc/libgtop2.info
 doc/mdate-sh
-doc/reference/Makefile
-doc/reference/Makefile.in
 doc/reference/html/
 doc/reference/libgtop-decl-list.txt
 doc/reference/libgtop-decl.txt
+doc/reference/libgtop-undeclared.txt
+doc/reference/libgtop-undocumented.txt
+doc/reference/libgtop-unused.txt
+doc/reference/libgtop.args
+doc/reference/libgtop.hierarchy
+doc/reference/libgtop.interfaces
+doc/reference/libgtop.prerequisites
+doc/reference/libgtop.signals
 doc/reference/tmpl/
 doc/reference/version.xml
 doc/reference/xml/
 doc/stamp-vti
 doc/texinfo.tex
 doc/version.texi
-examples/.deps/
-examples/.libs/
-examples/*.o
-examples/Makefile
-examples/Makefile.in
 examples/affinity
 examples/df
 examples/first
-examples/mem
+examples/free
 examples/mountlist
 examples/netlist
 examples/netload
@@ -90,10 +78,6 @@ examples/sysdeps
 examples/timings
 examples/wd
 gtk-doc.make
-include/Makefile
-include/Makefile.in
-include/glibtop/Makefile
-include/glibtop/Makefile.in
 install-sh
 intltool-extract.in
 intltool-merge.in

NEWS

@@ -1,3 +1,79 @@
+29 February 2016: Overview of changes in 2.33.91
+
+* Updated translations
+* Fix building on must-libc
+
+18 January 2016: Overview of changes in 2.33.4
+
+* On OpenBSD only PID 1 is special
+* Call setlocale in main
+
+14 December: Overview of changes in 2.33.3
+
+* Fixed borken compilation on OpenBSD 
+* Updated translations.
+
+21 September 2015: Overview of changes in 2.32.0
+
+* Stable release
+
+14 September 2015: Overview of changes in 2.31.91
+================================================
+* Darwin:
+  - Fixed build.
+
+* All
+  - GI docs fixes
+  - include fixes
+  - Updated translations
+
+16 August 2015: Overview of changes in 2.31.90
+=============================================
+* ABI changes:
+  - ABI was inconsistent on platforms like FreeBSD which make use of
+    glibtop_machine. The ABI was actually different between the
+    library and the server. Fixed this by simply always defining
+    glibtop_machine in glibtop struct.
+  - Add Pss and Swap members in glibtop_proc_mem.
+  - This is the second ABI breakage in since 2.28 (the first one was
+    bumping NCPU), there were no release for 2.30.
+
+* FreeBSD:
+  - proclist: exclude the "idle" kernel process when GLIBTOP_EXCLUDE_IDLE.
+  - Remove extraneous glibtop_init() calls.
+
+* Linux:
+  - proc_mem: implement Pss and Swap.
+  - Remove extraneous glibtop_init() calls.
+
+* All:
+  - Propagate the change that machine in struct glibtop is now a
+    pointer. Hope that change doesn't break build on other platforms,
+    I can only test Linux and FreeBSD.
+
+
+5 August 2015: Overview of changes in 2.31.4
+=============================================
+* 71 commits !
+* Implement a proper --enable-debug mode.
+* FreeBSD:
+	- procstate: set process name for kernel (pid=0)
+	- procmap: get dev/inode for ZFS (no filename yet)
+	- mem: rework memory usage to something more meaningful
+	- proclist: don't report threads
+	- proctime: fix CPU times
+* Linux:
+	- mem: use MemAvailable when available
+	- mem: match `free`, report Slab as Cached.
+	- support for x.y versionsmemory to match `free`
+* Fix a lot of GI tags: it now works without crashing.
+* Server and daemon binaries are now dynamically linked against their libgtop.
+* Update a lot of examples/.
+* Clean up some very old code.
+* Updated translations.
+
+Special thanks to Ting-Wei Lan for providing patches and feedback on FreeBSD.
+
 22 June 2015: Overview of changes in 2.31.3
 =============================================
 * Numerous OpenBSD backend fixes.

configure.ac

@@ -3,8 +3,8 @@ dnl Configure script for the Gnome library
 dnl
 
 m4_define([libgtop_major_version], [2])
-m4_define([libgtop_minor_version], [31])
+m4_define([libgtop_minor_version], [33])
-m4_define([libgtop_micro_version], [3])
+m4_define([libgtop_micro_version], [91])
 m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version])
 
 dnl  increment if the interface has additions, changes, removals.
@@ -34,6 +34,7 @@ AC_CONFIG_HEADERS(config.h)
 AC_CANONICAL_HOST
 
 AM_INIT_AUTOMAKE([-Wno-portability tar-ustar no-dist-gzip dist-xz])
+AM_SILENT_RULES([yes])
 AC_CONFIG_MACRO_DIR([m4])
 GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
@@ -262,7 +263,8 @@ dnl Debugging
 AC_ARG_ENABLE(debug,
               AS_HELP_STRING([--enable-debug],
                              [Turn on debugging @<:@default=no@:>@]),
-              AC_DEFINE(LIBGTOP_ENABLE_DEBUG, 1, [Define to enable debugging]))
+              AC_DEFINE(LIBGTOP_ENABLE_DEBUG, 1, [Define to enable debugging]),
+              AC_DEFINE(LIBGTOP_ENABLE_DEBUG, 0, [Define to disable debugging]))
 AC_ARG_ENABLE(fatal-warnings,
               AS_HELP_STRING([--enable-fatal-warnings],
                              [Make all warnings fatal @<:@debug=no@:>@]),
@@ -273,14 +275,6 @@ dnl These definitions are expanded in make.
 LIBGTOP_LIBS='-L$(libdir)'
 LIBGTOP_INCS='-I$(includedir)/libgtop-2.0'
 
-if test x$libgtop_use_machine_h = xyes ; then
-  LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_GLIBTOP_MACHINE_H"
-fi
-
-if test x$libgtop_smp = xyes ; then
-  LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SMP"
-fi
-
 if test x$libgtop_have_sysinfo = xyes ; then
   LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SYSINFO"
 fi
@@ -309,24 +303,17 @@ LIBGTOP_EXTRA_LIBS="$GLIB_LIBS $LIBGTOP_EXTRA_LIBS"
 
 LIBGTOP_LIBS="$LIBGTOP_LIBS"
 
-LIBGTOP_LIBS="$LIBGTOP_LIBS" 
-
-machine_incs="-I\$(top_srcdir)/sysdeps/$sysdeps_dir"
-
-AC_SUBST(machine_incs)
-
 if test "$GCC" = "yes" ; then
         CFLAGS="\
 	-Winline \
 	-Wall \
-	-std=gnu89 \
 	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
 	-Wnested-externs -Wpointer-arith \
 	-Wcast-align -Wsign-compare \
 	$CFLAGS"
 fi
 
-INCLUDES="-I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $GLIB_CFLAGS $X_CFLAGS"
+AM_CPPFLAGS="-I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $GLIB_CFLAGS $X_CFLAGS"
 
 # Add various defines to the config.h file ...
 AH_VERBATIM([_GNU_SOURCE],
@@ -345,7 +332,7 @@ AC_DEFINE([LIBGTOP_VERSION_CODE], [libgtop_version_code],
 AC_DEFINE_UNQUOTED([LIBGTOP_SERVER], ["$LIBGTOP_SERVER"],
                    [The path to the libgtop server])
 
-AC_SUBST(INCLUDES)
+AC_SUBST(AM_CPPFLAGS)
 
 AC_SUBST(LIBGTOP_EXTRA_LIBS)
 AC_SUBST(GLIB_LIBS)

doc/reference/Makefile.am

@@ -46,9 +46,9 @@ HTML_IMAGES=
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
 # Only needed if you are using gtkdoc-scangobj to dynamically query widget
 # signals and properties.
-# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+# e.g. AM_CPPFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES=
+AM_CPPFLAGS=
 GTKDOC_LIBS=
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.

examples/Makefile.am

@@ -4,7 +4,7 @@ AM_LDFLAGS			= $(LIBGTOP_EXTRA_LIBS)
 
 noinst_PROGRAMS	= 	first second pprint procargs df netlist \
 			  mountlist procmap netload sysdeps timings \
-			  openfiles smp proclist mem wd affinity
+			  openfiles smp proclist free wd affinity
 
 first_SOURCES		= first.c
 first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
@@ -51,8 +51,8 @@ proclist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 wd_SOURCES	= wd.c
 wd_LDADD	= $(top_builddir)/lib/libgtop-2.0.la
 
-mem_SOURCE	= mem.c
+free_SOURCE	= mem.c
-mem_LDADD	= $(top_builddir)/lib/libgtop-2.0.la
+free_LDADD	= $(top_builddir)/lib/libgtop-2.0.la
 
 affinity_SOURCES	= affinity.c
 affinity_LDADD	= $(top_builddir)/lib/libgtop-2.0.la

examples/df.c

@@ -13,19 +13,36 @@ static void print_fsusage(const char *mountpoint)
 {
   glibtop_fsusage buf;
 
+  enum { SIZE, USED, FREE, AVAIL, READ, WRITE, MAX };
+  char **a = g_new0(char*, MAX);
+
   glibtop_get_fsusage(&buf, mountpoint);
 
-  printf("%-30s %10llu %10llu %10llu %5.1f %10llu %10llu\n",
-	 mountpoint,
-	 buf.blocks * buf.block_size >> 20,
-	 (buf.blocks - buf.bavail) * buf.block_size >> 20,
-	 buf.bavail * buf.block_size >> 20,
-	 (buf.blocks - buf.bavail) * 100.0 / (buf.blocks ? buf.blocks : 1.0),
-	 buf.read,
-	 buf.write
-	 );
-}
 
+#define I(X) a[(X)]
+  I(SIZE)  = g_format_size_full(buf.blocks * buf.block_size, G_FORMAT_SIZE_IEC_UNITS);
+  I(USED)  = g_format_size_full((buf.blocks - buf.bavail)  * buf.block_size, G_FORMAT_SIZE_IEC_UNITS);
+  I(FREE)  = g_format_size_full(buf.bfree * buf.block_size, G_FORMAT_SIZE_IEC_UNITS);
+  I(AVAIL) = g_format_size_full(buf.bavail * buf.block_size, G_FORMAT_SIZE_IEC_UNITS);
+  I(READ)  = g_format_size_full(buf.read, G_FORMAT_SIZE_IEC_UNITS);
+  I(WRITE) = g_format_size_full(buf.write, G_FORMAT_SIZE_IEC_UNITS);
+
+  printf("%#7x %10s %10s %10s %10s %5.1f%% %10s %10s %8lu %8lu %s\n",
+    (unsigned)buf.flags,
+    I(SIZE),
+    I(USED),
+    I(FREE),
+    I(AVAIL),
+    (buf.blocks - buf.bavail) * 100.0 / (buf.blocks ? buf.blocks : 1.0),
+    I(READ),
+    I(WRITE),
+    (unsigned long)buf.files,
+    (unsigned long)buf.ffree,
+    mountpoint
+    );
+
+  g_strfreev(a);
+}
 
 int main(int argc, char **argv)
 {
@@ -33,8 +50,8 @@ int main(int argc, char **argv)
 
   glibtop_init();
 
-  printf("%-30s %10s %10s %10s %5s %10s %10s\n",
+  printf("%-6s %10s %10s %10s %10s %5s %10s %10s %10s %10s %s\n",
-	 "Filesystem", "Size", "Used", "Avail", "Use%", "Read", "Write");
+	 "(flags)", "Size", "Used", "Free", "Avail", "Use%", "Read", "Write", "Files", "Files Free", "Mountpoint");
 
   if (argc > 1) {
     while (*++argv)

examples/free.c

@@ -0,0 +1,44 @@
+#include <glibtop.h>
+#include <glibtop/mem.h>
+#include <glibtop/swap.h>
+
+#include <glib.h>
+#include <unistd.h>
+
+static unsigned mb(guint64 n)
+{
+        return n >> 20;
+}
+
+int main(int argc, char **argv)
+{
+        glibtop_mem mem;
+        glibtop_swap swap;
+
+	glibtop_init();
+
+        glibtop_get_mem(&mem);
+        glibtop_get_swap(&swap);
+
+        printf("              total        used        free      shared  buff/cache   available\n");
+
+        printf("%-7s %11u %11u %11u %11u %11u %11u\n",
+               "Mem:",
+                mb(mem.total),
+                mb(mem.used - mem.buffer - mem.cached),
+                mb(mem.free),
+                mb(mem.shared),
+                mb(mem.buffer + mem.cached),
+                mb(mem.total - mem.user));
+
+        printf("%-7s %11u %11u %11u\n",
+               "Swap:",
+                mb(swap.total),
+                mb(swap.used),
+                mb(swap.free));
+
+	glibtop_close();
+
+	return 0;
+}
+

examples/mem.c

@@ -1,21 +0,0 @@
-#include <glibtop.h>
-#include <glibtop/mem.h>
-
-#include <glib.h>
-#include <unistd.h>
-
-int main(int argc, char **argv)
-{
-	glibtop_mem buf;
-
-	glibtop_init();
-
-	g_print("%lx\n", glibtop_global_server->features);
-
-	glibtop_get_mem(&buf);
-
-	glibtop_close();
-
-	return 0;
-}
-

examples/netload.c

@@ -51,7 +51,7 @@ static char* hwaddress_format_for_display(glibtop_netload *buf)
 
 	for(i = 0; i < sizeof buf->hwaddress; ++i)
 		g_string_append_printf(repr, "%02X:",
-				       (unsigned) ((char*)buf->hwaddress)[i]);
+				       ((unsigned char*)buf->hwaddress)[i]);
 
 	repr->str [ repr->len - 1] = ' ';
 	str = g_string_free(repr, FALSE);

examples/pprint.c

@@ -24,10 +24,17 @@
 #define PPRINT_ARRAY(ARRAY, SIZE, FORMAT) do {				\
     size_t i;								\
     printf("\t%4lu B %3lu " #ARRAY "[%lu] = { ",			\
-(unsigned long) sizeof buf.ARRAY, (unsigned long) buf_offsetof(ARRAY),\
+	   (unsigned long) sizeof buf.ARRAY,				\
+	   (unsigned long) buf_offsetof(ARRAY),				\
 	   (unsigned long) G_N_ELEMENTS(buf.ARRAY));			\
-for(i = 0; i < (SIZE - 1); ++i) printf(".%u = " FORMAT ", ", i, buf.ARRAY[i]); \
+    for (i = 0; i < (SIZE); ++i) {					\
-printf(".%u = " FORMAT " }\n", SIZE - 1 , buf.ARRAY[SIZE - 1]); \
+      printf(".%u = " FORMAT ", ", i, buf.ARRAY[i]);			\
+      if (!buf.ARRAY[i] && i < (SIZE - 1) && !buf.ARRAY[i + 1]) {	\
+	do { i++; } while (i < SIZE && !buf.ARRAY[i]);			\
+	printf("..., ");						\
+      }									\
+    }									\
+    printf("}\n");							\
   } while(0)
 
 #define PPRINT_ENTRY_ARRAY(ARRAY, SIZE) do { \
@@ -36,10 +43,12 @@ printf("\t%4lu B %3lu " #ARRAY "[%lu] = { ", \
 (unsigned long) sizeof buf->ARRAY, 0,\
 (unsigned long) G_N_ELEMENTS(buf->ARRAY)); \
 for(i = 0; i < SIZE; ++i) { \
+  if (buf->ARRAY[i].values) {			\
     printf ("[ ");				\
     PPRINT_HASHTABLE(buf->ARRAY[i].values);	\
     printf ("]\n");				\
   }						\
+} \
 printf("} "); \
 } while(0)
 
@@ -319,6 +328,28 @@ static void pprint_get_proc_mem(pid_t pid)
 }
 
 
+static void pprint_get_proc_affinity(pid_t pid)
+{
+  glibtop_proc_affinity buf;
+  guint32 i;
+  guint16* cpus;
+
+  cpus = glibtop_get_proc_affinity(&buf, pid);
+
+  HEADER_PPRINT(glibtop_get_proc_affinity);
+  PPRINT(flags, "%#llx");
+  PPRINT(number, "%u");
+  PPRINT(all, "%d");
+
+  printf("\taffinity=");
+  for (i = 0; i < buf.number; i++) {
+    printf("%d, ", cpus[i]);
+  }
+  putchar('\n');
+
+  FOOTER_PPRINT();
+}
+
 
 int main()
 {
@@ -351,6 +382,7 @@ int main()
 
   pprint_get_proc_kernel(getpid());
   pprint_get_proc_mem(getpid());
+  pprint_get_proc_affinity(getpid());
 
   glibtop_close();
 

examples/proclist.c

@@ -1,5 +1,8 @@
 #include <glibtop.h>
 #include <glibtop/proclist.h>
+#include <glibtop/procstate.h>
+#include <glibtop/proctime.h>
+#include <glibtop/procuid.h>
 
 #include <glib.h>
 
@@ -17,14 +20,28 @@ static void print_pids(guint64 which, guint64 arg)
 
 	pids = glibtop_get_proclist(&buf, which, arg);
 
-	printf("glibtop_get_proclist(%#llx, %llu) -> %lu processes\n",
+	for (i = 0; i < buf.number; ++i) {
-	       which, arg, (unsigned long)buf.number);
+		glibtop_proc_time ptime;
+		glibtop_proc_uid puid;
+		glibtop_proc_state pstate;
 
-	for (i = 0; i < buf.number; ++i)
+		pid_t p = pids[i];
-		printf("%u ", pids[i]);
 
-	putchar('\n');
+		glibtop_get_proc_time(&ptime, p);
-	putchar('\n');
+		glibtop_get_proc_uid(&puid, p);
+		glibtop_get_proc_state(&pstate, p);
+
+		/* almost equivalent to ps -x -o user,pid,time,usertime,systime,start,command */
+		printf("%u pid=%u real=%.2f user=%.2f sys=%.2f start=%lu %s (%lx)\n",
+		       puid.uid,
+		       p,
+		       (double)ptime.rtime / ptime.frequency,
+		       (double)ptime.utime / ptime.frequency,
+		       (double)ptime.stime / ptime.frequency,
+		       (unsigned long)ptime.start_time,
+		       pstate.cmd,
+		       (long)ptime.flags);
+	}
 
 	g_free(pids);
 }
@@ -34,7 +51,6 @@ int main()
 {
 	glibtop_init();
 
-	print_pids(GLIBTOP_KERN_PROC_ALL, 0);
 	print_pids(GLIBTOP_KERN_PROC_UID, getuid());
 
 	glibtop_close();

examples/procmap.c

@@ -39,10 +39,36 @@
 #include <sys/resource.h>
 #include <sys/mman.h>
 
+#include <fcntl.h>
+
 #ifndef PROFILE_COUNT
 #define PROFILE_COUNT	1
 #endif
 
+static void
+try_mmap(const char *path)
+{
+	struct stat buf;
+	int fd;
+
+	if ((fd = open(path, O_RDONLY)) < 0)
+		goto out;
+
+	if (fstat(fd, &buf) < 0)
+		goto out;
+
+	if (mmap(NULL, buf.st_size, PROT_READ, MAP_PRIVATE, fd, 0) == MAP_FAILED)
+		goto out;
+
+	close(fd);
+
+	return;
+
+out:
+	fprintf(stderr, "Failed to test mmap with '%s'\n", path);
+}
+
+
 int
 main (int argc, char *argv [])
 {
@@ -78,8 +104,18 @@ main (int argc, char *argv [])
 
 	glibtop_init_r (&glibtop_global_server, 0, 0);
 
-	if ((argc != 2) || (sscanf (argv [1], "%d", (int *) &pid) != 1))
+	if (argc == 1) {
-		g_error ("Usage: %s pid", argv [0]);
+		pid = getpid();
+	}
+	else if ((argc != 2) || (sscanf (argv [1], "%d", (int *) &pid) != 1))
+		g_error ("Usage: %s [pid]", argv [0]);
+
+	if (pid == getpid()) {
+		/* let's map something for a try */
+		try_mmap("/etc/passwd");
+		try_mmap("/etc/resolv.conf");
+		try_mmap(argv[0]);
+	}
 
 	fprintf (stderr, "Getting memory maps for pid %d.\n\n", (int) pid);
 
@@ -87,6 +123,7 @@ main (int argc, char *argv [])
 
 	for (i = 0; i < procmap.number; i++) {
 		const char *filename = NULL;
+		char * format;
 		unsigned device, device_major, device_minor;
 		char perm [5];
 
@@ -103,42 +140,27 @@ main (int argc, char *argv [])
 		device_minor = (device & 255);
 		device_major = ((device >> 8) & 255);
 
+		if (sizeof (void*) == 8)
+			format = "%016lx-%016lx +%016lx (%8lu bytes mapped) - "
+				 "%02x:%02x % 8lu - %.*s";
+		else
+			format = "%08lx-%08lx +%08lx (%8lu bytes mapped) - "
+				 "%02x:%02x % 8lu - %.*s";
+
+		fprintf (stderr, format,
+			 (unsigned long) maps [i].start,
+			 (unsigned long) maps [i].end,
+			 (unsigned long) maps [i].offset,
+			 (unsigned long) (maps [i].end - (maps [i].start + maps [i].offset)),
+			 device_major, device_minor,
+			 (unsigned long) maps [i].inode,
+			 sizeof perm, perm);
+
 		if (filename) {
-			char *format;
+			fprintf(stderr, " - %s", filename);
-
-			if (sizeof (void*) == 8)
-				format = "%016lx-%016lx %016lx - "
-					 "%02x:%02x %08lu - %5.5s - %s\n";
-			else
-				format = "%08lx-%08lx %08lx - "
-					 "%02x:%02x %08lu - %5.5s - %s\n";
-
-			fprintf (stderr, format,
-				 (unsigned long) maps [i].start,
-				 (unsigned long) maps [i].end,
-				 (unsigned long) maps [i].offset,
-				 device_major, device_minor,
-				 (unsigned long) maps [i].inode,
-				 perm, filename);
-		} else {
-			char * format;
-
-			if (sizeof (void*) == 8)
-				format = "%016lx-%016lx %016lx - "
-					 "%02x:%02x %08lu - %4s\n";
-			else
-				format = "%08lx-%08lx %08lx - "
-					 "%02x:%02x %08lu - %4s\n";
-
-			fprintf (stderr, format,
-				 (unsigned long) maps [i].start,
-				 (unsigned long) maps [i].end,
-				 (unsigned long) maps [i].offset,
-				 device_major, device_minor,
-				 (unsigned long) maps [i].inode,
-				 perm);
 		}
 
+		fputc('\n', stderr);
 
 		g_print("smaps flags:%#llx size:%lluKiB rss:%lluKiB "
 			"shared_clean:%lluKib shared_dirty:%lluKiB "

examples/second.c

@@ -42,14 +42,12 @@ output (pid_t pid)
 	char *args;
 	unsigned i;
 
-#if HAVE_LIBGTOP_SMP
 	unsigned long total;
 	double p_total, p_utime, p_stime;
 	double b_total, b_utime, b_stime;
 	double s_total, s_utime, s_stime;
 	double my_utime, my_stime;
 	unsigned int ncpu;
-#endif
 
 	printf ("\n");
 
@@ -158,7 +156,6 @@ output (pid_t pid)
 
 	printf ("\n");
 
-#if HAVE_LIBGTOP_SMP
 	ncpu = glibtop_global_server->ncpu;
 
 	glibtop_get_proc_time (&data.proc_time, pid);
@@ -231,7 +228,6 @@ output (pid_t pid)
 		s_utime * 100.0 / my_utime, s_stime * 100.0 / my_stime);
 
 	printf ("\n");
-#endif
 }
 
 int

examples/timings.c

@@ -69,6 +69,21 @@
 		}							\
 	} while (0)
 
+
+static void display_self_times(void)
+{
+	printf("-- Overview using `ps` --------------------"
+	       "---------------\n");
+	printf("-- this client is %8u ----------------"
+	       "---------------\n", (unsigned)getpid());
+	printf("-- this server is %8u ----------------"
+	       "---------------\n", (unsigned)glibtop_global_server->pid);
+	system("ps xjf | egrep 'timings|libgtop_server'");
+	printf("-------------------------------------------"
+	       "---------------\n");
+}
+
+
 int
 main (int argc, char *argv [])
 {
@@ -85,13 +100,16 @@ main (int argc, char *argv [])
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
 
+
+	glibtop_init_r (&glibtop_global_server, 0, 0);
+
+	display_self_times();
+
 	printf ("%-12s (%-10s): %7s - %9s - %9s\n",
 		"Feature", "Flags", "Count", "utime", "stime");
 	printf ("-------------------------------------------"
 		"---------------\n");
 
-	glibtop_init_r (&glibtop_global_server, 0, 0);
-
 	getrusage (RUSAGE_SELF, &total_start);
 
 	getrusage (RUSAGE_SELF, &rusage_start);
@@ -411,6 +429,8 @@ main (int argc, char *argv [])
 	printf ("All timings are in clock ticks "
 		"(1000000 ticks per second).\n\n");
 
+	display_self_times();
+
 	glibtop_close ();
 
 	exit (0);

features.def

@@ -1,27 +1,27 @@
-void|cpu|ulong(total,user,nice,sys,idle,iowait,irq,softirq,frequency,xcpu_total[4],xcpu_user[4],xcpu_nice[4],xcpu_sys[4],xcpu_idle[4],xcpu_iowait[4],xcpu_irq[4],xcpu_softirq[4])
+void|cpu
-void|mem|ulong(total,used,free,shared,buffer,cached,user,locked)
+void|mem
-void|swap|ulong(total,used,free,pagein,pageout)
+void|swap
-void|uptime|double(uptime,idletime)
+void|uptime
-void|loadavg|double(loadavg[3]):ulong(nr_running,nr_tasks,last_pid)
+void|loadavg
-void|shm_limits|ulong(shmmax,shmmin,shmmni,shmseg,shmall)
+void|shm_limits
-void|msg_limits|ulong(msgpool,msgmap,msgmax,msgmnb,msgmni,msgssz,msgtql)
+void|msg_limits
-void|sem_limits|ulong(semmap,semmni,semmns,semmnu,semmsl,semopm,semume,semusz,semvmx,semaem)
+void|sem_limits
-pid_t*|proclist|ulong(number,size,total)|long(which,arg)
+pid_t*|proclist|long(which,arg)
-void|proc_state|str(cmd):char(state):ulong(uid,gid)|pid_t(pid)
+void|proc_state|pid_t(pid)
-void|proc_uid|long(uid,euid,gid,egid,pid,ppid,pgrp,session,tty,tpgid,priority,nice)|pid_t(pid)
+void|proc_uid|pid_t(pid)
-void|proc_mem|long(size,vsize,resident,share,rss,rss_rlim)|pid_t(pid)
+void|proc_mem|pid_t(pid)
-void|proc_time|long(start_time,rtime,utime,stime,cutime,cstime,timeout,it_real_value,frequency,xcpu_utime[4],xcpu_stime[4])|pid_t(pid)
+void|proc_time|pid_t(pid)
-void|proc_signal|ulong(signal[2],blocked[2],sigignore[2],sigcatch[2])|pid_t(pid)
+void|proc_signal|pid_t(pid)
-void|proc_kernel|ulong(k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt,kstk_esp,kstk_eip,nwchan):str(wchan)|pid_t(pid)
+void|proc_kernel|pid_t(pid)
-void|proc_segment|ulong(text_rss,shlib_rss,data_rss,stack_rss,dirty_size,start_code,end_code,start_stack)|pid_t(pid)
+void|proc_segment|pid_t(pid)
-char *|proc_args|ulong(size)|pid_t(pid):unsigned(max_len)
+char *|proc_args|pid_t(pid):unsigned(max_len)
-glibtop_map_entry *|proc_map|ulong(number,size,total)|pid_t(pid)
+glibtop_map_entry *|proc_map|pid_t(pid)
-glibtop_open_files_entry *|proc_open_files|ulong(number)|pid_t(pid)
+glibtop_open_files_entry *|proc_open_files|pid_t(pid)
-glibtop_mountentry *|@mountlist|ulong(number,size,total)|int(all_fs)
+glibtop_mountentry *|@mountlist|int(all_fs)
-void|@fsusage|ulong(blocks,bfree,bavail,files,ffree)|string|mount_dir
+void|@fsusage|string|mount_dir
-void|netload|ulong(if_flags,mtu,subnet,address,packets_in,packets_out,packets_total,bytes_in,bytes_out,bytes_total,errors_in,errors_out,errors_total,collisions)|string|interface
+void|netload|string|interface
-void|ppp|ulong(state,bytes_in,bytes_out)|ushort(device)
+void|ppp|ushort(device)
-char **|netlist|unsigned(number)
+char **|netlist
-char **|proc_wd|ulong(number),str(root),str(exe)|pid_t(pid)
+char **|proc_wd|pid_t(pid)
-guint16*|proc_affinity|ulong(number),int(all)|pid_t(pid)
+guint16*|proc_affinity|pid_t(pid)
 

glibtop.h

@@ -22,12 +22,17 @@
 #ifndef __GLIBTOP_H__
 #define __GLIBTOP_H__
 
+/* for pid_t, uid_t, gid_t */
+#include <sys/types.h>
+
+
 #include <glib.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS
 
 typedef struct _glibtop		glibtop;
+typedef struct _glibtop_machine	glibtop_machine;
 
 /**
  *  LIBGTOP_CHECK_VERSION
@@ -55,10 +60,6 @@ LIBGTOP_MICRO_VERSION >= (micro)))
 
 #include <glibtop_server.h>
 
-#ifdef HAVE_GLIBTOP_MACHINE_H
-#include <glibtop_machine.h>
-#endif
-
 #ifndef GLIBTOP_MOUNTENTRY_LEN
 #define GLIBTOP_MOUNTENTRY_LEN	79
 #endif
@@ -69,34 +70,6 @@ LIBGTOP_MICRO_VERSION >= (micro)))
 #include <glibtop/close.h>
 
 
-#ifdef HAVE_GLIBTOP_MACHINE_H
-
-struct _glibtop
-{
-	unsigned flags;
-	unsigned method;		/* Server Method */
-	unsigned error_method;		/* Error Method */
-	glibtop_machine machine;	/* Machine dependent data */
-	int input [2];			/* Pipe client <- server */
-	int output [2];			/* Pipe client -> server */
-	int socket;			/* Accepted connection of a socket */
-	int ncpu;			/* Number of CPUs, zero if single-processor */
-	int real_ncpu;			/* Real number of CPUs. Only ncpu are monitored */
-	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 */
-	glibtop_sysdeps sysdeps;	/* Detailed feature list */
-	glibtop_sysdeps required;	/* Required feature list */
-	pid_t pid;			/* PID of the server */
-};
-
-#else /* !HAVE_GLIBTOP_MACHINE_H */
-
 struct _glibtop
 {
 	unsigned flags;
@@ -118,22 +91,50 @@ struct _glibtop
 	glibtop_sysdeps sysdeps;	/* Detailed feature list */
 	glibtop_sysdeps required;	/* Required feature list */
 	pid_t pid;			/* PID of the server */
-};
 
-#endif /* HAVE_GLIBTOP_MACHINE_H */
+	uid_t uid;
+	uid_t euid;
+	gid_t gid;
+	gid_t egid;
+
+	glibtop_machine *machine;	/* Machine dependent data */
+};
 
 extern glibtop *glibtop_global_server;
 
 extern const unsigned long glibtop_server_features;
 
+/**
+ * glibtop_init:
+ *
+ * Returns: (transfer none):
+ */
 glibtop *
 glibtop_init (void);
 
+
+/**
+ * glibtop_init_r:
+ * @server_ptr: (out):
+ * @features:
+ * @flags:
+ *
+ * Returns: (transfer none):
+ */
 glibtop *
 glibtop_init_r (glibtop **server_ptr,
 		unsigned long features,
 		unsigned flags);
 
+
+/**
+ * glibtop_init_s:
+ * @server_ptr: (out):
+ * @features:
+ * @flags:
+ *
+ * Returns: (transfer none):
+ */
 glibtop *
 glibtop_init_s (glibtop **server_ptr,
 		unsigned long features,

include/glibtop/Makefile.am

@@ -2,7 +2,7 @@ glibtopdir		= $(includedir)/libgtop-2.0/glibtop
 
 glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  sem_limits.h uptime.h command.h mem.h proclist.h \
-			  proctime.h shm_limits.h version.h cpu.h msg_limits.h \
+			  proctime.h shm_limits.h cpu.h msg_limits.h \
 			  procmem.h procuid.h swap.h \
 			  procsegment.h sysdeps.h global.h \
 			  procsignal.h union.h gnuserv.h \
@@ -11,4 +11,6 @@ glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  procwd.h procaffinity.h \
 			  netlist.h procopenfiles.h open.h
 
-noinst_HEADERS		= error.h write.h read_data.h read.h init_hooks.h
+noinst_HEADERS		= error.h write.h read_data.h read.h init_hooks.h machine.h \
+			  version.h
+

include/glibtop/error.h

@@ -46,6 +46,18 @@ void glibtop_warn (const char *format, ...) G_GNUC_PRINTF(1, 2);
 void glibtop_error_io (const char *format, ...) G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
 void glibtop_warn_io (const char *format, ...) G_GNUC_PRINTF(1, 2);
 
+/* FIXME: C99 */
+#define glibtop_debug_r(server, fmt, ...)				\
+	G_STMT_START {							\
+	if (LIBGTOP_ENABLE_DEBUG)					\
+		glibtop_debug_r_real(server, "%s:%d %s(): " fmt, __FILE__, __LINE__, __func__, ##__VA_ARGS__); \
+	} G_STMT_END
+
+#define glibtop_debug(...) glibtop_debug_r(glibtop_global_server, __VA_ARGS__)
+
+void glibtop_debug_vr (glibtop *server, const char *format, va_list args);
+void glibtop_debug_r_real (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
+
 G_END_DECLS
 
 #endif

include/glibtop/machine.h

@@ -0,0 +1,22 @@
+#ifndef GLIBTOP_SYSDEPS_COMMON_MACHINE_H_1437506041
+#define GLIBTOP_SYSDEPS_COMMON_MACHINE_H_1437506041
+
+#include <glib.h>
+#include <glibtop_machine.h>
+
+/* private */
+static inline void
+glibtop_machine_new(glibtop *server)
+{
+	server->machine = g_new0(glibtop_machine, 1);
+}
+
+/* private */
+static inline void
+glibtop_machine_delete(glibtop *server)
+{
+	g_free(server->machine);
+	server->machine = NULL;
+}
+
+#endif /* GLIBTOP_SYSDEPS_COMMON_MACHINE_H_1437506041 */

include/glibtop/mountlist.h

@@ -55,7 +55,7 @@ struct _glibtop_mountlist
 
 /**
  * glibtop_get_mountlist:
- * @buf: (out):
+ * @buf:
  * @all_fs:
  *
  * Returns: (transfer full):

include/glibtop/netlist.h

@@ -31,12 +31,23 @@ G_BEGIN_DECLS
 
 typedef struct _glibtop_netlist	glibtop_netlist;
 
+/**
+ * glibtop_netlist:
+ * @number: Number of entries in the returned list.
+ */
 struct _glibtop_netlist
 {
 	guint64 flags;
 	guint32 number;
 };
 
+/**
+ * glibtop_get_netlist:
+ * @buf: a #glibtop_netlist
+ *
+ * Returns: (array zero-terminated=1) (transfer none): an array of network
+ *          interface names.
+ */
 char** glibtop_get_netlist(glibtop_netlist *buf);
 
 #if GLIBTOP_SUID_NETLIST
@@ -45,13 +56,39 @@ char** glibtop_get_netlist(glibtop_netlist *buf);
 #define glibtop_get_netlist_r		glibtop_get_netlist_s
 #endif
 
+/**
+ * glibtop_get_netlist_l:
+ * @server: a #glibtop server
+ * @buf: a #glibtop_netlist
+ *
+ * Returns: (array zero-terminated=1) (transfer none): an array of network
+ *          interface names.
+ */
 char** glibtop_get_netlist_l (glibtop *server, glibtop_netlist *buf);
 
 #if GLIBTOP_SUID_NETLIST
 void _glibtop_init_netlist_p (glibtop *server);
+
+/**
+ * glibtop_get_netlist_p:
+ * @server: a #glibtop server
+ * @buf: a #glibtop_netlist
+ *
+ * Returns: (array zero-terminated=1) (transfer none): an array of network
+ *          interface names.
+ */
 char** glibtop_get_netlist_p (glibtop *server, glibtop_netlist *buf);
 #else
 void _glibtop_init_netlist_s (glibtop *server);
+
+/**
+ * glibtop_get_netlist_s:
+ * @server: a #glibtop server
+ * @buf: a #glibtop_netlist
+ *
+ * Returns: (array zero-terminated=1) (transfer none): an array of network
+ *          interface names.
+ */
 char** glibtop_get_netlist_s (glibtop *server, glibtop_netlist *buf);
 #endif
 

include/glibtop/procaffinity.h

@@ -29,6 +29,7 @@ typedef struct _glibtop_proc_affinity	glibtop_proc_affinity;
 
 #define GLIBTOP_PROC_AFFINITY_NUMBER	0
 #define GLIBTOP_PROC_AFFINITY_ALL	1
+#define GLIBTOP_MAX_PROC_AFFINITY	2
 
 struct _glibtop_proc_affinity
 {

include/glibtop/procargs.h

@@ -79,6 +79,15 @@ char **
 glibtop_get_proc_argv_l (glibtop *server, glibtop_proc_args *buf,
 			 pid_t pid, unsigned max_len);
 
+/**
+ * glibtop_get_proc_argv:
+ * @buf:
+ * @pid:
+ * @max_len:
+ *
+ * Returns: (transfer full):
+ */
+
 char **
 glibtop_get_proc_argv (glibtop_proc_args *buf, pid_t pid, unsigned max_len);
 

include/glibtop/procmap.h

@@ -48,8 +48,10 @@ G_BEGIN_DECLS
 #define GLIBTOP_MAP_ENTRY_SHARED_DIRTY		10
 #define GLIBTOP_MAP_ENTRY_PRIVATE_CLEAN		11
 #define GLIBTOP_MAP_ENTRY_PRIVATE_DIRTY		12
+#define GLIBTOP_MAP_ENTRY_PSS			13
+#define GLIBTOP_MAP_ENTRY_SWAP			14
 
-#define GLIBTOP_MAX_MAP_ENTRY		13
+#define GLIBTOP_MAX_MAP_ENTRY		15
 
 #define GLIBTOP_MAP_FILENAME_LEN	215
 
@@ -78,6 +80,8 @@ struct _glibtop_map_entry
 	guint64 shared_dirty;
 	guint64 private_clean; 
 	guint64 private_dirty;
+	guint64 pss;
+	guint64 swap;
 	char filename [GLIBTOP_MAP_FILENAME_LEN+1];
 };
 
@@ -88,18 +92,18 @@ struct _glibtop_proc_map
 	guint64 total;			/* GLIBTOP_PROC_MAP_TOTAL	*/
 	guint64 size;			/* GLIBTOP_PROC_MAP_SIZE	*/
 };
-glibtop_map_entry *
-glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid);
-
 
 /**
  * glibtop_get_proc_map:
- * @server:
+ * @buf:
- * @buf: (out):
  * @pid:
  *
  * Returns: (transfer none):
  */
+glibtop_map_entry *
+glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid);
+
+
 
 /**
  * glibtop_get_proc_map_l:

include/glibtop/procmem.h

@@ -53,6 +53,12 @@ struct _glibtop_proc_mem
 				 * of the process; usually 2,147,483,647 */
 };
 
+/**
+ * glibtop_get_proc_map:
+ * @buf:
+ * @pid:
+ *
+ */
 void glibtop_get_proc_mem(glibtop_proc_mem *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_MEM

include/glibtop/procopenfiles.h

@@ -96,36 +96,8 @@ struct _glibtop_proc_open_files
 
 /**
  * glibtop_get_proc_open_files:
- * @server:
+ * @buf:
- * @buf: (out):
+ * @pid:
- * @all_fs:
- *
- * Returns: (transfer none):
- */
-
-/**
- * glibtop_get_proc_open_files_l:
- * @server:
- * @buf: (out):
- * @all_fs:
- *
- * Returns: (transfer none):
- */
-
-/**
- * glibtop_get_proc_open_files_p:
- * @server:
- * @buf: (out):
- * @all_fs:
- *
- * Returns: (transfer none):
- */
-
-/**
- * glibtop_get_proc_open_files_l:
- * @server:
- * @buf: (out):
- * @all_fs:
  *
  * Returns: (transfer none):
  */
@@ -139,12 +111,32 @@ glibtop_get_proc_open_files(glibtop_proc_open_files *buf, pid_t pid);
 #define glibtop_get_proc_open_files_r		glibtop_get_proc_open_files_s
 #endif
 
+
+/**
+ * glibtop_get_proc_open_files_l:
+ * @server:
+ * @buf: (out):
+ * @pid:
+ *
+ * Returns: (transfer none):
+ */
+
 glibtop_open_files_entry *
 glibtop_get_proc_open_files_l (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_FILE
 void _glibtop_init_proc_open_files_p (glibtop *server);
 
+
+/**
+ * glibtop_get_proc_open_files_p:
+ * @server:
+ * @buf: (out):
+ * @pid:
+ *
+ * Returns: (transfer none):
+ */
+
 glibtop_open_files_entry *
 glibtop_get_proc_open_files_p (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
 #else

include/glibtop/procwd.h

@@ -30,7 +30,7 @@ typedef struct _glibtop_proc_wd	glibtop_proc_wd;
 #define GLIBTOP_PROC_WD_NUMBER	0
 #define GLIBTOP_PROC_WD_ROOT	1
 #define GLIBTOP_PROC_WD_EXE	2
-#define GLIBTOP_PROC_WD_MAX	3
+#define GLIBTOP_MAX_PROC_WD	3
 
 #define GLIBTOP_PROC_WD_ROOT_LEN 215
 #define GLIBTOP_PROC_WD_EXE_LEN 215
@@ -44,6 +44,13 @@ struct _glibtop_proc_wd
 };
 
 
+/**
+ * glibtop_get_proc_wd:
+ * @buf:
+ * @pid:
+ *
+ * Returns: (transfer full):
+ */
 char ** glibtop_get_proc_wd(glibtop_proc_wd *buf, pid_t pid);
 char ** glibtop_get_proc_wd_l(glibtop *server, glibtop_proc_wd *buf, pid_t pid);
 

include/glibtop/shm_limits.h

@@ -37,6 +37,9 @@ G_BEGIN_DECLS
 
 typedef struct _glibtop_shm_limits	glibtop_shm_limits;
 
+/**
+ * glibtop_shm_limits:
+ */
 struct _glibtop_shm_limits
 {
 	guint64	flags;
@@ -47,6 +50,10 @@ struct _glibtop_shm_limits
 	guint64 shmall;		/* GLIBTOP_IPC_SHMALL	*/
 };
 
+/**
+ * glibtop_get_shm_limits:
+ * @buf: a #glibtop_shm_limits
+ */
 void glibtop_get_shm_limits(glibtop_shm_limits *buf);
 
 #if GLIBTOP_SUID_SHM_LIMITS
@@ -55,13 +62,28 @@ void glibtop_get_shm_limits(glibtop_shm_limits *buf);
 #define glibtop_get_shm_limits_r	glibtop_get_shm_limits_s
 #endif
 
+/**
+ * glibtop_get_shm_limits_l:
+ * @server: a #glibtop server
+ * @buf: a #glibtop_shm_limits
+ */
 void glibtop_get_shm_limits_l (glibtop *server, glibtop_shm_limits *buf);
 
 #if GLIBTOP_SUID_SHM_LIMITS
 void _glibtop_init_shm_limits_p (glibtop *server);
+/**
+ * glibtop_get_shm_limits_p:
+ * @server: a #glibtop server
+ * @buf: a #glibtop_shm_limits
+ */
 void glibtop_get_shm_limits_p (glibtop *, glibtop_shm_limits *buf);
 #else
 void _glibtop_init_shm_limits_s (glibtop *server);
+/**
+ * glibtop_get_shm_limits_s:
+ * @server: a #glibtop server
+ * @buf: a #glibtop_shm_limits
+ */
 void glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf);
 #endif
 

include/glibtop/sysdeps.h

@@ -56,6 +56,9 @@ G_BEGIN_DECLS
 
 #define GLIBTOP_MAX_SYSDEPS		27
 
+/* The 'features' args to glibtop_init_* is an unsigned long */
+G_STATIC_ASSERT((1UL << (GLIBTOP_MAX_SYSDEPS - 1)) <= ULONG_MAX);
+
 #define GLIBTOP_SYSDEPS_ALL		((1 << GLIBTOP_MAX_SYSDEPS) - 1)
 
 typedef struct _glibtop_sysdeps	glibtop_sysdeps;

lib/Makefile.am

@@ -1,5 +1,5 @@
 
-INCLUDES			= @INCLUDES@
+AM_CPPFLAGS			= @AM_CPPFLAGS@
 
 lib_LTLIBRARIES			= libgtop-2.0.la
 
@@ -26,10 +26,10 @@ INTROSPECTION_SCANNER_ARGS = --accept-unprefixed --warn-all
 INTROSPECTION_COMPILER_ARGS =
 
 if HAVE_INTROSPECTION
-introspection_sources = $(libgtop_2_0_la_SOURCES) lib.c ../glibtop.h \
+introspection_sources = $(libgtop_2_0_la_SOURCES) lib.c ../glibtop.h ../libgtopconfig.h \
 			../include/glibtop/close.h ../include/glibtop/loadavg.h ../include/glibtop/prockernel.h ../include/glibtop/procstate.h \
 			../include/glibtop/sem_limits.h ../include/glibtop/uptime.h ../include/glibtop/command.h ../include/glibtop/mem.h ../include/glibtop/proclist.h \
-			../include/glibtop/proctime.h ../include/glibtop/shm_limits.h ../include/glibtop/version.h ../include/glibtop/cpu.h ../include/glibtop/msg_limits.h \
+			../include/glibtop/proctime.h ../include/glibtop/shm_limits.h ../include/glibtop/cpu.h ../include/glibtop/msg_limits.h \
 			../include/glibtop/procmem.h ../include/glibtop/procuid.h ../include/glibtop/swap.h \
 			../include/glibtop/procsegment.h ../include/glibtop/sysdeps.h ../include/glibtop/global.h \
 			../include/glibtop/procsignal.h ../include/glibtop/union.h ../include/glibtop/gnuserv.h \
@@ -39,8 +39,8 @@ introspection_sources = $(libgtop_2_0_la_SOURCES) lib.c ../glibtop.h \
 			../include/glibtop/netlist.h ../include/glibtop/procopenfiles.h ../include/glibtop/open.h
 
 GTop-2.0.gir: libgtop-2.0.la
-GTop_2_0_gir_INCLUDES = GObject-2.0
+GTop_2_0_gir_AM_CPPFLAGS = GObject-2.0
-GTop_2_0_gir_CFLAGS = $(INCLUDES)
+GTop_2_0_gir_CFLAGS = $(AM_CPPFLAGS)
 GTop_2_0_gir_LIBS = libgtop-2.0.la
 GTop_2_0_gir_FILES = $(introspection_sources)
 INTROSPECTION_GIRS += GTop-2.0.gir

lib/command.c

@@ -20,6 +20,7 @@
 */
 
 #include <config.h>
+#include <glibtop/error.h>
 #include <glibtop/read.h>
 #include <glibtop/write.h>
 #include <glibtop/read_data.h>
@@ -35,6 +36,43 @@ glibtop_call_l (glibtop *server, unsigned command, size_t send_size,
 
 	glibtop_init_r (&server, 0, 0);
 
+	g_assert(command >= GLIBTOP_CMND_QUIT && command < GLIBTOP_MAX_CMND);
+
+	switch (command) {
+#define CHECK_CMND(CMND) case (CMND): glibtop_debug("CALL: command %s sending %lu bytes", #CMND, (unsigned long)send_size); break
+	  CHECK_CMND(GLIBTOP_CMND_QUIT);
+	  CHECK_CMND(GLIBTOP_CMND_SYSDEPS);
+	  CHECK_CMND(GLIBTOP_CMND_CPU);
+	  CHECK_CMND(GLIBTOP_CMND_MEM);
+	  CHECK_CMND(GLIBTOP_CMND_SWAP);
+	  CHECK_CMND(GLIBTOP_CMND_UPTIME);
+	  CHECK_CMND(GLIBTOP_CMND_LOADAVG);
+	  CHECK_CMND(GLIBTOP_CMND_SHM_LIMITS);
+	  CHECK_CMND(GLIBTOP_CMND_MSG_LIMITS);
+	  CHECK_CMND(GLIBTOP_CMND_SEM_LIMITS);
+	  CHECK_CMND(GLIBTOP_CMND_PROCLIST);
+	  CHECK_CMND(GLIBTOP_CMND_PROC_STATE);
+	  CHECK_CMND(GLIBTOP_CMND_PROC_UID);
+	  CHECK_CMND(GLIBTOP_CMND_PROC_MEM);
+	  CHECK_CMND(GLIBTOP_CMND_PROC_TIME);
+	  CHECK_CMND(GLIBTOP_CMND_PROC_SIGNAL);
+	  CHECK_CMND(GLIBTOP_CMND_PROC_KERNEL);
+	  CHECK_CMND(GLIBTOP_CMND_PROC_SEGMENT);
+	  CHECK_CMND(GLIBTOP_CMND_PROC_ARGS);
+	  CHECK_CMND(GLIBTOP_CMND_PROC_MAP);
+	  CHECK_CMND(GLIBTOP_CMND_MOUNTLIST);
+	  CHECK_CMND(GLIBTOP_CMND_FSUSAGE);
+	  CHECK_CMND(GLIBTOP_CMND_NETLOAD);
+	  CHECK_CMND(GLIBTOP_CMND_PPP);
+	  CHECK_CMND(GLIBTOP_CMND_NETLIST);
+	  CHECK_CMND(GLIBTOP_CMND_PROC_OPEN_FILES);
+	  CHECK_CMND(GLIBTOP_CMND_PROC_WD);
+	  CHECK_CMND(GLIBTOP_CMND_PROC_AFFINITY);
+	default:
+	  glibtop_error_r(server, "CALL: command UNKNOWN(%d) sending %lu bytes", command, (unsigned long)send_size); break;
+	}
+#undef CHECK_CMND
+
 	cmnd.command = command;
 
 	/* If send_size is less than _GLIBTOP_PARAM_SIZE (normally 16 Bytes), we
@@ -52,10 +90,8 @@ glibtop_call_l (glibtop *server, unsigned command, size_t send_size,
 
 	glibtop_read_l (server, sizeof (glibtop_response), &response);
 
-#ifdef DEBUG
+	glibtop_debug ("RESPONSE: offset=%lu - data_size=%lu",
-	fprintf (stderr, "RESPONSE: %lu - %d\n",
 		 response.offset, response.data_size);
-#endif
 
 	if (recv_buf)
 		memcpy (recv_buf, ((char *) &response) + response.offset,

lib/init.c

@@ -26,12 +26,14 @@
 #include <glibtop/open.h>
 #include <glibtop/parameter.h>
 #include <glibtop/init_hooks.h>
+#include <glibtop/machine.h>
+
 
 #ifndef DEFAULT_PORT
 #define DEFAULT_PORT 42800
 #endif
 
-static glibtop _glibtop_global_server = { 0 };
+static glibtop _glibtop_global_server;
 glibtop *glibtop_global_server = &_glibtop_global_server;
 
 static void
@@ -141,7 +143,7 @@ _init_server (glibtop *server, const unsigned features)
 
 		/* Open pipe to server. */
 		server->method = GLIBTOP_METHOD_PIPE;
-
+		server->server_command = g_strdup(LIBGTOP_SERVER);
 	} else {
 
 		glibtop_error_r (server, "Unknown server method '%s'",
@@ -173,6 +175,9 @@ glibtop_init_r (glibtop **server_ptr, unsigned long features, unsigned flags)
 	/* Do the initialization, but only if not already initialized. */
 
 	if ((server->flags & _GLIBTOP_INIT_STATE_INIT) == 0) {
+
+		glibtop_machine_new (server);
+
 		if (flags & GLIBTOP_FEATURES_EXCEPT)
 			features = ~features & GLIBTOP_SYSDEPS_ALL;
 
@@ -209,7 +214,7 @@ glibtop_init_r (glibtop **server_ptr, unsigned long features, unsigned flags)
 	/* Open server, but only if not already opened. */
 
 	if ((server->flags & _GLIBTOP_INIT_STATE_OPEN) == 0)
-		glibtop_open_l (glibtop_global_server, "glibtop",
+		glibtop_open_l (server, "glibtop",
 				features, flags);
 
 	return server;
@@ -221,6 +226,8 @@ glibtop_init_s (glibtop **server_ptr, unsigned long features, unsigned flags)
 	glibtop *server;
 	const _glibtop_init_func_t *init_fkt;
 
+	glibtop_debug("init_s with features=%#0lx and flags=%#0x", features, flags);
+
 	if (server_ptr == NULL)
 		return NULL;
 

lib/lib.pl

@@ -88,7 +88,7 @@ sub output {
     @line_fields = split(/\|/, $line, 9999);
     $retval = $line_fields[1];
     $feature = $line_fields[2];
-    $param_def = $line_fields[4];
+    $param_def = $line_fields[3];
 
     $orig = $feature;
     $feature =~ s/^@//;
@@ -106,16 +106,16 @@ sub output {
     }
 
     if ($param_def eq 'string') {
-	$call_param = ', ' . $line_fields[5];
+	$call_param = ', ' . $line_fields[4];
 	$param_buf = '';
 	$buf_set = '';
 	$param_decl = ",\n            " . $space . '    const char *' .
 
-	  $line_fields[5];
+	  $line_fields[4];
-	$send_ptr = "\n\tconst void *send_ptr = " . $line_fields[5] . ';';
+	$send_ptr = "\n\tconst void *send_ptr = " . $line_fields[4] . ';';
 	$send_size = "\n\tconst size_t send_size =\n\t\tstrlen (" .
 
-	  $line_fields[5] . ') + 1;';
+	  $line_fields[4] . ') + 1;';
     }
     else {
 	$call_param = '';
@@ -126,7 +126,7 @@ sub output {
 	$buf_set = '';
 	$nr_params = (@params = split(/:/, $param_def, 9999));
 	if ($nr_params) {
-	    $param_buf = "\n\tstruct {\n";
+	    $param_buf = "\t\tstruct {\n";
 	}
 	for ($param = 1; $param <= $nr_params; $param++) {
 	    $list = $params[$param];
@@ -138,8 +138,8 @@ sub output {
 
 	    if ($count > 0) {
 		for ($field = 1; $field <= $count; $field++) {
-		    $param_buf .= "\t\t$convert{$type} buf_$fields[$field];\n";
+		    $param_buf .= "\t\t\t$convert{$type} buf_$fields[$field];\n";
-		    $buf_set .= "\tparam_buf.buf_$fields[$field] = $fields[$field];\n";
+		    $buf_set .= "\t\tparam_buf.buf_$fields[$field] = $fields[$field];\n";
 		}
 	    }
 
@@ -155,19 +155,19 @@ sub output {
 		  $fields[$field];
 		$call_param = $call_param . ', ' . $fields[$field];
 		if ($send_ptr eq '') {
-		    $send_ptr = "\n\tconst void *send_ptr = &param_buf;";
+		    $send_ptr = "\t\tconst void *send_ptr = &param_buf;";
 		}
 	    }
 	}
 	if ($nr_params) {
-	    $param_buf .= "\t} param_buf;";
+	    $param_buf .= "\t\t} param_buf;\n";
-	    $send_size  = "\n\tconst size_t send_size = sizeof param_buf;";
+	    $send_size  = "\t\tconst size_t send_size = sizeof param_buf;";
 	}
 	else {
-	    $send_size = "\n\tconst size_t send_size = 0;";
+	    $send_size = "\t\tconst size_t send_size = 0;";
 	}
 	if ($send_ptr eq '') {
-	    $send_ptr = "\n\tconst void *send_ptr = NULL;";
+	    $send_ptr = "\t\tconst void *send_ptr = NULL;";
 	}
     }
 
@@ -175,13 +175,11 @@ sub output {
 
       $feature . ' *buf' . $param_decl . ')';
 
-    print "{" . $param_buf;
+    print "{";
 
-    print $send_ptr . '' . $send_size;
     if ($retval !~ /^void$/) {
 	print "\t" . $retval . ' retval = (' . $retval . ') 0;';
     }
-    print $buf_set;
 
     print "\tglibtop_init_r (&server, (1 << GLIBTOP_SYSDEPS_" .
 
@@ -198,6 +196,15 @@ sub output {
       &toupper($feature) . ')))';
     print "\t{";
 
+    if ($param_buf) {
+        print $param_buf;
+        print $buf_set;
+    }
+
+    print $send_ptr;
+    print $send_size;
+    print '';
+
     print "\t\t" . $prefix . 'glibtop_call_l (server, GLIBTOP_CMND_' .
 
       &toupper($feature) . ',';

lib/open.c

@@ -47,56 +47,44 @@ glibtop_open_l (glibtop *server, const char *program_name,
 
 	server->error_method = GLIBTOP_ERROR_METHOD_DEFAULT;
 
-#ifdef DEBUG
+	glibtop_debug ("SIZEOF: %zu - %zu - %zu - %zu - %zu - %zu",
-	fprintf (stderr, "SIZEOF: %u - %u - %u - %u - %u - %u\n",
 		 sizeof (glibtop_command), sizeof (glibtop_response),
 		 sizeof (glibtop_mountentry), sizeof (glibtop_union),
 		 sizeof (glibtop_sysdeps), sizeof (glibtop_response_union));
-#endif
 
 	switch (server->method) {
 	case GLIBTOP_METHOD_DIRECT:
 		server->features = 0;
 		break;
 	case GLIBTOP_METHOD_INET:
-#ifdef DEBUG
+		glibtop_debug ("Connecting to '%s' port %ld.",
-		fprintf (stderr, "Connecting to '%s' port %ld.\n",
 			 server->server_host, server->server_port);
-#endif
 
 		connect_type = glibtop_make_connection
 			(server->server_host, server->server_port,
 			 &server->socket);
 
-#ifdef DEBUG
+		glibtop_debug ("Connect Type is %d.", connect_type);
-		fprintf (stderr, "Connect Type is %d.\n", connect_type);
-#endif
 
 		server->flags |= _GLIBTOP_INIT_STATE_SERVER;
 
 		server->features = -1;
 		break;
 	case GLIBTOP_METHOD_UNIX:
-#ifdef DEBUG
+		glibtop_debug ("Connecting to Unix Domain Socket.");
-		fprintf (stderr, "Connecting to Unix Domain Socket.\n");
-#endif
 
 		connect_type = glibtop_make_connection
 			("unix", 0, &server->socket);
 
-#ifdef DEBUG
+		glibtop_debug ("Connect Type is %d.", connect_type);
-		fprintf (stderr, "Connect Type is %d.\n", connect_type);
-#endif
 
 		server->flags |= _GLIBTOP_INIT_STATE_SERVER;
 
 		server->features = -1;
 		break;
 	case GLIBTOP_METHOD_PIPE:
-#ifdef DEBUG
+		glibtop_debug ("Opening pipe to server (%s).",
-		fprintf (stderr, "Opening pipe to server (%s).\n",
+			 server->server_command);
-			 LIBGTOP_SERVER);
-#endif
 
 		if (pipe (server->input) || pipe (server->output))
 			glibtop_error_io_r (server, "cannot make a pipe");
@@ -110,9 +98,9 @@ glibtop_open_l (glibtop *server, const char *program_name,
 			close (server->input [0]); close (server->output [1]);
 			dup2 (server->input [1], 1);
 			dup2 (server->output [0], 0);
-			execl (LIBGTOP_SERVER, "libgtop-server", NULL);
+			execl (server->server_command, "libgtop-server", NULL);
 			glibtop_error_io_r (server, "execl (%s)",
-					    LIBGTOP_SERVER);
+					    server->server_command);
 			_exit (2);
 		}
 
@@ -165,18 +153,14 @@ glibtop_open_l (glibtop *server, const char *program_name,
 
 		memcpy (&server->sysdeps, &sysdeps, sizeof (glibtop_sysdeps));
 
-#ifdef DEBUG
+		glibtop_debug ("Server features are %#0lx.",
-		fprintf (stderr, "Server features are %lu.\n",
 			 server->features);
-#endif
 	}
 
 	/* In any case, we call the open functions of our own sysdeps
 	 * directory. */
 
-#ifdef DEBUG
+	glibtop_debug ("Calling sysdeps open function.");
-	fprintf (stderr, "Calling sysdeps open function.\n");
-#endif
 
 	glibtop_init_s (&server, features, flags);
 }

lib/read.c

@@ -33,9 +33,7 @@ glibtop_read_l (glibtop *server, size_t size, void *buf)
 	int fd;
 	glibtop_init_r (&server, 0, 0);
 
-#ifdef DEBUG
+	glibtop_debug("LIBRARY: really reading %d bytes.", (int)size);
-	fprintf (stderr, "LIBRARY: really reading %d bytes.\n", (int)size);
-#endif
 
 	fd = server->socket ? server->socket : server->input[0];
 

lib/read_data.c

@@ -36,10 +36,8 @@ glibtop_read_data_l (glibtop *server)
 
 	glibtop_init_r (&server, 0, 0);
 
-#ifdef DEBUG
+	glibtop_debug ("LIBRARY: reading %lu data bytes.",
-	fprintf (stderr, "LIBRARY: reading %lu data bytes.\n",
 		 (unsigned long) sizeof (size_t));
-#endif
 
 	if (server->socket) {
 		ret = recv (server->socket, &size, sizeof (size_t), 0);
@@ -50,10 +48,8 @@ glibtop_read_data_l (glibtop *server)
 	if (ret < 0)
 		glibtop_error_io_r (server, _("read data size"));
 
-#ifdef DEBUG
+	glibtop_debug ("LIBRARY: really reading %lu data bytes (ret = %d).",
-	fprintf (stderr, "LIBRARY: really reading %lu data bytes (ret = %d).\n",
 		 (unsigned long) size, ret);
-#endif
 
 	if (!size) return NULL;
 

lib/write.c

@@ -37,9 +37,7 @@ glibtop_write_l (glibtop *server, size_t size, void *buf)
 
 	if (size == 0) return;
 
-#ifdef DEBUG
+	glibtop_debug("LIBRARY: really writing %d bytes.", (int)size);
-	fprintf (stderr, "LIBRARY: really writing %d bytes.\n", (int)size);
-#endif
 
 	fd = server->socket ? server->socket : server->output[1];
 

libgtop-sysdeps.m4

@@ -4,17 +4,13 @@ dnl
 dnl It defines the following variables:
 dnl
 dnl * 'libgtop_sysdeps_dir'    - sysdeps dir for libgtop.
-dnl * 'libgtop_use_machine_h'  - some of system dependend parts of libgtop provide
+dnl * 'libgtop_need_server'    - is the server really needed? Defines 'LIBGTOP_NEED_SERVER'
-dnl                              their own header file. In this case we need to
+dnl                              if true; defines conditional 'LIBGTOP_NEED_SERVER'.
-dnl                              define 'HAVE_GLIBTOP_MACHINE_H'.
-dnl * 'libgtop_need_server'    - is the server really needed? Defines 'NEED_LIBGTOP'
-dnl                              if true; defines conditional 'NEED_LIBGTOP'.
 
 AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	AC_REQUIRE([AC_CANONICAL_HOST])
 
 	AC_SUBST(libgtop_sysdeps_dir)
-	AC_SUBST(libgtop_use_machine_h)
 	AC_SUBST(libgtop_need_server)
 
 	AC_ARG_WITH(libgtop-examples,
@@ -31,39 +27,11 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 
 	AM_CONDITIONAL(HACKER_MODE, test x"$hacker_mode" = xyes)
 
-	AC_ARG_WITH(libgtop-smp,
-	AS_HELP_STRING([--with-libgtop-smp],
-	[Enable SMP support @<:@default-auto@:>@]),[
-	libgtop_smp="$withval"],[libgtop_smp=auto])
-
-	if test $libgtop_smp = auto ; then
-	  AC_MSG_CHECKING(whether to enable SMP support)
-	  case "$host_os" in
-	  linux*)
-	    libgtop_smp=yes
-	    ;;
-	  aix*)
-	    libgtop_smp=yes
-	    ;;
-	  *)
-	    libgtop_smp=no
-	    ;;
-	  esac
-	  AC_MSG_RESULT($libgtop_smp)
-	fi
-
-	if test $libgtop_smp = yes ; then
-	  AC_DEFINE(HAVE_LIBGTOP_SMP, 1, [Define if libgtop supports SMP])
-	fi
-
-	AM_CONDITIONAL(LIBGTOP_SMP, test $libgtop_smp = yes)
-
 	AC_MSG_CHECKING(for libgtop sysdeps directory)
 
 	case "$host_os" in
 	linux*)
 	  libgtop_sysdeps_dir=linux
-	  libgtop_use_machine_h=no
 	  libgtop_have_sysinfo=yes
 	  libgtop_need_server=no
 	  libgtop_sysdeps_private_mountlist=yes
@@ -71,13 +39,11 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  ;;
 	netbsd*|bsdi*)
 	  libgtop_sysdeps_dir=bsd
-	  libgtop_use_machine_h=yes
 	  libgtop_need_server=yes
 	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
 	  ;;
 	openbsd*)
 	  libgtop_sysdeps_dir=openbsd
-	  libgtop_use_machine_h=yes
 	  libgtop_need_server=yes
 	  libgtop_sysdeps_private_mountlist=yes
 	  libgtop_sysdeps_private_fsusage=yes
@@ -85,7 +51,6 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  ;;
 	freebsd*|kfreebsd*)
 	  libgtop_sysdeps_dir=freebsd
-	  libgtop_use_machine_h=yes
 	  libgtop_need_server=yes
 	  libgtop_sysdeps_private_mountlist=yes
 	  libgtop_sysdeps_private_fsusage=yes
@@ -93,27 +58,23 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  ;;
 	solaris*)
 	  libgtop_sysdeps_dir=solaris
-	  libgtop_use_machine_h=yes
 	  libgtop_need_server=yes
 	  libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
 	  ;;
 	aix*)
 	  libgtop_sysdeps_dir=aix
-	  libgtop_use_machine_h=yes
 	  libgtop_need_server=yes
 	  libgtop_have_sysinfo=yes
 	  libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
 	  ;;
 	darwin*)
 	  libgtop_sysdeps_dir=darwin
-	  libgtop_use_machine_h=yes
 	  libgtop_need_server=yes
 	  libgtop_have_sysinfo=yes
 	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod g+s $(bindir)/libgtop_server2'
 	  ;;
 	cygwin*)
 	  libgtop_sysdeps_dir=cygwin
-	  libgtop_use_machine_h=no
 	  libgtop_need_server=no
 	  libgtop_have_sysinfo=yes
 	  libgtop_sysdeps_private_mountlist=yes
@@ -125,23 +86,19 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	      #Please note that this port is obsolete and not working at
 	      #all. It is only useful for people who want to fix it ... :-)
 	      libgtop_sysdeps_dir=sun4
-	      libgtop_use_machine_h=yes
 	      libgtop_need_server=yes
 	      ;;
 	    osf*)
 	      libgtop_sysdeps_dir=osf1
-	      libgtop_use_machine_h=yes
 	      libgtop_need_server=yes
 	      ;;
 	    *)
 	      libgtop_sysdeps_dir=stub
-	      libgtop_use_machine_h=no
 	      libgtop_need_server=no
 	      ;;
 	    esac
 	  else
 	    libgtop_sysdeps_dir=stub
-	    libgtop_use_machine_h=no
 	    libgtop_need_server=no
 	  fi
 	  ;;
@@ -304,22 +261,14 @@ main (void)
 	  ;;
 	esac
 
-	AC_MSG_CHECKING(for machine.h in libgtop sysdeps dir)
-	AC_MSG_RESULT($libgtop_use_machine_h)
-
 	AC_MSG_CHECKING(whether we need libgtop)
 	AC_MSG_RESULT($libgtop_need_server)
 
 	if test x$libgtop_need_server = xyes ; then
-	  AC_DEFINE(NEED_LIBGTOP, 1, [Define if libgtop is required])
+	  AC_DEFINE(LIBGTOP_NEED_SERVER, 1, [Define if libgtop server is required])
 	fi
 
-	if test x$libgtop_use_machine_h = xyes ; then
+	AM_CONDITIONAL(LIBGTOP_NEED_SERVER, test x$libgtop_need_server = xyes)
-	  AC_DEFINE(HAVE_GLIBTOP_MACHINE_H, 1,
-                    [Define if machine.h in libgtop sysdeps dir])
-	fi
-
-	AM_CONDITIONAL(NEED_LIBGTOP, test x$libgtop_need_server = xyes)
 	AM_CONDITIONAL(LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST, test x$libgtop_sysdeps_private_mountlist = xyes)
 	AM_CONDITIONAL(LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE, test x$libgtop_sysdeps_private_fsusage = xyes)
 ])

po/oc.po

@@ -1,46 +1,44 @@
 # Occitan translation of libgtop.
 # Copyright (C) 1998-2004 Free Software Foundation, Inc.
 # This file is distributed under the GNU General Public License Version 2.
-# 
+# Cédric Valmary <cvalmary@yahoo.fr>, 2015.
-# 
+# Cédric Valmary (Tot en òc) <cvalmary@yahoo.fr>, 2015.
-# 
-# Cédric Valmary (Tot en Òc) <cvalmary@yahoo.fr>, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.9.91\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libgto"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"p&keywords=I18N+L10N&component=general\n"
+"product=libgtop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-12-19 14:39+0000\n"
+"POT-Creation-Date: 2015-11-10 14:02+0000\n"
-"PO-Revision-Date: 2015-04-30 09:46+0200\n"
+"PO-Revision-Date: 2015-10-31 08:15+0200\n"
-"Last-Translator: Cédric Valmary (Tot en Òc) <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric Valmary (Tot en òc) <cvalmary@yahoo.fr>\n"
-"Language-Team: www.totenoc.eu\n"
+"Language-Team: Tot en òc (totenoc.eu)\n"
 "Language: oc\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 0.7.0\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../lib/read.c:51
+#: ../lib/read.c:49
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
 msgstr[0] "%d octet legit"
 msgstr[1] "%d octets legits"
 
-#: ../lib/read_data.c:51
+#: ../lib/read_data.c:49
 msgid "read data size"
 msgstr "talha de las donadas legidas"
 
-#: ../lib/read_data.c:70
+#: ../lib/read_data.c:66
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
 msgstr[0] "lectura de %lu octet de donadas"
 msgstr[1] "lectura de %lu octets de donadas"
 
-#: ../lib/write.c:51
+#: ../lib/write.c:49
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
@@ -53,7 +51,7 @@ msgstr "Activa lo desbugatge"
 
 #: ../src/daemon/gnuserv.c:457
 msgid "Enable verbose output"
-msgstr "Activa la sortida charraira"
+msgstr "Activa la sortida verbosa"
 
 #: ../src/daemon/gnuserv.c:459
 msgid "Don't fork into background"
@@ -61,12 +59,13 @@ msgstr "Aviar pas en prètzfach de fons"
 
 #: ../src/daemon/gnuserv.c:461
 msgid "Invoked from inetd"
-msgstr "Invocat a partir de inetd"
+msgstr "Invocat a partir d'inetd"
 
 #: ../src/daemon/gnuserv.c:495
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "Aviar « %s --help » per afichar la lista de las opcions de la linha de "
+msgstr ""
+"Aviar « %s --help » per afichar la lista de las opcions de la linha de "
 "comanda.\n"
 
 #: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27

po/pl.po

@@ -6,14 +6,14 @@
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 # Zbigniew Chyla <chyla@alice.ci.pwr.wroc.pl>, 1999-2002.
 # Artur Flinta <aflinta@at.kernel.pl>, 2004-2007.
-# Piotr Drąg <piotrdrag@gmail.com>, 2010-2012.
+# Piotr Drąg <piotrdrag@gmail.com>, 2010-2015.
-# Aviary.pl <gnomepl@aviary.pl>, 2010-2012.
+# Aviary.pl <gnomepl@aviary.pl>, 2010-2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 18:37+0200\n"
+"POT-Creation-Date: 2015-08-26 19:45+0200\n"
-"PO-Revision-Date: 2012-09-04 18:42+0200\n"
+"PO-Revision-Date: 2015-08-26 19:47+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -25,7 +25,7 @@ msgstr ""
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: Poland\n"
 
-#: ../lib/read.c:51
+#: ../lib/read.c:49
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
@@ -33,11 +33,11 @@ msgstr[0] "odczyt %d bajtu"
 msgstr[1] "odczyt %d bajtów"
 msgstr[2] "odczyt %d bajtów"
 
-#: ../lib/read_data.c:51
+#: ../lib/read_data.c:49
 msgid "read data size"
 msgstr "odczyt rozmiaru danych"
 
-#: ../lib/read_data.c:70
+#: ../lib/read_data.c:66
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
@@ -45,7 +45,7 @@ msgstr[0] "odczytano jeden bajt danych"
 msgstr[1] "odczytano %lu bajty danych"
 msgstr[2] "odczytano %lu bajtów danych"
 
-#: ../lib/write.c:51
+#: ../lib/write.c:49
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
@@ -73,7 +73,7 @@ msgstr "Wywołanie przez inetd"
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Polecenie \"%s --help\" wyświetli pełną listę dostępnych opcji wiersza "
+"Polecenie „%s --help” wyświetli pełną listę dostępnych opcji wiersza "
 "poleceń.\n"
 
 #: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27

po/pt.po

@@ -3,19 +3,23 @@
 # Distributed under the same licence as the libgtop package
 # Duarte Loreto <happyguy_pt@hotmail.com>, 2001, 2002, 2003, 2004, 2005, 2007, 2013.
 # 
+# Pedro Albuquerque <palbuquerque73@openmailbox.com>, 2015.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: 3.8\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"POT-Creation-Date: 2013-03-17 01:06+0000\n"
+"product=libgtop&keywords=I18N+L10N&component=general\n"
-"PO-Revision-Date: 2013-03-17 01:10+0000\n"
+"POT-Creation-Date: 2014-02-08 10:53+0000\n"
-"Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
+"PO-Revision-Date: 2015-06-25 09:38+0100\n"
-"Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
+"Last-Translator: Pedro Albuquerque <palbuquerque73@openmailbox.com>\n"
+"Language-Team: Português <palbuquerque73@openmailbox.com>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
 #: ../lib/read.c:51
 #, c-format
@@ -32,8 +36,8 @@ msgstr "tamanho dos dados lidos"
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
-msgstr[0] "%lu byte lido"
+msgstr[0] "%lu byte de dados lido"
-msgstr[1] "%lu bytes lidos"
+msgstr[1] "%lu bytes de dados lidos"
 
 #: ../lib/write.c:51
 #, c-format
@@ -83,7 +87,7 @@ msgstr "Instrução ilegal"
 
 #: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
 msgid "Trace trap"
-msgstr "Armadilha de trace"
+msgstr "Armadilha de rasto"
 
 #: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
 msgid "Abort"
@@ -123,7 +127,7 @@ msgstr "Alarme"
 
 #: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
 msgid "Termination"
-msgstr "Terminar"
+msgstr "Terminação"
 
 #: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
 msgid "Urgent condition on socket"
@@ -155,7 +159,7 @@ msgstr "Escrita em fundo para a tty"
 
 #: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
 msgid "I/O now possible"
-msgstr "I/O agora possível"
+msgstr "E/S agora possível"
 
 #: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
 msgid "CPU limit exceeded"

src/Makefile.am

@@ -1,4 +1,4 @@
-if NEED_LIBGTOP
+if LIBGTOP_NEED_SERVER
 daemon_SUBDIRS		= daemon
 else
 daemon_SUBDIRS		=

src/daemon/Makefile.am

@@ -12,13 +12,13 @@
 ## Martin <martin@home-of-linux.org>
 ##
 
-INCLUDES			= $(LIBGTOP_CFLAGS) @INCLUDES@ -D_BSD \
+AM_CPPFLAGS			= $(LIBGTOP_CFLAGS) @AM_CPPFLAGS@ -D_BSD \
 				  -DLIBGTOP_COMPILE_SYSTEM="\"`uname -s`\"" \
 				  -DLIBGTOP_COMPILE_RELEASE="\"`uname -r`\"" \
 				  -DLIBGTOP_COMPILE_VERSION="\"`uname -v`\"" \
 				  -DLIBGTOP_COMPILE_MACHINE="\"`uname -m`\""
 
-if NEED_LIBGTOP
+if LIBGTOP_NEED_SERVER
 suid_sysdeps			= $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la
 suid_common			= $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la
 else
@@ -41,8 +41,13 @@ libgtop_daemon2_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
 				  @libs_xauth@
 
 libgtop_server2_SOURCES		= server.c slave.c io.c version.c daemon.h
-libgtop_server2_LDADD		= $(GLIB_LIBS) $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la \
+libgtop_server2_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-				  $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la
+				  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+				  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+				  @sysdeps_suid_lib@ \
+				  $(suid_sysdeps) $(suid_common) \
+				  $(LIBGTOP_LIBS) \
+				  @libs_xauth@
 
 EXTRA_DIST			= server_config.h.in server_config.pl
 

src/daemon/gnuserv.c

@@ -43,6 +43,7 @@
 #include <glibtop/gnuserv.h>
 
 #include <errno.h>
+#include <locale.h>
 
 #include "daemon.h"
 
@@ -473,6 +474,8 @@ main (int argc, char **argv)
 
     int ils = -1;		/* internet domain listen socket */
 
+    setlocale (LC_ALL, "");
+
     /* On non-glibc systems, this is not set up for us.  */
     if (!program_invocation_name) {
 	char *arg;

src/daemon/io.c

@@ -27,10 +27,8 @@ void
 do_output (int s, glibtop_response *resp, off_t offset,
 	   size_t data_size, const void *data)
 {
-#ifdef DEBUG
+	glibtop_debug ("Really writing %d bytes at offset %lu.",
-	fprintf (stderr, "Really writing %d bytes at offset %lu.\n",
 		 sizeof (glibtop_response), offset);
-#endif
 
 	resp->offset = offset;
 	resp->data_size = data_size;
@@ -44,9 +42,7 @@ do_output (int s, glibtop_response *resp, off_t offset,
 	}
 
 	if (resp->data_size) {
-#ifdef DEBUG
+		glibtop_debug ("Writing %d bytes of data.", resp->data_size);
-		fprintf (stderr, "Writing %d bytes of data.\n", resp->data_size);
-#endif
 
 		if (s == 0) {
 			if (write (1, data, resp->data_size) < 0)
@@ -88,10 +84,8 @@ do_read (int s, void *ptr, size_t total_size)
 		tmp_ptr += nread;
 		ptr = tmp_ptr;
 
-#ifdef DEBUG
+		glibtop_debug ("READ (%d): %d - %d - %d",
-		fprintf (stderr, "READ (%d): %d - %d - %d\n",
 			 nread, already_read, remaining, total_size);
-#endif
 	}
 
 	return already_read;

src/daemon/main.c

@@ -26,9 +26,6 @@
 #ifndef PARENT_DEBUG
 #define PARENT_DEBUG 1
 #endif
-#ifndef DEBUG
-#define DEBUG 1
-#endif
 #endif
 
 void

src/daemon/server.c

@@ -22,40 +22,14 @@
 #include <config.h>
 #include "daemon.h"
 
-static glibtop _glibtop_global_server;
-glibtop *glibtop_global_server = &_glibtop_global_server;
-
 #include <glibtop.h>
 #include <glibtop/union.h>
 #include <glibtop/sysdeps.h>
+#include <glibtop/error.h>
+#include <glibtop/machine.h>
 
 #include <sys/utsname.h>
 
-const unsigned long glibtop_server_features =
-GLIBTOP_SUID_CPU +
-GLIBTOP_SUID_MEM +
-GLIBTOP_SUID_SWAP +
-GLIBTOP_SUID_UPTIME +
-GLIBTOP_SUID_LOADAVG +
-GLIBTOP_SUID_SHM_LIMITS +
-GLIBTOP_SUID_MSG_LIMITS +
-GLIBTOP_SUID_SEM_LIMITS +
-GLIBTOP_SUID_PROCLIST +
-GLIBTOP_SUID_PROC_STATE +
-GLIBTOP_SUID_PROC_UID +
-GLIBTOP_SUID_PROC_MEM +
-GLIBTOP_SUID_PROC_TIME +
-GLIBTOP_SUID_PROC_SIGNAL +
-GLIBTOP_SUID_PROC_KERNEL +
-GLIBTOP_SUID_PROC_SEGMENT +
-GLIBTOP_SUID_PROC_ARGS +
-GLIBTOP_SUID_PROC_MAP +
-GLIBTOP_SUID_NETLOAD +
-GLIBTOP_SUID_NETLIST +
-GLIBTOP_SUID_PROC_WD +
-GLIBTOP_SUID_PROC_AFFINITY +
-GLIBTOP_SUID_PPP;
-
 #include <fcntl.h>
 #include <locale.h>
 
@@ -70,6 +44,8 @@ main(int argc, char *argv[])
 	uid = getuid (); euid = geteuid ();
 	gid = getgid (); egid = getegid ();
 
+	glibtop_debug ("uid=%d euid=%d gid=%d egid=%d", getuid(), geteuid(), getgid(), getegid());
+
 	if (uname (&uts) < 0) _exit (1);
 
 #ifdef _AIX
@@ -100,12 +76,18 @@ main(int argc, char *argv[])
 	}
 #endif
 
+	glibtop_machine_new (glibtop_global_server);
+
 	glibtop_init_p (glibtop_global_server, 0, 0);
 
+	glibtop_debug ("uid=%d euid=%d gid=%d egid=%d", getuid(), geteuid(), getgid(), getegid());
+
 	if (setreuid (euid, uid)) _exit (1);
 
 	if (setregid (egid, gid)) _exit (1);
 
+	glibtop_debug ("uid=%d euid=%d gid=%d egid=%d", getuid(), geteuid(), getgid(), getegid());
+
 	/* !!! END OF SUID ROOT PART !!! */
 
 	handle_slave_connection (0, 0);

src/daemon/slave.c

@@ -27,11 +27,12 @@ void
 handle_slave_connection (int input, int output)
 {
 	glibtop *server G_GNUC_UNUSED = glibtop_global_server;
-	gint64 *param_ptr G_GNUC_UNUSED;
 	const void *ptr G_GNUC_UNUSED;
 
 	unsigned short max_len G_GNUC_UNUSED;
 	pid_t pid G_GNUC_UNUSED;
+	gint64 proc_which G_GNUC_UNUSED;
+	gint64 proc_arg G_GNUC_UNUSED;
 
 	glibtop_response _resp, *resp = &_resp;
 	glibtop_command _cmnd, *cmnd = &_cmnd;
@@ -40,10 +41,8 @@ handle_slave_connection (int input, int output)
 	glibtop_send_version (glibtop_global_server, output);
 
 	while (do_read (input, cmnd, sizeof (glibtop_command))) {
-#ifdef SLAVE_DEBUG
+		glibtop_debug ("Slave %d received command "
-		fprintf (stderr, "Slave %d received command "
+			 "%llu from client.", getpid (), cmnd->command);
-			 "%llu from client.\n", getpid (), cmnd->command);
-#endif
 
 		if (cmnd->data_size >= BUFSIZ)
 			glibtop_error ("Client sent %llu bytes, "
@@ -55,10 +54,8 @@ handle_slave_connection (int input, int output)
 		memset (parameter, 0, sizeof (parameter));
 
 		if (cmnd->data_size) {
-#ifdef SLAVE_DEBUG
+			glibtop_debug ("Client has %llu bytes of data.",
-			fprintf (stderr, "Client has %llu bytes of data.\n",
 				 cmnd->data_size);
-#endif
 
 			do_read (input, parameter, cmnd->data_size);
 
@@ -72,10 +69,11 @@ handle_slave_connection (int input, int output)
 			return;
 #if GLIBTOP_SUID_PROCLIST
 		case GLIBTOP_CMND_PROCLIST:
-			param_ptr = (gint64 *) parameter;
+			memcpy(&proc_which, parameter, sizeof proc_which);
+			memcpy(&proc_arg, parameter + sizeof proc_which, sizeof proc_arg);
 			ptr = glibtop_get_proclist_p
 				(server, &resp->u.data.proclist,
-				 param_ptr [0], param_ptr [1]);
+				 proc_which, proc_arg);
 			do_output (output, resp, _offset_data (proclist),
 				   resp->u.data.proclist.total, ptr);
 			g_free (ptr);

src/daemon/version.c

@@ -35,16 +35,14 @@ glibtop_send_version (glibtop *server, int fd)
 
 	sprintf (buffer, LIBGTOP_VERSION_STRING,
 		 LIBGTOP_VERSION, LIBGTOP_SERVER_VERSION,
-		 sizeof (glibtop_command),
+		 (unsigned) sizeof (glibtop_command),
-		 sizeof (glibtop_response),
+		 (unsigned) sizeof (glibtop_response),
-		 sizeof (glibtop_union),
+		 (unsigned) sizeof (glibtop_union),
-		 sizeof (glibtop_sysdeps));
+		 (unsigned) sizeof (glibtop_sysdeps));
 
 	size = strlen (buffer) + 1;
 
-#ifdef DEBUG
+	glibtop_debug ("SERVER ID: |%s|", buffer);
-	fprintf (stderr, "SERVER ID: |%s|\n", buffer);
-#endif
 
 	if (fd == 0) {
 		if (write (1, (const void *) &size, sizeof (size)) < 0)

sysdeps/aix/Makefile.am

@@ -1,5 +1,5 @@
 
-INCLUDES			= @INCLUDES@
+AM_CPPFLAGS			= @AM_CPPFLAGS@
 
 noinst_LTLIBRARIES		= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 

sysdeps/aix/cpu.c

@@ -56,7 +56,7 @@ _glibtop_init_cpu_p (glibtop *server)
 	{
 		return;
 	}
-	server->machine.sysinfo_offset = result;
+	server->machine->sysinfo_offset = result;
 
 	result = _glibtop_get_kmem_offset(server, "cpuinfo");
 	if (result == -1)
@@ -65,9 +65,9 @@ _glibtop_init_cpu_p (glibtop *server)
 
 		return;
 	}
-	server->machine.cpuinfo_offset = result;
+	server->machine->cpuinfo_offset = result;
 
-	server->machine.cpuinfo = (struct cpuinfo*)calloc(_system_configuration.ncpus, sizeof(struct cpuinfo));
+	server->machine->cpuinfo = (struct cpuinfo*)calloc(_system_configuration.ncpus, sizeof(struct cpuinfo));
 
 	server->sysdeps.cpu = _glibtop_sysdeps_cpu;
 }
@@ -85,7 +85,7 @@ glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
 
 	memset (buf, 0, sizeof (glibtop_cpu));
 
-	result = _glibtop_get_kmem_info(server, server->machine.sysinfo_offset,
+	result = _glibtop_get_kmem_info(server, server->machine->sysinfo_offset,
 					&sysinfo, sizeof(struct sysinfo));
 	if (result <= 0)
 	{
@@ -100,8 +100,8 @@ glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
 
 	buf->total = buf->idle + buf->user + buf->sys + buf->nice ;
 
-	result = _glibtop_get_kmem_info(server, server->machine.cpuinfo_offset,
+	result = _glibtop_get_kmem_info(server, server->machine->cpuinfo_offset,
-					server->machine.cpuinfo,
+					server->machine->cpuinfo,
 					_system_configuration.ncpus
 						* sizeof(struct cpuinfo));
 
@@ -115,13 +115,13 @@ glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
 	for (cpu = 0; cpu < MIN(GLIBTOP_NCPU, _system_configuration.ncpus); cpu++)
 	{
 		buf->xcpu_idle[cpu] =
-			server->machine.cpuinfo[cpu].cpu[CPU_IDLE];
+			server->machine->cpuinfo[cpu].cpu[CPU_IDLE];
 		buf->xcpu_user[cpu] =
-			server->machine.cpuinfo[cpu].cpu[CPU_USER];
+			server->machine->cpuinfo[cpu].cpu[CPU_USER];
 		buf->xcpu_sys[cpu] =
-			server->machine.cpuinfo[cpu].cpu[CPU_KERNEL];
+			server->machine->cpuinfo[cpu].cpu[CPU_KERNEL];
 		buf->xcpu_nice[cpu] =
-			server->machine.cpuinfo[cpu].cpu[CPU_WAIT];
+			server->machine->cpuinfo[cpu].cpu[CPU_WAIT];
 
 		buf->xcpu_total[cpu] = buf->xcpu_idle[cpu] +
 			buf->xcpu_user[cpu] +

sysdeps/aix/glibtop_machine.h

@@ -26,8 +26,6 @@
 
 G_BEGIN_DECLS
 
-typedef struct _glibtop_machine glibtop_machine;
-
 struct _glibtop_machine
 {
 	uid_t uid, euid;

sysdeps/aix/glibtop_suid.h

@@ -29,11 +29,11 @@ G_BEGIN_DECLS
 #endif
 
 static inline void glibtop_suid_enter (glibtop *server) {
-	setegid (server->machine.egid);
+	setegid (server->machine->egid);
 }
 
 static inline void glibtop_suid_leave (glibtop *server) {
-	if (setegid (server->machine.gid))
+	if (setegid (server->machine->gid))
 		_exit (1);
 }
 

sysdeps/aix/loadavg.c

@@ -44,7 +44,7 @@ _glibtop_init_loadavg_p (glibtop *server)
 		return;
 	}
 
-	server->machine.loadavg_offset = result;
+	server->machine->loadavg_offset = result;
 
 	server->sysdeps.loadavg = _glibtop_sysdeps_loadavg;
 }
@@ -61,7 +61,7 @@ glibtop_get_loadavg_p (glibtop *server, glibtop_loadavg *buf)
 
 	memset (buf, 0, sizeof (glibtop_loadavg));
 
-	result = _glibtop_get_kmem_info(server, server->machine.loadavg_offset,
+	result = _glibtop_get_kmem_info(server, server->machine->loadavg_offset,
 					loadavg, sizeof(loadavg));
         if (result <= 0)
         {

sysdeps/aix/msg_limits.c

@@ -44,7 +44,7 @@ _glibtop_init_msg_limits_p (glibtop *server)
 		return;
 	}
 
-	server->machine.msginfo_offset = result;
+	server->machine->msginfo_offset = result;
 
 	server->sysdeps.msg_limits = _glibtop_sysdeps_msg_limits;
 }
@@ -61,7 +61,7 @@ glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf)
 
 	memset (buf, 0, sizeof (glibtop_msg_limits));
 
-	result = _glibtop_get_kmem_info(server, server->machine.msginfo_offset,
+	result = _glibtop_get_kmem_info(server, server->machine->msginfo_offset,
 					&msginfo, sizeof(msginfo));
 
 	if (result <= 0)

sysdeps/aix/netload.c

@@ -100,7 +100,7 @@ _glibtop_init_netload_p (glibtop *server)
 		return;
 	}
 
-	server->machine.ifnet_offset = addr;
+	server->machine->ifnet_offset = addr;
 
 	server->sysdeps.netload = _glibtop_sysdeps_netload;
 }
@@ -122,7 +122,7 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
 
 	memset (buf, 0, sizeof (glibtop_netload));
 
-	for ( offset = server->machine.ifnet_offset;
+	for ( offset = server->machine->ifnet_offset;
 	      offset != 0;
 	      offset = (off_t)ifnet.if_next
 	    )

sysdeps/aix/open.c

@@ -56,23 +56,23 @@ glibtop_open_p (glibtop *server, const char *program_name,
 {
 	/* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */
 
-	server->machine.uid = getuid ();
+	server->machine->uid = getuid ();
-	server->machine.euid = geteuid ();
+	server->machine->euid = geteuid ();
-	server->machine.gid = getgid ();
+	server->machine->gid = getgid ();
-	server->machine.egid = getegid ();
+	server->machine->egid = getegid ();
 
 	/* open kmem */
 
-	server->machine.kmem_fd = open("/dev/kmem", O_RDONLY);
+	server->machine->kmem_fd = open("/dev/kmem", O_RDONLY);
-	if (server->machine.kmem_fd == -1)
+	if (server->machine->kmem_fd == -1)
 		glibtop_error_io_r (server, "Cannot open /dev/kmem");
 
 	/* Drop priviledges. */
 
-	if (seteuid (server->machine.uid))
+	if (seteuid (server->machine->uid))
 		_exit (1);
 
-	if (setegid (server->machine.gid))
+	if (setegid (server->machine->gid))
 		_exit (1);
 
 	/* !!! END OF SUID ROOT PART !!! */

sysdeps/aix/sem_limits.c

@@ -46,7 +46,7 @@ _glibtop_init_sem_limits_p (glibtop *server)
 		return;
 	}
 
-	server->machine.seminfo_offset = result;
+	server->machine->seminfo_offset = result;
 
 	server->sysdeps.sem_limits = _glibtop_sysdeps_sem_limits;
 }
@@ -63,7 +63,7 @@ glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf)
 
 	memset (buf, 0, sizeof (glibtop_sem_limits));
 
-	result = _glibtop_get_kmem_info(server, server->machine.seminfo_offset,
+	result = _glibtop_get_kmem_info(server, server->machine->seminfo_offset,
 					&seminfo, sizeof(seminfo));
 
 	if (result <= 0)

sysdeps/aix/shm_limits.c

@@ -44,7 +44,7 @@ _glibtop_init_shm_limits_p (glibtop *server)
 		return;
 	}
 
-	server->machine.shminfo_offset = result;
+	server->machine->shminfo_offset = result;
 
 	server->sysdeps.shm_limits = _glibtop_sysdeps_shm_limits;
 }
@@ -62,7 +62,7 @@ glibtop_get_shm_limits_p (glibtop *server, glibtop_shm_limits *buf)
 
 	memset (buf, 0, sizeof (glibtop_shm_limits));
 
-	result = _glibtop_get_kmem_info(server, server->machine.shminfo_offset,
+	result = _glibtop_get_kmem_info(server, server->machine->shminfo_offset,
 					&shminfo, sizeof(struct shminfo));
 	if (result <= 0)
 	{

sysdeps/aix/utils.c

@@ -68,9 +68,9 @@ _glibtop_get_kmem_info(glibtop* server, off_t offset, void* buf, size_t len)
 
 	glibtop_suid_enter(server);
 
-	lseek(server->machine.kmem_fd, offset, SEEK_SET);
+	lseek(server->machine->kmem_fd, offset, SEEK_SET);
 
-	result = read(server->machine.kmem_fd, buf, len);
+	result = read(server->machine->kmem_fd, buf, len);
 
         glibtop_suid_leave(server);
 
@@ -86,23 +86,23 @@ _glibtop_get_procinfo (glibtop *server, pid_t pid)
 
 	/* test if procsinfo already found */
 
-	if ((server->machine.last_pinfo.pi_pid == pid) && (!first_time))
+	if ((server->machine->last_pinfo.pi_pid == pid) && (!first_time))
 	{
-		return &server->machine.last_pinfo;
+		return &server->machine->last_pinfo;
 	}
 
 	/* seek procsinfo if given pid */
 
 	first_time = 0;
 	current = 0;
-	while ((result =  getprocs( &server->machine.last_pinfo
+	while ((result =  getprocs( &server->machine->last_pinfo
 				  , sizeof(struct procsinfo)
 				  , NULL, 0, &current, 1)) == 1)
 	{
 
-		if (pid == server->machine.last_pinfo.pi_pid)
+		if (pid == server->machine->last_pinfo.pi_pid)
 		{
-			return &server->machine.last_pinfo;
+			return &server->machine->last_pinfo;
 		}
 	}
 	return NULL;

sysdeps/bsd/Makefile.am

@@ -1,5 +1,5 @@
 
-INCLUDES			= @INCLUDES@
+AM_CPPFLAGS			= @AM_CPPFLAGS@
 
 noinst_LTLIBRARIES		= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 

sysdeps/bsd/cpu.c

@@ -61,7 +61,7 @@ void
 _glibtop_init_cpu_p (glibtop *server)
 {
 #ifndef KERN_CP_TIME
-	if (kvm_nlist (server->machine.kd, nlst) < 0) {
+	if (kvm_nlist (server->machine->kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (cpu)");
 		return;
 	}
@@ -100,7 +100,7 @@ glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
 		return;
 	}
 #else
-	if (kvm_read (server->machine.kd, nlst [0].n_value,
+	if (kvm_read (server->machine->kd, nlst [0].n_value,
 		      &cpts, sizeof (cpts)) != sizeof (cpts)) {
 		glibtop_warn_io_r (server, "kvm_read (cp_time)");
 		return;

sysdeps/bsd/glibtop_machine.h

@@ -47,8 +47,6 @@
 
 G_BEGIN_DECLS
 
-typedef struct _glibtop_machine glibtop_machine;
-
 struct _glibtop_machine
 {
 	uid_t uid, euid;

sysdeps/bsd/glibtop_suid.h

@@ -35,11 +35,11 @@ G_BEGIN_DECLS
 #define UREADOK(ki)	(FORCEUREAD || (KI_PROC(ki)->p_flag & P_INMEM))
 
 static inline void glibtop_suid_enter (glibtop *server) {
-	setregid (server->machine.gid, server->machine.egid);
+	setregid (server->machine->gid, server->machine->egid);
 };
 
 static inline void glibtop_suid_leave (glibtop *server) {
-	if (setregid (server->machine.egid, server->machine.gid))
+	if (setregid (server->machine->egid, server->machine->gid))
 		_exit (1);
 };
 

sysdeps/bsd/mem.c

@@ -92,7 +92,7 @@ _glibtop_init_mem_p (glibtop *server)
 {
 	register int pagesize;
 
-	if (kvm_nlist (server->machine.kd, nlst) < 0) {
+	if (kvm_nlist (server->machine->kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (mem)");
 		return;
 	}
@@ -154,14 +154,14 @@ glibtop_get_mem_p (glibtop *server, glibtop_mem *buf)
 	}
 #else
 	/* Get the data from kvm_* */
-	if (kvm_read (server->machine.kd, nlst[1].n_value,
+	if (kvm_read (server->machine->kd, nlst[1].n_value,
 		      &vmm, sizeof (vmm)) != sizeof (vmm)) {
 		glibtop_warn_io_r (server, "kvm_read (cnt)");
 		return;
 	}
 #endif
 
-	if (kvm_read (server->machine.kd, nlst[0].n_value,
+	if (kvm_read (server->machine->kd, nlst[0].n_value,
 		      &bufspace, sizeof (bufspace)) != sizeof (bufspace)) {
 		glibtop_warn_io_r (server, "kvm_read (bufspace)");
 		return;

sysdeps/bsd/msg_limits.c

@@ -75,12 +75,12 @@ static struct nlist nlst [] = {
 void
 _glibtop_init_msg_limits_p (glibtop *server)
 {
-	if (kvm_nlist (server->machine.kd, nlst) < 0) {
+	if (kvm_nlist (server->machine->kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (msg_limits)");
 		return;
 	}
 
-	if (kvm_read (server->machine.kd, nlst [0].n_value,
+	if (kvm_read (server->machine->kd, nlst [0].n_value,
 		      &_msginfo, sizeof (_msginfo)) != sizeof (_msginfo)) {
 		glibtop_warn_io_r (server, "kvm_read (msginfo)");
 		return;

sysdeps/bsd/netload.c

@@ -72,7 +72,7 @@ _glibtop_init_netload_p (glibtop *server)
 {
     server->sysdeps.netload = _glibtop_sysdeps_netload;
 
-    if (kvm_nlist (server->machine.kd, nlst) < 0)
+    if (kvm_nlist (server->machine->kd, nlst) < 0)
 	glibtop_error_io_r (server, "kvm_nlist");
 }
 
@@ -99,7 +99,7 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
 
     memset (buf, 0, sizeof (glibtop_netload));
 
-    if (kvm_read (server->machine.kd, nlst [0].n_value,
+    if (kvm_read (server->machine->kd, nlst [0].n_value,
 		  &ifnetaddr, sizeof (ifnetaddr)) != sizeof (ifnetaddr))
 	glibtop_error_io_r (server, "kvm_read (ifnet)");
 
@@ -111,12 +111,12 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
 	{
 	    ifnetfound = ifnetaddr;
 
-	    if (kvm_read (server->machine.kd, ifnetaddr, &ifnet,
+	    if (kvm_read (server->machine->kd, ifnetaddr, &ifnet,
 			  sizeof (ifnet)) != sizeof (ifnet))
 		    glibtop_error_io_r (server, "kvm_read (ifnetaddr)");
 
 #if (defined(__FreeBSD__) && (__FreeBSD_version < 501113)) || defined(__bsdi__)
-	    if (kvm_read (server->machine.kd, (u_long) ifnet.if_name,
+	    if (kvm_read (server->machine->kd, (u_long) ifnet.if_name,
 			  tname, 16) != 16)
 		    glibtop_error_io_r (server, "kvm_read (if_name)");
 	    tname[15] = '\0';
@@ -202,7 +202,7 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
 	buf->flags = _glibtop_sysdeps_netload;
 
 	while (ifaddraddr) {
-	    if ((kvm_read (server->machine.kd, ifaddraddr, &ifaddr,
+	    if ((kvm_read (server->machine->kd, ifaddraddr, &ifaddr,
 			   sizeof (ifaddr)) != sizeof (ifaddr)))
 		glibtop_error_io_r (server, "kvm_read (ifaddraddr)");
 

sysdeps/bsd/open.c

@@ -52,33 +52,33 @@ glibtop_open_p (glibtop *server, const char *program_name,
 		const unsigned long features,
 		const unsigned flags)
 {
-#ifdef DEBUG
+#ifdef LIBGTOP_ENABLE_DEBUG
 	fprintf (stderr, "DEBUG (%d): glibtop_open_p ()\n", getpid ());
 #endif
 
 	/* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */
 
-	server->machine.uid = getuid ();
+	server->machine->uid = getuid ();
-	server->machine.euid = geteuid ();
+	server->machine->euid = geteuid ();
-	server->machine.gid = getgid ();
+	server->machine->gid = getgid ();
-	server->machine.egid = getegid ();
+	server->machine->egid = getegid ();
 
 #ifdef __FreeBSD__
 	server->os_version_code = __FreeBSD_version;
 #endif
 
 	/* Setup machine-specific data */
-	server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open");
+	server->machine->kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open");
 
-	if (server->machine.kd == NULL)
+	if (server->machine->kd == NULL)
 		glibtop_error_io_r (server, "kvm_open");
 
 	/* Drop priviledges. */
 
-	if (setreuid (server->machine.euid, server->machine.uid))
+	if (setreuid (server->machine->euid, server->machine->uid))
 		_exit (1);
 
-	if (setregid (server->machine.egid, server->machine.gid))
+	if (setregid (server->machine->egid, server->machine->gid))
 		_exit (1);
 
 	/* !!! END OF SUID ROOT PART !!! */

sysdeps/bsd/ppp.c

@@ -81,7 +81,7 @@ _glibtop_init_ppp_p (glibtop *server)
 #endif
 #endif /* HAVE_I4B */
 
-	if (kvm_nlist (server->machine.kd, nlst) < 0)
+	if (kvm_nlist (server->machine->kd, nlst) < 0)
 		glibtop_error_io_r (server, "kvm_nlist");
 }
 
@@ -102,7 +102,7 @@ glibtop_get_ppp_p (glibtop *server, glibtop_ppp *buf, unsigned short device)
 
 	memset (buf, 0, sizeof (glibtop_ppp));
 
-	if (kvm_read (server->machine.kd, nlst [0].n_value,
+	if (kvm_read (server->machine->kd, nlst [0].n_value,
 		      &data, sizeof (data)) != sizeof (data))
 		glibtop_error_io_r (server, "kvm_read (i4bisppp_softc)");
 

sysdeps/bsd/procargs.c

@@ -72,14 +72,14 @@ glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
 	glibtop_suid_enter (server);
 
 	/* Get the process data */
-	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+	pinfo = kvm_getprocs (server->machine->kd, KERN_PROC_PID, pid, &count);
 	if ((pinfo == NULL) || (count < 1)) {
 		glibtop_suid_leave (server);
 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
 		return NULL;
 	}
 
-	args = kvm_getargv (server->machine.kd, pinfo, max_len);
+	args = kvm_getargv (server->machine->kd, pinfo, max_len);
 	if (args == NULL) {
 		glibtop_suid_leave (server);
 		glibtop_warn_io_r (server, "kvm_getargv (%d)", pid);

sysdeps/bsd/prockernel.c

@@ -113,7 +113,7 @@ glibtop_get_proc_kernel_p (glibtop *server,
 	if (pid == 0) return;
 
 	/* Get the process information */
-	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+	pinfo = kvm_getprocs (server->machine->kd, KERN_PROC_PID, pid, &count);
 	if ((pinfo == NULL) || (count != 1)) {
 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
 		return;
@@ -170,11 +170,11 @@ glibtop_get_proc_kernel_p (glibtop *server,
 	/* On NetBSD, there is no kvm_uread(), and kvm_read() always reads
 	 * from kernel memory.  */
 
-	if (kvm_read (server->machine.kd,
+	if (kvm_read (server->machine->kd,
 #else
 
 	if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
-	    kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
+	    kvm_uread (server->machine->kd, &(pinfo [0]).kp_proc,
 #endif
 		       (unsigned long) &u_addr->u_stats,
 		       (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
@@ -195,10 +195,10 @@ glibtop_get_proc_kernel_p (glibtop *server,
 		}
 
 #ifdef __NetBSD__
-	if (kvm_read (server->machine.kd,
+	if (kvm_read (server->machine->kd,
 #else
 	if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
-	    kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
+	    kvm_uread (server->machine->kd, &(pinfo [0]).kp_proc,
 #endif
 		       (unsigned long) &u_addr->u_pcb,
 		       (char *) &pcb, sizeof (pcb)) == sizeof (pcb))

sysdeps/bsd/proclist.c

@@ -72,7 +72,7 @@ glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
 	which = (int)(real_which & GLIBTOP_KERN_PROC_MASK);
 
 	/* Get the process data */
-	pinfo = kvm_getprocs (server->machine.kd, which, arg, &count);
+	pinfo = kvm_getprocs (server->machine->kd, which, arg, &count);
 	if ((pinfo == NULL) || (count < 1)) {
 		glibtop_warn_io_r (server, "kvm_getprocs (proclist)");
 		return NULL;

sysdeps/bsd/procmap.c

@@ -128,7 +128,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 	glibtop_suid_enter (server);
 
 	/* Get the process data */
-	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+	pinfo = kvm_getprocs (server->machine->kd, KERN_PROC_PID, pid, &count);
 	if ((pinfo == NULL) || (count < 1)) {
 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
 		return (glibtop_map_entry*) g_array_free(maps, TRUE);
@@ -136,7 +136,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 
 	/* Now we get the memory maps. */
 
-	if (kvm_read (server->machine.kd,
+	if (kvm_read (server->machine->kd,
 #if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
 		      (unsigned long) pinfo [0].ki_vmspace,
 #else
@@ -147,7 +147,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 
 	first = vmspace.vm_map.header.next;
 
-	if (kvm_read (server->machine.kd,
+	if (kvm_read (server->machine->kd,
 		      (unsigned long) vmspace.vm_map.header.next,
 		      (char *) &entry, sizeof (entry)) != sizeof (entry))
 		glibtop_error_io_r (server, "kvm_read (entry)");
@@ -173,7 +173,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 		guint len;
 
 		if (update) {
-			if (kvm_read (server->machine.kd,
+			if (kvm_read (server->machine->kd,
 				      (unsigned long) entry.next,
 				      &entry, sizeof (entry)) != sizeof (entry))
 				glibtop_error_io_r (server, "kvm_read (entry)");
@@ -206,7 +206,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 
 		/* We're only interested in vnodes */
 
-		if (kvm_read (server->machine.kd,
+		if (kvm_read (server->machine->kd,
 			      (unsigned long) entry.object.uvm_obj,
 			      &vnode, sizeof (vnode)) != sizeof (vnode)) {
 			glibtop_warn_io_r (server, "kvm_read (vnode)");
@@ -218,7 +218,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 
 		/* We're only interested in `vm_object's */
 
-		if (kvm_read (server->machine.kd,
+		if (kvm_read (server->machine->kd,
 			      (unsigned long) entry.object.vm_object,
 			      &object, sizeof (object)) != sizeof (object))
 			glibtop_error_io_r (server, "kvm_read (object)");
@@ -232,7 +232,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 		if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) ||
 		    !vnode.v_data) continue;
 
-		if (kvm_read (server->machine.kd,
+		if (kvm_read (server->machine->kd,
 			      (unsigned long) vnode.v_data,
 			      &inode, sizeof (inode)) != sizeof (inode))
 			glibtop_error_io_r (server, "kvm_read (inode)");
@@ -251,7 +251,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 		if (!object.handle)
 			continue;
 
-		if (kvm_read (server->machine.kd,
+		if (kvm_read (server->machine->kd,
 			      (unsigned long) object.handle,
 			      &vnode, sizeof (vnode)) != sizeof (vnode))
 			glibtop_error_io_r (server, "kvm_read (vnode)");
@@ -270,7 +270,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 		if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) ||
 		    !vnode.v_data) continue;
 
-		if (kvm_read (server->machine.kd,
+		if (kvm_read (server->machine->kd,
 			      (unsigned long) vnode.v_data,
 			      &inode, sizeof (inode)) != sizeof (inode))
 			glibtop_error_io_r (server, "kvm_read (inode)");

sysdeps/bsd/procmem.c

@@ -140,7 +140,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
 	if (pid == 0) return;
 
 	/* Get the process data */
-	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+	pinfo = kvm_getprocs (server->machine->kd, KERN_PROC_PID, pid, &count);
 	if ((pinfo == NULL) || (count < 1)) {
 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
 		return;
@@ -161,7 +161,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
 
 #define        PROC_VMSPACE   kp_proc.p_vmspace
 
-	if (kvm_read (server->machine.kd,
+	if (kvm_read (server->machine->kd,
 		      (unsigned long) pinfo [0].PROC_VMSPACE,
 		      (char *) &plimit, sizeof (plimit)) != sizeof (plimit)) {
 		glibtop_warn_io_r (server, "kvm_read (plimit)");
@@ -182,7 +182,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
 
 	/* Now we get the shared memory. */
 
-	if (kvm_read (server->machine.kd,
+	if (kvm_read (server->machine->kd,
 		      (unsigned long) pinfo [0].PROC_VMSPACE,
 		      (char *) &vmspace, sizeof (vmspace)) != sizeof (vmspace)) {
 		glibtop_warn_io_r (server, "kvm_read (vmspace)");
@@ -191,7 +191,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
 
 	first = vmspace.vm_map.header.next;
 
-	if (kvm_read (server->machine.kd,
+	if (kvm_read (server->machine->kd,
 		      (unsigned long) vmspace.vm_map.header.next,
 		      (char *) &entry, sizeof (entry)) != sizeof (entry)) {
 		glibtop_warn_io_r (server, "kvm_read (entry)");
@@ -205,7 +205,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
 	 * to OBJT_DEFAULT so if seems this really works. */
 
 	while (entry.next != first) {
-		if (kvm_read (server->machine.kd,
+		if (kvm_read (server->machine->kd,
 			      (unsigned long) entry.next,
 			      &entry, sizeof (entry)) != sizeof (entry)) {
 			glibtop_warn_io_r (server, "kvm_read (entry)");
@@ -236,7 +236,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
 
 		/* We're only interested in vnodes */
 
-		if (kvm_read (server->machine.kd,
+		if (kvm_read (server->machine->kd,
 			      (unsigned long) entry.object.uvm_obj,
 			      &vnode, sizeof (vnode)) != sizeof (vnode)) {
 			glibtop_warn_io_r (server, "kvm_read (vnode)");
@@ -248,7 +248,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
 
 		/* We're only interested in `vm_object's */
 
-		if (kvm_read (server->machine.kd,
+		if (kvm_read (server->machine->kd,
 			      (unsigned long) entry.object.vm_object,
 			      &object, sizeof (object)) != sizeof (object)) {
 			glibtop_warn_io_r (server, "kvm_read (object)");

sysdeps/bsd/procsegment.c

@@ -53,7 +53,7 @@ glibtop_get_proc_segment_p (glibtop *server,
 
 #if 0
 	/* Get the process info from the kernel */
-	kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, count);
+	kvm_getprocs (server->machine->kd, KERN_PROC_PID, pid, count);
 	if (*count != 1) {
 		return; /* the zeroed-out buffer indicating no data */
 	}

sysdeps/bsd/procsignal.c

@@ -62,7 +62,7 @@ glibtop_get_proc_signal_p (glibtop *server,
 	if (pid == 0) return;
 
 	/* Get the process information */
-	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+	pinfo = kvm_getprocs (server->machine->kd, KERN_PROC_PID, pid, &count);
 	if ((pinfo == NULL) || (count != 1)) {
 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
 		return;

sysdeps/bsd/procstate.c

@@ -65,7 +65,7 @@ glibtop_get_proc_state_p (glibtop *server,
 	if (pid == 0) return;
 
 	/* Get the process information */
-	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+	pinfo = kvm_getprocs (server->machine->kd, KERN_PROC_PID, pid, &count);
 	if ((pinfo == NULL) || (count != 1)) {
 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
 		return;

sysdeps/bsd/proctime.c

@@ -136,7 +136,7 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
 #endif
 
 	/* Get the process information */
-	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+	pinfo = kvm_getprocs (server->machine->kd, KERN_PROC_PID, pid, &count);
 	if ((pinfo == NULL) || (count != 1)) {
 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
 		return;
@@ -156,7 +156,7 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
 #if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || (defined(OpenBSD) && (OpenBSD >= 199912))
 	glibtop_suid_enter (server);
 
-	if (kvm_read (server->machine.kd,
+	if (kvm_read (server->machine->kd,
 		      (unsigned long) pinfo [0].kp_proc.p_stats,
 		      &pstats, sizeof (pstats)) != sizeof (pstats)) {
 		glibtop_warn_io_r (server, "kvm_read (pstats)");
@@ -202,7 +202,7 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
 #elif (__FreeBSD_version <= 500013)
 
         if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
-            kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
+            kvm_uread (server->machine->kd, &(pinfo [0]).kp_proc,
                        (unsigned long) &u_addr->u_stats,
                        (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
 		{
@@ -218,7 +218,7 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
 #else
 
 	if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
-	    kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
+	    kvm_uread (server->machine->kd, &(pinfo [0]).kp_proc,
 		       (unsigned long) &u_addr->u_stats,
 		       (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
 		{

sysdeps/bsd/procuid.c

@@ -69,7 +69,7 @@ glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf,
 	if (pid == 0) return;
 
 	/* Get the process information */
-	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+	pinfo = kvm_getprocs (server->machine->kd, KERN_PROC_PID, pid, &count);
 	if ((pinfo == NULL) || (count != 1)) {
 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
 		return;
@@ -128,7 +128,7 @@ glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf,
 	ucred_ptr = (void *) pinfo [0].kp_eproc.e_pcred.pc_ucred;
 
 	if (ucred_ptr) {
-		if (kvm_read (server->machine.kd, (unsigned long) ucred_ptr,
+		if (kvm_read (server->machine->kd, (unsigned long) ucred_ptr,
 			      &ucred, sizeof (ucred)) != sizeof (ucred)) {
 			glibtop_warn_io_r (server, "kvm_read (ucred)");
 		} else {

sysdeps/bsd/sem_limits.c

@@ -77,12 +77,12 @@ static struct nlist nlst [] = {
 void
 _glibtop_init_sem_limits_p (glibtop *server)
 {
-	if (kvm_nlist (server->machine.kd, nlst) < 0) {
+	if (kvm_nlist (server->machine->kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (sem_limits)");
 		return;
 	}
 
-	if (kvm_read (server->machine.kd, nlst [0].n_value,
+	if (kvm_read (server->machine->kd, nlst [0].n_value,
 		      &_seminfo, sizeof (_seminfo)) != sizeof (_seminfo)) {
 		glibtop_warn_io_r (server, "kvm_read (seminfo)");
 		return;

sysdeps/bsd/shm_limits.c

@@ -75,12 +75,12 @@ static struct nlist nlst [] = {
 void
 _glibtop_init_shm_limits_p (glibtop *server)
 {
-	if (kvm_nlist (server->machine.kd, nlst) < 0) {
+	if (kvm_nlist (server->machine->kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (shm_limits)");
 		return;
 	}
 
-	if (kvm_read (server->machine.kd, nlst [0].n_value,
+	if (kvm_read (server->machine->kd, nlst [0].n_value,
 		      &_shminfo, sizeof (_shminfo)) != sizeof (_shminfo)) {
 		glibtop_warn_io_r (server, "kvm_read (shminfo)");
 		return;

sysdeps/bsd/swap.c

@@ -94,14 +94,14 @@ _glibtop_init_swap_p (glibtop *server)
 {
 #if defined(__FreeBSD__) || defined(__bsdi__) || defined(__FreeBSD_kernel__)
 #if __FreeBSD__ < 4 || defined(__bsdi__)
-	if (kvm_nlist (server->machine.kd, nlst) < 0) {
+	if (kvm_nlist (server->machine->kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (swap)");
 		return;
 	}
 #else
 	struct kvm_swap dummy;
 
-	if (kvm_getswapinfo (server->machine.kd, &dummy, 1, 0) != 0) {
+	if (kvm_getswapinfo (server->machine->kd, &dummy, 1, 0) != 0) {
 		glibtop_warn_io_r (server, "kvm_swap (swap)");
 		return;
 	}
@@ -109,7 +109,7 @@ _glibtop_init_swap_p (glibtop *server)
 #endif
 
 #if !(defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) && !defined(__OpenBSD__)
-	if (kvm_nlist (server->machine.kd, nlst2) < 0) {
+	if (kvm_nlist (server->machine->kd, nlst2) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (cnt)");
 		return;
 	}
@@ -181,7 +181,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 #else
 	/* This is used to get the `pagein' and `pageout' members. */
 
-	if (kvm_read (server->machine.kd, nlst2[0].n_value,
+	if (kvm_read (server->machine->kd, nlst2[0].n_value,
 		      &vmm, sizeof (vmm)) != sizeof (vmm)) {
 		glibtop_warn_io_r (server, "kvm_read (cnt)");
 		return;
@@ -228,7 +228,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 
 	/* Size of largest swap device. */
 
-	if (kvm_read (server->machine.kd, nlst[VM_NSWAP].n_value,
+	if (kvm_read (server->machine->kd, nlst[VM_NSWAP].n_value,
 		      &nswap, sizeof (nswap)) != sizeof (nswap)) {
 		glibtop_warn_io_r (server, "kvm_read (nswap)");
 		return;
@@ -236,7 +236,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 
 	/* Number of swap devices. */
 
-	if (kvm_read (server->machine.kd, nlst[VM_NSWDEV].n_value,
+	if (kvm_read (server->machine->kd, nlst[VM_NSWDEV].n_value,
 		      &nswdev, sizeof (nswdev)) != sizeof (nswdev)) {
 		glibtop_warn_io_r (server, "kvm_read (nswdev)");
 		return;
@@ -244,7 +244,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 
 	/* Maximum size of a swap block. */
 
-	if (kvm_read (server->machine.kd, nlst[VM_DMMAX].n_value,
+	if (kvm_read (server->machine->kd, nlst[VM_DMMAX].n_value,
 		      &dmmax, sizeof (dmmax)) != sizeof (dmmax)) {
 		glibtop_warn_io_r (server, "kvm_read (dmmax)");
 		return;
@@ -252,7 +252,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 
 	/* List of free swap areas. */
 
-	if (kvm_read (server->machine.kd, nlst[VM_SWAPLIST].n_value,
+	if (kvm_read (server->machine->kd, nlst[VM_SWAPLIST].n_value,
 		      &swaplist, sizeof (swaplist)) != sizeof (swaplist)) {
 		glibtop_warn_io_r (server, "kvm_read (swaplist)");
 		return;
@@ -260,7 +260,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 
 	/* Kernel offset of list of swap devices and sizes. */
 
-	if (kvm_read (server->machine.kd, nlst[VM_SWDEVT].n_value,
+	if (kvm_read (server->machine->kd, nlst[VM_SWDEVT].n_value,
 		      &ptr, sizeof (ptr)) != sizeof (ptr)) {
 		glibtop_warn_io_r (server, "kvm_read (swdevt)");
 		return;
@@ -271,7 +271,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 	sw_size = nswdev * sizeof (*sw);
 	sw = g_malloc (sw_size);
 
-	if (kvm_read (server->machine.kd, ptr, sw, sw_size) != (ssize_t)sw_size) {
+	if (kvm_read (server->machine->kd, ptr, sw, sw_size) != (ssize_t)sw_size) {
 		glibtop_warn_io_r (server, "kvm_read (*swdevt)");
 		return;
 	}
@@ -288,7 +288,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 	while (swapptr) {
 		int	top, bottom, next_block;
 
-		if (kvm_read (server->machine.kd, (int) swapptr, &head,
+		if (kvm_read (server->machine->kd, (int) swapptr, &head,
 			      sizeof (struct rlist)) != sizeof (struct rlist)) {
 			glibtop_warn_io_r (server, "kvm_read (swapptr)");
 			return;
@@ -365,7 +365,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 
 #else
 
-	nswdev = kvm_getswapinfo(server->machine.kd, kvmsw, 16, 0);
+	nswdev = kvm_getswapinfo(server->machine->kd, kvmsw, 16, 0);
 
 	buf->flags = _glibtop_sysdeps_swap;
 
@@ -380,7 +380,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 
 	/* General info about swap devices. */
 
-	if (kvm_read (server->machine.kd, nlst[0].n_value,
+	if (kvm_read (server->machine->kd, nlst[0].n_value,
 		      &swap, sizeof (swap)) != sizeof (swap)) {
 		glibtop_warn_io_r (server, "kvm_read (swap)");
 		return;

sysdeps/common/Makefile.am

@@ -1,5 +1,5 @@
 
-INCLUDES			= @INCLUDES@
+AM_CPPFLAGS			= @AM_CPPFLAGS@
 
 noinst_LTLIBRARIES		= libgtop_common-2.0.la libgtop_suid_common-2.0.la
 

sysdeps/common/error.c

@@ -26,24 +26,66 @@
 
 #include <glibtop/error.h>
 
+enum MESSAGE_LEVEL {
+	MESSAGE_DEBUG,
+	MESSAGE_WARNING,
+	MESSAGE_ERROR
+};
+
 #define DEFAULT_NAME	"LibGTop-Server"
 
 /* Prints error message and exits. */
 
 static void
-print_server_name (const glibtop *server)
+print_message (const glibtop *server, int message_level, const char *format, int error, va_list args)
 {
-	fprintf (stderr, "%s: ", server && server->name
+	const char *level;
-		 ? server->name
+	GString* message;
-		 : DEFAULT_NAME);
+
+	message = g_string_new(NULL);
+
+	g_string_printf(message, "%s", (server && server->name ? server->name : DEFAULT_NAME));
+
+	if (server->pid) {
+		g_string_append_printf(message, "(c=%u/s=%u)", getpid(), server->pid);
+	}
+	else {
+		g_string_append_printf(message, "(c=%u)", getpid());
+	}
+
+	switch (message_level) {
+	case MESSAGE_DEBUG:
+		level = "DEBUG";
+		break;
+	case MESSAGE_WARNING:
+		level = "WARNING";
+		break;
+	case MESSAGE_ERROR:
+		level = "ERROR";
+		break;
+	default:
+		level = "UNKNOWN";
+	}
+
+	g_string_append_printf(message, ": [%s] ", level);
+
+	g_string_append_vprintf(message, format, args);
+
+	if (error) {
+		g_string_append_printf(message, ": %s", g_strerror(error));
+	}
+
+	g_string_append_c(message, '\n');
+
+	fputs(message->str, stderr);
+
+	g_string_free(message, TRUE);
 }
 
 void
 glibtop_error_vr (glibtop *server, const char *format, va_list args)
 {
-	print_server_name (server);
+	print_message (server, MESSAGE_ERROR, format, 0, args);
-	vfprintf (stderr, format, args);
-	fputc('\n', stderr);
 
 #ifdef LIBGTOP_ENABLE_DEBUG
 	abort ();
@@ -55,9 +97,7 @@ glibtop_error_vr (glibtop *server, const char *format, va_list args)
 void
 glibtop_error_io_vr (glibtop *server, const char *format, int error, va_list args)
 {
-	print_server_name (server);
+	print_message (server, MESSAGE_ERROR, format, error, args);
-	vfprintf (stderr, format, args);
-	fprintf (stderr, ": %s\n", g_strerror (error));
 
 #ifdef LIBGTOP_ENABLE_DEBUG
 	abort ();
@@ -69,9 +109,7 @@ glibtop_error_io_vr (glibtop *server, const char *format, int error, va_list arg
 void
 glibtop_warn_vr (glibtop *server, const char *format, va_list args)
 {
-	print_server_name (server);
+	print_message (server, MESSAGE_WARNING, format, 0, args);
-	vfprintf (stderr, format, args);
-	fputc('\n', stderr);
 
 #ifdef LIBGTOP_FATAL_WARNINGS
 	abort ();
@@ -81,9 +119,7 @@ glibtop_warn_vr (glibtop *server, const char *format, va_list args)
 void
 glibtop_warn_io_vr (glibtop *server, const char *format, int error, va_list args)
 {
-	print_server_name (server);
+	print_message (server, MESSAGE_WARNING, format, error, args);
-	vfprintf (stderr, format, args);
-	fprintf (stderr, ": %s\n", g_strerror (error));
 
 #ifdef LIBGTOP_FATAL_WARNINGS
 	abort ();
@@ -133,6 +169,23 @@ glibtop_warn_io_r (glibtop *server, const char *format, ...)
 }
 
 
+void
+glibtop_debug_vr (glibtop *server, const char *format, va_list args)
+{
+	print_message (server, MESSAGE_DEBUG, format, 0, args);
+}
+
+void
+glibtop_debug_r_real (glibtop *server, const char *format, ...)
+{
+	va_list args;
+
+	va_start (args, format);
+	glibtop_debug_vr (server, format, args);
+	va_end (args);
+}
+
+
 void
 glibtop_error (const char *format, ...)
 {

sysdeps/common/error_suid.c

@@ -1,173 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include <config.h>
-
-#include <glib.h>
-#include <errno.h>
-
-#include <glibtop/error.h>
-
-#define DEFAULT_NAME	"LibGTop-Server"
-
-/* Prints error message and exits. */
-
-static void
-print_server_name (glibtop_server *server)
-{
-    fprintf (stderr, "%s: ", server ?
-	     (server->name ? server->name : DEFAULT_NAME)
-	     : DEFAULT_NAME);
-}
-
-void
-glibtop_error_vr (glibtop_server *server, char *format, va_list args)
-{
-    print_server_name (server);
-    vfprintf (stderr, format, args);
-    fprintf (stderr, "\n");
-
-#ifdef LIBGTOP_ENABLE_DEBUG
-    abort ();
-#else
-    exit (1);
-#endif
-}
-
-void
-glibtop_error_io_vr (glibtop_server *server, char *format, int error, va_list args)
-{
-    print_server_name (server);
-    vfprintf (stderr, format, args);
-    fprintf (stderr, ": %s\n", g_strerror (error));
-
-#ifdef LIBGTOP_ENABLE_DEBUG
-    abort ();
-#else
-    exit (1);
-#endif
-}
-
-void
-glibtop_warn_vr (glibtop_server *server, char *format, va_list args)
-{
-    print_server_name (server);
-    vfprintf (stderr, format, args);
-    fprintf (stderr, "\n");
-
-#ifdef LIBGTOP_FATAL_WARNINGS
-    abort ();
-#endif
-}
-
-void
-glibtop_warn_io_vr (glibtop_server *server, char *format, int error, va_list args)
-{
-    print_server_name (server);
-    vfprintf (stderr, format, args);
-    fprintf (stderr, ": %s\n", g_strerror (error));
-
-#ifdef LIBGTOP_FATAL_WARNINGS
-    abort ();
-#endif
-}
-
-void
-glibtop_error_r (glibtop_server *server, char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_error_vr (server, format, args);
-    va_end (args);
-}
-
-void
-glibtop_warn_r (glibtop_server *server, char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_warn_vr (server, format, args);
-    va_end (args);
-}
-
-void
-glibtop_error_io_r (glibtop_server *server, char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_error_io_vr (server, format, errno, args);
-    va_end (args);
-}
-
-void
-glibtop_warn_io_r (glibtop_server *server, char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_warn_io_vr (server, format, errno, args);
-    va_end (args);
-}
-
-#ifndef  __GNUC__
-
-static void
-glibtop_error (char *format, ...)
-{
-    va_list args;
-    va_start (args, format);
-    glibtop_error_vr (glibtop_global_server, format, args);
-    va_end (args);
-}
-
-static void
-glibtop_warn (char *format, ...)
-{
-    va_list args;
-    va_start (args, format);
-    glibtop_warn_vr (glibtop_global_server, format, args);
-    va_end (args);
-}
-
-static void
-glibtop_error_io (char *format, ...)
-{
-    va_list args;
-    va_start (args, format);
-    glibtop_error_io_vr (glibtop_global_server, format, errno, args);
-    va_end (args);
-}
-
-static void
-glibtop_warn_io (char *format, ...)
-{
-    va_list args;
-    va_start (args, format);
-    glibtop_warn_io_vr (glibtop_global_server, format, errno, args);
-    va_end (args);
-}
-
-#endif /* no __GNUC__ */

sysdeps/cygwin/Makefile.am

@@ -1,4 +1,4 @@
-INCLUDES			= @INCLUDES@
+AM_CPPFLAGS			= @AM_CPPFLAGS@
 
 noinst_LTLIBRARIES		= libgtop_sysdeps-2.0.la
 

sysdeps/cygwin/glibtop_machine.h

@@ -28,8 +28,6 @@
 
 G_BEGIN_DECLS
 
-typedef struct _glibtop_machine		glibtop_machine;
-
 struct _glibtop_machine
 {
 	pid_t	last_pid;

sysdeps/darwin/Makefile.am

@@ -1,4 +1,4 @@
-INCLUDES			= @INCLUDES@ @LIBGTOP_INCS@
+AM_CPPFLAGS			= @AM_CPPFLAGS@ @LIBGTOP_INCS@
 
 noinst_LTLIBRARIES			= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 

sysdeps/darwin/glibtop_machine.h

@@ -22,8 +22,6 @@
 
 G_BEGIN_DECLS
 
-typedef struct _glibtop_machine		glibtop_machine;
-
 struct _glibtop_machine
 {
 	uid_t uid, euid;		/* Real and effective user id */

sysdeps/darwin/glibtop_suid.h

@@ -22,12 +22,14 @@
 
 G_BEGIN_DECLS
 
+#include <glibtop_machine.h>
+
 static inline void glibtop_suid_enter (glibtop *server) {
-	setreuid (server->machine.uid, server->machine.euid);
+	setreuid (server->machine->uid, server->machine->euid);
 };
 
 static inline void glibtop_suid_leave (glibtop *server) {
-	if (setreuid (server->machine.euid, server->machine.uid))
+	if (setreuid (server->machine->euid, server->machine->uid))
 		_exit (1);
 };
 

sysdeps/darwin/open.c

@@ -23,6 +23,8 @@
 #include <glibtop/cpu.h>
 #include <glibtop/open.h>
 
+#include <glibtop_machine.h>
+
 #include <mach/mach_host.h>
 #include <mach/mach_init.h>
 #include <mach/mach_interface.h>
@@ -67,17 +69,17 @@ glibtop_open_p (glibtop *server, const char *program_name,
 
 	server->name = program_name;
 
-	server->machine.uid = getuid ();
+	server->machine->uid = getuid ();
-	server->machine.euid = geteuid ();
+	server->machine->euid = geteuid ();
-	server->machine.gid = getgid ();
+	server->machine->gid = getgid ();
-	server->machine.egid = getegid ();
+	server->machine->egid = getegid ();
 
 	/* Drop priviledges. */	
 
-	if (setreuid (server->machine.euid, server->machine.uid))
+	if (setreuid (server->machine->euid, server->machine->uid))
 		_exit (1);
 
-	if (setregid (server->machine.egid, server->machine.gid))
+	if (setregid (server->machine->egid, server->machine->gid))
 		_exit (1);
 	
 	/* !!! END OF SUID ROOT PART !!! */

sysdeps/freebsd/Makefile.am

@@ -1,5 +1,5 @@
 
-INCLUDES			= @INCLUDES@
+AM_CPPFLAGS			= @AM_CPPFLAGS@
 
 noinst_LTLIBRARIES		= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
@@ -21,6 +21,8 @@ libgtop_sysdeps_suid_2_0_la_SOURCES	= suid_open.c close.c swap.c \
 libgtop_sysdeps_suid_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h \
-				  glibtop_suid.h glibtop_private.h
+				  glibtop_suid.h
 
 libgtopincludedir		= $(includedir)/libgtop-2.0
+
+noinst_HEADERS			= glibtop_private.h

sysdeps/freebsd/cpu.c

@@ -59,8 +59,6 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
 	size_t length;
 	int ncpu, i;
 
-	glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0);
-
 	memset (buf, 0, sizeof (glibtop_cpu));
 
 	length = sizeof (cpts);

sysdeps/freebsd/fsusage.c

@@ -132,16 +132,16 @@ _glibtop_get_fsusage_read_write (glibtop *server, glibtop_fsusage *buf, const ch
         buf->read = sfs.f_syncreads + sfs.f_asyncreads;
         buf->write = sfs.f_syncwrites + sfs.f_asyncwrites;
 #endif
+	if (buf->read || buf->write) {
                 buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE);
 	}
+}
 
 void
 glibtop_get_fsusage_s(glibtop *server, glibtop_fsusage *buf, const char *path)
 {
 	struct statvfs fsd;
 
-	glibtop_init_r (&server, 0, 0);
-
 	memset (buf, 0, sizeof (glibtop_fsusage));
 
 	if (statvfs (path, &fsd) < 0)

sysdeps/freebsd/glibtop_machine.h

@@ -38,8 +38,6 @@
 
 G_BEGIN_DECLS
 
-typedef struct _glibtop_machine glibtop_machine;
-
 struct _glibtop_machine
 {
 	uid_t uid, euid;

sysdeps/freebsd/glibtop_suid.h

@@ -28,6 +28,8 @@ G_BEGIN_DECLS
 #include <sys/param.h>
 #endif
 
+#include <glibtop_machine.h>
+
 #define KI_PROC(ki) (&(ki))->kp_proc)
 #define KI_EPROC(ki) (&(ki))->kp_eproc)
 
@@ -35,12 +37,16 @@ G_BEGIN_DECLS
 #define UREADOK(ki)	(FORCEUREAD || (KI_PROC(ki)->p_flag & P_INMEM))
 
 static inline void glibtop_suid_enter (glibtop *server) {
-	setregid (server->machine.gid, server->machine.egid);
+	glibtop_debug ("uid=%d euid=%d gid=%d egid=%d", getuid(), geteuid(), getgid(), getegid());
+	setregid (server->machine->gid, server->machine->egid);
+	glibtop_debug ("uid=%d euid=%d gid=%d egid=%d", getuid(), geteuid(), getgid(), getegid());
 };
 
 static inline void glibtop_suid_leave (glibtop *server) {
-	if (setregid (server->machine.egid, server->machine.gid))
+	glibtop_debug ("uid=%d euid=%d gid=%d egid=%d", getuid(), geteuid(), getgid(), getegid());
+	if (setregid (server->machine->egid, server->machine->gid))
 		_exit (1);
+	glibtop_debug ("uid=%d euid=%d gid=%d egid=%d", getuid(), geteuid(), getgid(), getegid());
 };
 
 void

sysdeps/freebsd/loadavg.c

@@ -48,22 +48,15 @@ _glibtop_init_loadavg_s (glibtop *server)
 void
 glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf)
 {
-	double ldavg[3];
 	pid_t last_pid;
 	size_t len;
-	int i;
-
-	glibtop_init_s (&server, GLIBTOP_SYSDEPS_LOADAVG, 0);
 
 	memset (buf, 0, sizeof (glibtop_loadavg));
 
-	getloadavg (ldavg, 3);
+	if (getloadavg (buf->loadavg, G_N_ELEMENTS(buf->loadavg)) == -1)
+		return;
 
-	/* fill in the struct */
 	buf->flags = _glibtop_sysdeps_loadavg;
-	for (i = 0; i < 3; i++) {
-		buf->loadavg [i] = ldavg [i];
-	} /* end for */
 
 	len = sizeof (last_pid);
 	if (sysctlbyname ("kern.lastpid", &last_pid, &len, NULL, 0)) {

sysdeps/freebsd/mem.c

@@ -45,46 +45,55 @@ _glibtop_init_mem_s (glibtop *server)
 	server->sysdeps.mem = _glibtop_sysdeps_mem;
 }
 
+static gulong mem_get_by_bytes (glibtop *server, const char *name) {
+	gulong result = 0;
+	size_t len = sizeof (result);
+
+	if (sysctlbyname (name, &result, &len, NULL, 0)) {
+		glibtop_warn_io_r (server, "sysctl (%s)", name);
+	}
+	return result;
+}
+
+static gulong mem_get_by_pages (glibtop *server, const char *name) {
+	guint result = 0;
+	size_t len = sizeof (result);
+
+	if (sysctlbyname (name, &result, &len, NULL, 0)) {
+		glibtop_warn_io_r (server, "sysctl (%s)", name);
+	}
+	return (gulong) result * pagesize;
+}
+
 void
 glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
 {
 	gulong memtotal;
-	guint memused;
+	gulong memactive;
-	gulong buffers;
+	gulong meminactive;
-	guint cached;
+	gulong memwired;
-	size_t len;
+	gulong memcached;
-
+	gulong membuffer;
-	glibtop_init_s (&server, GLIBTOP_SYSDEPS_MEM, 0);
+	gulong memfree;
 
 	memset (buf, 0, sizeof *buf);
 
-	len = sizeof (memtotal);
+	memtotal = mem_get_by_bytes (server, "hw.physmem");
-	if (sysctlbyname ("hw.physmem", &memtotal, &len, NULL, 0)) {
+	memactive = mem_get_by_pages (server, "vm.stats.vm.v_active_count");
-		glibtop_warn_io_r (server, "sysctl (hw.physmem)");
+	meminactive = mem_get_by_pages (server, "vm.stats.vm.v_inactive_count");
-		return;
+	memwired = mem_get_by_pages (server, "vm.stats.vm.v_wire_count");
-	}
+	memcached = mem_get_by_pages (server, "vm.stats.vm.v_cache_count");
-
+	membuffer = mem_get_by_bytes (server, "vfs.bufspace");
-	len = sizeof (memused);
+	memfree = mem_get_by_pages (server, "vm.stats.vm.v_free_count");
-	if (sysctlbyname ("vm.stats.vm.v_wire_count", &memused, &len, NULL, 0)) {
-		glibtop_warn_io_r (server, "sysctl (vm.stats.vm.v_wire_count)");
-		return;
-	}
-
-	len = sizeof (cached);
-	if (sysctlbyname ("vm.stats.vm.v_cache_count", &cached, &len, NULL, 0)) {
-		glibtop_warn_io_r (server, "sysctl (vm.stats.vm.v_cache_count)");
-		return;
-	}
-
-	buffers = 0;
 
 	buf->total = memtotal;
-	buf->used = (memused * (gulong) pagesize);
+	buf->used = memtotal - memfree;
-	buf->free = (buf->total - buf->used);
+	buf->free = memfree;
 	buf->shared = 0;
-	buf->cached = (cached * (gulong) pagesize);
+	buf->buffer = membuffer;
-	buf->buffer = buffers;
+	buf->cached = memcached;
+	buf->locked = 0;
 
-	buf->user = buf->total - buf->free - buf->cached - buf->buffer;
+	buf->user = memactive + memwired;
 	buf->flags = _glibtop_sysdeps_mem;
 }

sysdeps/freebsd/mountlist.c

@@ -126,8 +126,6 @@ glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs)
 	GArray *mount_array = g_array_new(FALSE, FALSE,
 					  sizeof(glibtop_mountentry));
 
-	glibtop_init_r (&server, 0, 0);
-
 	memset (buf, 0, sizeof (glibtop_mountlist));
 
 	/* Read filesystem list. */

sysdeps/freebsd/msg_limits.c

@@ -48,8 +48,6 @@ glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf)
 	size_t len;
 	int msgmax, msgmni, msgmnb, msgtql, msgssz, msgseg;
 
-	glibtop_init_s (&server, GLIBTOP_SYSDEPS_MSG_LIMITS, 0);
-
 	memset (buf, 0, sizeof (glibtop_msg_limits));
 
 	if (server->sysdeps.msg_limits == 0)