2004-02-07 Kevin Vandersloot

* configure.in: release 2.5.1

ChangeLog

@@ -1,3 +1,119 @@
+2004-02-07  Kevin Vandersloot
+
+	* configure.in: release 2.5.1
+
+2004-02-02  Sebastien Bacher  <seb128@debian.org>
+
+	* sysdeps/linux/mem.c: (glibtop_get_mem_s): patch from 
+	Benoît Dejean <bnet@ifrance.com> to fix libtop_mem.used 
+	and glibtop_mem.shared values (Closes: #129863).
+
+Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
+
+	* libgtop-2.0.pc.in: Should be -lgtop-2.0, #130506
+
+2004-01-05  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* libgtop.spec.in: License is GPL, not LGPL.
+
+2004-01-05  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* libgtop-2.0.pc.in: Include -lgtop in the linking flags.
+	Bug #130506.
+
+2004-01-03  Robert Sedak  <robert.sedak@sk.htnet.hr>
+
+        * configure.in: Added "hr" in ALL_LINGUAS.
+
+2003-12-22  Bastien Nocera  <hadess@hadess.net>
+
+	* acinclude.m4:
+	* configure.in: remove linking to libgtop and checks for 64-bit
+	integer bytes (fixes warning on build on glib 2.0 systems)
+
+2003-11-02  Ćœygimantas Beručka  <uid0@tuxfamily.org>
+
+	* configure.in: Added "lt" to ALL_LINGUAS.
+
+2003-10-21  Bastien Nocera  <hadess@hadess.net>
+
+	* Makefile.am:
+	* configure.in:
+	* src/inodedb/.cvsignore:
+	* sysdeps/names/Makefile.am:
+	install only one library, libgtop-2.0
+	Fix build-time warnings due to the redefinition of guint64
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* lib/read.c: (glibtop_read_l):
+	* lib/read_data.c: (glibtop_read_data_l):
+	* lib/write.c: (glibtop_write_l): apply patch for ngettext support
+	by Christian Neumair <chris@gnome-de.org>
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* include/glibtop/cpu.h:
+	* include/glibtop/procstate.h:
+	* include/glibtop/procuid.h:
+	* include/glibtop/uptime.h:
+	* lib/sysdeps.c:
+	* sysdeps/names/cpu.c:
+	* sysdeps/names/procstate.c:
+	* sysdeps/names/procuid.c:
+	* sysdeps/names/uptime.c: Apply patch by the_h1ghlander@yahoo.com and
+	Cory Omand <cory.omand@Sun.com> for Solaris support
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* src/inodedb/Makefile.am: link to libgtop_suid_common-2.0.la
+	(Closes: #107990)
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* acconfig.h:
+	* acinclude.m4:
+	* include/glibtop/array.h:
+	* include/glibtop/command.h:
+	* include/glibtop/cpu.h:
+	* include/glibtop/fsusage.h:
+	* include/glibtop/glibtop-backend-info.h:
+	* include/glibtop/glibtop-backend.h:
+	* include/glibtop/glibtop-client.h:
+	* include/glibtop/inodedb.h:
+	* include/glibtop/interfaces.h:
+	* include/glibtop/limits.h:
+	* include/glibtop/loadavg.h:
+	* include/glibtop/mem.h:
+	* include/glibtop/mountlist.h:
+	* include/glibtop/msg_limits.h:
+	* include/glibtop/netinfo.h:
+	* include/glibtop/netload.h:
+	* include/glibtop/ppp.h:
+	* include/glibtop/procargs.h:
+	* include/glibtop/proccwd.h:
+	* include/glibtop/prockernel.h:
+	* include/glibtop/proclist.h:
+	* include/glibtop/procmap.h:
+	* include/glibtop/procmem.h:
+	* include/glibtop/procsegment.h:
+	* include/glibtop/procsignal.h:
+	* include/glibtop/procstate.h:
+	* include/glibtop/proctime.h:
+	* include/glibtop/procuid.h:
+	* include/glibtop/sem_limits.h:
+	* include/glibtop/shm_limits.h:
+	* include/glibtop/swap.h:
+	* include/glibtop/sysdeps.h:
+	* include/glibtop/sysinfo.h:
+	* include/glibtop/uptime.h:
+	* lib/glibtop-backend.c: (glibtop_backend_get):
+	* lib/glibtop-client.c: (glibtop_client_open_backend):
+	* lib/inodedb.c: (glibtop_inodedb_lookup_s):
+	* lib/lib.pl:
+	* src/inodedb/README.inodedb:
+	* src/inodedb/mkinodedb2.c: (main): s/u_int64_t/guint64/
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* Makefile.am: fix distchecking, release 2.5.0
@@ -134,13 +250,13 @@
 
 	* configure.in: make it compile
 
-2003-10-19  Carlos Perelló Marín <carlos@gnome.org>
+2003-10-19  Carlos PerellĂł MarĂ­n <carlos@gnome.org>
 
 	* support/*: Reverted libgtop changes. It's a common module
 	and I should not modify it.
 	* Added/removed files. Now the move should be done.
 
-2003-10-19  Carlos Perelló Marín <carlos@gnome.org>
+2003-10-19  Carlos PerellĂł MarĂ­n <carlos@gnome.org>
 
 	* libgtop-GNOME-2-0-branch moved to HEAD.
 
@@ -152,7 +268,7 @@
 
 	* configure.in: Added "ta" (Tamil) to the languages' list.
 
-2003-09-13  Carlos Perelló Marín <carlos@gnome.org>
+2003-09-13  Carlos PerellĂł MarĂ­n <carlos@gnome.org>
 
 	* configure.in (ALL_LINGUAS):  Removed es_ES.
 
@@ -205,7 +321,7 @@
 
 	* configure.in: release 2.0.2
 
-2003-05-10  Danilo Šegan  <dsegan@gmx.net>
+2003-05-10  Danilo Ć egan  <dsegan@gmx.net>
 
 	* configure.in: Added "sr" and "sr@Latn" to ALL_LINGUAS.
 
@@ -225,7 +341,7 @@
 
 	* configure.in: Added he to ALL_LINGUAS.
 
-2003-02-25  T?µivo Leedj?¤rv  <toivo@linux.ee>
+2003-02-25  T?”ivo Leedj?€rv  <toivo@linux.ee>
 
 	* configure.in: Added et to ALL_LINGUAS.
 
@@ -929,7 +1045,7 @@
 1998-10-20  Martin Baulig  <martin@home-of-linux.org>
 
 	* include/glibtop/proc_signal.h: Use a 2-element-array of
-	type `u_int64_t' for all signal masks instead of just
+	type `guint64' for all signal masks instead of just
 	scalar numbers. This avoids problems on systems with more
 	than 64 signals.
 
@@ -939,7 +1055,7 @@
 
 	[NOTE for people porting libgtop:
 	
- 	 Please use all 64 bits of the `u_int64_t' and not just 32 - the
+ 	 Please use all 64 bits of the `guint64' and not just 32 - the
 	 signal number (as it is used in calls to kill () ...) should be
 	 a bit-index into this field; if a process ignores for instance
 	 signal 64, it has the 0-bit of sigcatch[1] set, if it ignores 63,
@@ -1280,14 +1396,14 @@
 
 1998-07-30  Martin Baulig  <martin@home-of-linux.org>
 
-	* acconfig.h (u_int64_t, int64_t): Added.
+	* acconfig.h (guint64, int64_t): Added.
 
 	* lib/lib.awk: Using correct `(1 << GLIBTOP_SYSDEPS_<feature>)'
 	in call to `glibtop_init_r'.
 
 	* configure.in (GNOME_LIBGTOP_TYPES): New check.
 
-	* include/glibtop/*.h: Using `u_int64_t' instead of `unsigned long'
+	* include/glibtop/*.h: Using `guint64' instead of `unsigned long'
 	and `long' to avoid problems when client is on a 32bit system and
 	the server on a 64bit system.
 

Makefile.am

@@ -1,13 +1,5 @@
-## Process this file with automake to produce Makefile.in.
 
-if EXAMPLES
-examples_SUBDIRS = examples
-else
-examples_SUBDIRS =
-endif
-
-SUBDIRS = . po misc include sysdeps lib src \
-	  $(examples_SUBDIRS) doc
+SUBDIRS = po misc include sysdeps lib src examples doc
 
 libgtopinclude_HEADERS = glibtop.h
 libgtopincludedir = $(includedir)/libgtop-2.0
@@ -20,9 +12,6 @@ EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \
 dist-hook:
 	cp libgtop.spec $(distdir)
 
-release:
-	$(MAKE) dist distdir=$(PACKAGE)-$(VERSION)
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgtop-2.0.pc
 

acconfig.h

@@ -126,7 +126,7 @@
 #undef HAVE_GUILE
 
 #undef ssize_t
-#undef u_int64_t
+#undef guint64
 #undef int64_t
 
 #undef HAVE_GLIBTOP_MACHINE_H

acinclude.m4

@@ -43,8 +43,6 @@ dnl
 AC_DEFUN([GNOME_LIBGTOP_TYPES],
 [
         AC_CHECK_HEADERS(sys/bitypes.h)
-        AC_LIBGTOP_CHECK_TYPE(u_int64_t, unsigned long long int)
-        AC_LIBGTOP_CHECK_TYPE(int64_t, signed long long int)
 ])
 
 dnl See whether we need a declaration for a function.

backends/common/ChangeLog

@@ -1,3 +1,7 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* backend-common.c: (_open_common): s/u_int64_t/guint64/
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* backend-common.h: fixed compilation

backends/common/backend-common.c

@@ -26,7 +26,7 @@
 #include <backend-common.h>
 
 static int
-_open_common (glibtop_server *, glibtop_backend *, u_int64_t, const char **);
+_open_common (glibtop_server *, glibtop_backend *, guint64, const char **);
 
 static int
 _close_common (glibtop_server *, glibtop_backend *, void *closure);
@@ -47,7 +47,7 @@ glibtop_backend_info LibGTopBackendInfo_Common = {
 
 static int
 _open_common (glibtop_server *server, glibtop_backend *backend,
-	      u_int64_t features, const char **backend_args)
+	      guint64 features, const char **backend_args)
 {
     return 0;
 }

backends/server/ChangeLog

@@ -1,3 +1,9 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* backend-server.c: (_open_server):
+	* backend-server.h:
+	* command.h.in: s/u_int64_t/guint64/
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* backend-server.h:

backends/server/backend-server.c

@@ -26,7 +26,7 @@
 #include <backend-server.h>
 
 static int
-_open_server (glibtop_server *, glibtop_backend *, u_int64_t, const char **);
+_open_server (glibtop_server *, glibtop_backend *, guint64, const char **);
 
 static int
 _close_server (glibtop_server *, glibtop_backend *, void *);
@@ -47,7 +47,7 @@ glibtop_backend_info LibGTopBackendInfo_Server = {
 
 static int
 _open_server (glibtop_server *server, glibtop_backend *backend,
-	      u_int64_t features, const char **backend_args)
+	      guint64 features, const char **backend_args)
 {
     backend_server_private *priv;
 

backends/server/backend-server.h

@@ -37,7 +37,7 @@ typedef struct _backend_server_private backend_server_private;
 
 struct _backend_server_private
 {
-    u_int64_t flags;
+    guint64 flags;
     int input [2];		/* Pipe client <- server */
     int output [2];		/* Pipe client -> server */
     pid_t pid;			/* PID of the server */

backends/server/command.h.in

@@ -42,8 +42,8 @@ typedef struct _glibtop_response	glibtop_response;
 
 struct _glibtop_command
 {
-    u_int64_t	command;
-    u_int64_t	param_size, send_size, data_size;
+    guint64	command;
+    guint64	param_size, send_size, data_size;
     char	parameter [_GLIBTOP_PARAM_SIZE];
 };
 
@@ -51,7 +51,7 @@ struct _glibtop_response
 {
     int retval;
     int glibtop_errno;
-    u_int64_t recv_size, data_size;
+    guint64 recv_size, data_size;
 };
 
 G_END_DECLS

backends/sysdeps/ChangeLog

@@ -1,3 +1,7 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* backend-sysdeps.c: (_open_sysdeps): s/u_int64_t/guint64/
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* backend-sysdeps.h: fixed compilation

backends/sysdeps/backend-sysdeps.c

@@ -26,7 +26,7 @@
 #include <backend-sysdeps.h>
 
 static int
-_open_sysdeps (glibtop_server *, glibtop_backend *, u_int64_t, const char **);
+_open_sysdeps (glibtop_server *, glibtop_backend *, guint64, const char **);
 
 static int
 _close_sysdeps (glibtop_server *, glibtop_backend *, void *);
@@ -47,7 +47,7 @@ glibtop_backend_info LibGTopBackendInfo_Sysdeps = {
 
 static int
 _open_sysdeps (glibtop_server *server, glibtop_backend *backend,
-	       u_int64_t features, const char **backend_args)
+	       guint64 features, const char **backend_args)
 {
     glibtop_init_func_t *init_fkt;
 

configure.in

@@ -8,12 +8,20 @@ AC_CANONICAL_SYSTEM
 
 LIBGTOP_MAJOR_VERSION=2
 LIBGTOP_MINOR_VERSION=5
-LIBGTOP_MICRO_VERSION=0
+LIBGTOP_MICRO_VERSION=1
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
 AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
 
-LIBGTOP_CURRENT=1
+dnl  increment if the interface has additions, changes, removals.
+LIBGTOP_CURRENT=2
+
+dnl  increment any time the source changes; set to
+dnl  0 if you increment CURRENT
 LIBGTOP_REVISION=0
+
+dnl  increment if any interfaces have been added; set to 0
+dnl  if any interfaces have been removed. removal has
+dnl  precedence over adding, so set to 0 if both happened.
 LIBGTOP_AGE=0
 
 # you can set this to `-snap' for instance to create
@@ -235,7 +243,7 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
 
-ALL_LINGUAS="am ar az be bg bn ca cs cy da de el es et fa fi fr ga gl he hi hu id it ja ko lv mk ml mn ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am ar az be bg bn ca cs cy da de el es et fa fi fr ga gl he hi hr hu id it ja ko lt lv mk ml mn ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
 
 GETTEXT_PACKAGE=libgtop-2.0
 AC_SUBST(GETTEXT_PACKAGE)
@@ -317,8 +325,8 @@ fi
 
 LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"
 
-LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0"
-LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names-2.0"
+LIBGTOP_LIBS="$LIBGTOP_LIBS"
+LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS"
 
 LIBGTOP_LIBS="$LIBGTOP_LIBS" 
 LIBGTOP_NAMES_LIBS="$LIBGTOP_NAMES_LIBS"

doc/ChangeLog

@@ -1,3 +1,7 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* reference.texi: s/u_int64_t/guint64/
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* Makefile.am: removed traces of guile, intllibs and libgnomesupport

doc/reference.texi

@@ -50,7 +50,7 @@ typedef struct _glibtop_cpu     glibtop_cpu;
 
 struct _glibtop_cpu
 @{
-    u_int64_t   flags,
+    guint64   flags,
         total,
         user,
         nice,
@@ -139,7 +139,7 @@ typedef struct _glibtop_mem     glibtop_mem;
 
 struct _glibtop_mem
 @{
-    u_int64_t   flags,
+    guint64   flags,
         total,
         used,
         free,
@@ -207,7 +207,7 @@ typedef struct _glibtop_swap    glibtop_swap;
 
 struct _glibtop_swap
 @{
-    u_int64_t   flags,
+    guint64   flags,
         total,
         used,
         free,
@@ -266,10 +266,10 @@ typedef struct _glibtop_uptime  glibtop_uptime;
 
 struct _glibtop_uptime
 @{
-    u_int64_t flags;
+    guint64 flags;
     double uptime,
         idletime;
-    u_int64_t boot_time;
+    guint64 boot_time;
 @};
 @end cartouche
 @end example
@@ -318,9 +318,9 @@ typedef struct _glibtop_loadavg glibtop_loadavg;
 
 struct _glibtop_loadavg
 @{
-    u_int64_t flags;
+    guint64 flags;
     double loadavg [3];
-    u_int64_t nr_running,
+    guint64 nr_running,
         nr_tasks,
         last_pid;
 @};
@@ -395,7 +395,7 @@ typedef struct _glibtop_proclist        glibtop_proclist;
 
 struct _glibtop_proclist
 @{
-    u_int64_t   flags,
+    guint64   flags,
         number,
         total,
         size;
@@ -492,7 +492,7 @@ typedef struct _glibtop_proc_state      glibtop_proc_state;
 
 struct _glibtop_proc_state
 @{
-    u_int64_t flags;
+    guint64 flags;
     char cmd[40];
 @ifset LIBGTOP-1-1
     unsigned state;
@@ -618,7 +618,7 @@ typedef struct _glibtop_proc_uid        glibtop_proc_uid;
 
 struct _glibtop_proc_uid
 @{
-    u_int64_t flags;
+    guint64 flags;
     int uid,
         euid,
         gid,
@@ -698,7 +698,7 @@ typedef struct _glibtop_proc_mem        glibtop_proc_mem;
 
 struct _glibtop_proc_mem
 @{
-    u_int64_t   flags,
+    guint64   flags,
         size,
         vsize,
         resident,
@@ -813,7 +813,7 @@ typedef struct _glibtop_proc_time       glibtop_proc_time;
 
 struct _glibtop_proc_time
 @{
-    u_int64_t   flags,
+    guint64   flags,
         start_time,
         rtime,
         utime,
@@ -881,7 +881,7 @@ typedef struct _glibtop_proc_signal     glibtop_proc_signal;
 
 struct _glibtop_proc_signal
 @{
-    u_int64_t   flags,
+    guint64   flags,
         signal [2],
         blocked [2],
         sigignore [2],
@@ -902,7 +902,7 @@ Mask of caught signals
 @end table
 
 All signal masks are interpreted as bit mask; it is an array of two
-@code{u_int64_t}'s so we can save 128 signals there.
+@code{guint64}'s so we can save 128 signals there.
 
 @page
 @node glibtop_proc_kernel, glibtop_proc_segment, glibtop_proc_signal, System Dependent
@@ -929,8 +929,8 @@ typedef struct _glibtop_proc_kernel     glibtop_proc_kernel;
 
 struct _glibtop_proc_kernel
 @{
-    u_int64_t flags;
-    u_int64_t k_flags,
+    guint64 flags;
+    guint64 k_flags,
         min_flt,
         maj_flt,
         cmin_flt,
@@ -1029,7 +1029,7 @@ typedef struct _glibtop_proc_segment    glibtop_proc_segment;
 
 struct _glibtop_proc_segment
 @{
-    u_int64_t   flags,
+    guint64   flags,
         text_rss,
         shlib_rss,
         data_rss,
@@ -1096,7 +1096,7 @@ typedef struct _glibtop_proc_args       glibtop_proc_args;
 
 struct _glibtop_proc_args
 @{
-    u_int64_t   flags,
+    guint64   flags,
         size;
 @};
 @end cartouche
@@ -1135,7 +1135,7 @@ typedef struct _glibtop_proc_map        glibtop_proc_map;
 
 struct _glibtop_proc_map
 @{
-    u_int64_t   flags,
+    guint64   flags,
         number,
         total,
         size;
@@ -1164,7 +1164,7 @@ typedef struct _glibtop_map_entry       glibtop_map_entry;
 
 struct _glibtop_map_entry
 @{
-    u_int64_t flags, start, end, offset, perm, inode, device;
+    guint64 flags, start, end, offset, perm, inode, device;
     char filename [GLIBTOP_MAP_FILENAME_LEN+1];
 @};
 @end cartouche
@@ -1222,7 +1222,7 @@ typedef struct _glibtop_netload glibtop_netload;
 
 struct _glibtop_netload
 @{
-    u_int64_t   flags,
+    guint64   flags,
         if_flags,
         mtu,
         subnet,
@@ -1329,7 +1329,7 @@ typedef struct _glibtop_ppp     glibtop_ppp;
 
 struct _glibtop_ppp
 @{
-    u_int64_t   flags,
+    guint64   flags,
         state,
         bytes_in,
         bytes_out;
@@ -1409,7 +1409,7 @@ typedef struct _glibtop_mountlist       glibtop_mountlist;
 
 struct _glibtop_mountlist
 @{
-    u_int64_t   flags,
+    guint64   flags,
         number,
         total,
         size;
@@ -1438,7 +1438,7 @@ typedef struct _glibtop_mountentry      glibtop_mountentry;
 
 struct _glibtop_mountentry
 @{
-    u_int64_t dev;
+    guint64 dev;
     char devname [GLIBTOP_MOUNTENTRY_LEN+1];
     char mountdir [GLIBTOP_MOUNTENTRY_LEN+1];
     char type [GLIBTOP_MOUNTENTRY_LEN+1];
@@ -1488,7 +1488,7 @@ typedef struct _glibtop_fsusage         glibtop_fsusage;
 
 struct _glibtop_fsusage
 @{
-    u_int64_t   flags,
+    guint64   flags,
         blocks,
         bfree,
         bavail,
@@ -1639,7 +1639,7 @@ typedef struct _glibtop_sysdeps         glibtop_sysdeps;
 
 struct _glibtop_sysdeps
 @{
-    u_int64_t flags,
+    guint64 flags,
         features,
         pointer_size,
         cpu,

examples/ChangeLog

@@ -1,3 +1,11 @@
+2003-10-21  Bastien Nocera  <hadess@hadess.net>
+
+	* Makefile.am:
+	* smp.c:
+	* sysdeps.c: (main): install only one library, libgtop-2.0
+	Fix build-time warnings due to the redefinition of guint64
+	Fix building smp.c and sysdeps.c
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* first.c:

examples/Makefile.am

@@ -6,12 +6,7 @@ INCLUDES		= @INCLUDES@
 
 DEFS			= @DEFS@
 
-# We install it in `libexec' since this will make it more easy
-# to put the examples into an extra RPM package.
-
-libgtopdir		= $(libexecdir)/libgtop
-
-libgtop_PROGRAMS	= first second\
+noinst_PROGRAMS	= 	first second\
 			  mountlist procmap netload sysdeps timings \
 			  @static_targets@ @smp_examples@
 
@@ -22,45 +17,35 @@ EXTRA_PROGRAMS		= first_static second_static \
 			  timings_static
 
 first_SOURCES		= first.c
-first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
+first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
 first_static_SOURCES	= $(first_SOURCES)
 first_static_LDADD	= $(first_LDADD)
 first_static_LDFLAGS	= -static
 
 second_SOURCES		= second.c
-second_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
+second_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
 second_static_SOURCES	= $(second_SOURCES)
 second_static_LDADD	= $(second_LDADD)
 second_static_LDFLAGS	= -static
 
 procmap_SOURCES		= procmap.c
-procmap_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
+procmap_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
 procmap_static_SOURCES	= $(procmap_SOURCES)
 procmap_static_LDADD	= $(procmap_LDADD)
 procmap_static_LDFLAGS	= -static
 
 netload_SOURCES		= netload.c
-netload_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
+netload_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
 netload_static_SOURCES	= $(netload_SOURCES)
 netload_static_LDADD	= $(netload_LDADD)
 netload_static_LDFLAGS	= -static
 
 sysdeps_SOURCES		= sysdeps.c
-sysdeps_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
+sysdeps_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
 sysdeps_static_SOURCES	= $(sysdeps_SOURCES)
 sysdeps_static_LDADD	= $(sysdeps_LDADD)
@@ -71,8 +56,6 @@ third_names_LIBS	= $(top_builddir)/sysdeps/names/libgtop_names-2.0.la
 third_SOURCES		= third.c
 third_LDADD		= $(third_names_LIBS) \
 			  $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @INTLLIBS@
 
 third_static_SOURCES	= $(third_SOURCES)
@@ -80,9 +63,7 @@ third_static_LDADD	= $(third_LDADD)
 third_static_LDFLAGS	= -static
 
 mountlist_SOURCES	= mountlist.c
-mountlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
+mountlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
 mountlist_static_SOURCES= $(mountlist_SOURCES)
 mountlist_static_LDADD	= $(mountlist_LDADD)
@@ -90,18 +71,14 @@ mountlist_static_LDFLAGS= -static
 
 
 smp_SOURCES		= smp.c
-smp_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
+smp_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
 smp_static_SOURCES	= $(smp_SOURCES)
 smp_static_LDADD	= $(smp_LDADD)
 smp_static_LDFLAGS	= -static
 
 timings_SOURCES		= timings.c
-timings_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
+timings_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
 timings_static_SOURCES	= $(timings_SOURCES)
 timings_static_LDADD	= $(timings_LDADD)

examples/smp.c

@@ -21,12 +21,16 @@
    Boston, MA 02111-1307, USA.
 */
 
+#include <config.h>
+
 #include <locale.h>
 #include <math.h>
 
 #include <glibtop.h>
 #include <glibtop/cpu.h>
 
+#include <libgnome/gnome-i18n.h>
+
 int
 main (int argc, char *argv [])
 {

examples/sysdeps.c

@@ -26,6 +26,7 @@
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
+#include <glibtop/sysdeps.h>
 
 #include <glibtop/parameter.h>
 
@@ -68,7 +69,7 @@ main (int argc, char *argv [])
 
 	glibtop_get_sysdeps (&sysdeps);
 
-#define FEATURE_CHECK(f) ((sysdeps.features & (1L << GLIBTOP_SYSDEPS_##f##)) ? 1 : 0)
+#define FEATURE_CHECK(f) ((sysdeps.features & (1L << GLIBTOP_SYSDEPS_##f)) ? 1 : 0)
 
 	printf ("Sysdeps (0x%08lx):\n\n"
 		"\tfeatures:\t\t0x%08lx\n\n"

include/glibtop/array.h

@@ -41,7 +41,7 @@ typedef struct _glibtop_array	glibtop_array;
 
 struct _glibtop_array
 {
-    u_int64_t flags,
+    guint64 flags,
 	number,		/* GLIBTOP_ARRAY_NUMBER	*/
 	size,		/* GLIBTOP_ARRAY_SIZE	*/
 	total;		/* GLIBTOP_ARRAY_TOTAL	*/

include/glibtop/command.h

@@ -69,8 +69,8 @@ typedef union  _glibtop_response_union	glibtop_response_union;
 
 struct _glibtop_command
 {
-	u_int64_t	command;
-	u_int64_t	size, data_size;
+	guint64	command;
+	guint64	size, data_size;
 	char		parameter [_GLIBTOP_PARAM_SIZE];
 };
 
@@ -83,7 +83,7 @@ union _glibtop_response_union
 struct _glibtop_response
 {
 	int64_t offset;
-	u_int64_t size, data_size;
+	guint64 size, data_size;
 	glibtop_response_union u;
 };
 

include/glibtop/cpu.h

@@ -41,8 +41,9 @@ G_BEGIN_DECLS
 #define GLIBTOP_XCPU_NICE	8
 #define GLIBTOP_XCPU_SYS	9
 #define GLIBTOP_XCPU_IDLE	10
+#define GLIBTOP_XCPU_FLAGS  11
 
-#define GLIBTOP_MAX_CPU		11
+#define GLIBTOP_MAX_CPU		12
 
 /* Nobody should really be using more than 4 processors. */
 #define GLIBTOP_NCPU		4
@@ -51,7 +52,7 @@ typedef struct _glibtop_cpu	glibtop_cpu;
 
 struct _glibtop_cpu
 {
-	u_int64_t	flags,
+	guint64	flags,
 		total,				/* GLIBTOP_CPU_TOTAL		*/
 		user,				/* GLIBTOP_CPU_USER		*/
 		nice,				/* GLIBTOP_CPU_NICE		*/
@@ -62,7 +63,8 @@ struct _glibtop_cpu
 		xcpu_user [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_USER		*/
 		xcpu_nice [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_NICE		*/
 		xcpu_sys  [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_SYS		*/
-		xcpu_idle [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_IDLE		*/
+		xcpu_idle [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_IDLE		*/
+		xcpu_flags;	                /* GLIBTOP_XCPU_IDLE		*/
 };
 
 #define glibtop_get_cpu(cpu)	glibtop_get_cpu_l(glibtop_global_server, cpu)

include/glibtop/fsusage.h

@@ -41,7 +41,7 @@ typedef struct _glibtop_fsusage		glibtop_fsusage;
 
 struct _glibtop_fsusage
 {
-	u_int64_t	flags,
+	guint64	flags,
 		blocks,		/* Total blocks. */
 		bfree,		/* Free blocks available to superuser. */
 		bavail,		/* Free blocks available to non-superuser. */

include/glibtop/glibtop-backend-info.h

@@ -40,7 +40,7 @@ typedef struct _glibtop_backend_module	glibtop_backend_module;
 typedef struct _glibtop_call_vector	glibtop_call_vector;
 
 typedef int (*glibtop_backend_open_func_t)  (glibtop_server *, glibtop_backend *,
-					     u_int64_t, const char **);
+					     guint64, const char **);
 typedef int (*glibtop_backend_close_func_t) (glibtop_server *, glibtop_backend *,
 					     glibtop_closure *);
 

include/glibtop/glibtop-backend.h

@@ -65,7 +65,7 @@ GType
 glibtop_backend_get_type (void);
 
 glibtop_backend *
-glibtop_backend_get (const char *backend_name, u_int64_t features,
+glibtop_backend_get (const char *backend_name, guint64 features,
 		     const char **backend_args, GError **error);
 
 void

include/glibtop/glibtop-client.h

@@ -82,7 +82,7 @@ glibtop_client_propagate_warning (glibtop_client *client, GError *error);
 
 void
 glibtop_client_open_backend (glibtop_client *client, const char *backend_name,
-			     u_int64_t features, const char **backend_args);
+			     guint64 features, const char **backend_args);
 
 void
 glibtop_client_add_backend (glibtop_client *client,

include/glibtop/inodedb.h

@@ -39,7 +39,7 @@ typedef struct _glibtop_inodedb_key	glibtop_inodedb_key;
 
 struct _glibtop_inodedb_key
 {
-	u_int64_t device, inode;
+	guint64 device, inode;
 };
 
 struct _glibtop_inodedb
@@ -57,7 +57,7 @@ glibtop_inodedb_open_s (glibtop *server, unsigned databases, unsigned long cache
 const char *
 glibtop_inodedb_lookup_s (glibtop *server,
 			  glibtop_inodedb *inodedb,
-			  u_int64_t device, u_int64_t inode);
+			  guint64 device, guint64 inode);
 
 void
 glibtop_inodedb_close_s (glibtop *server, glibtop_inodedb *inodedb);

include/glibtop/interfaces.h

@@ -151,17 +151,17 @@ enum _glibtop_interface_flags {
 
 struct _glibtop_ifaddr
 {
-    u_int64_t	flags,
+    guint64	flags,
 	transport;			/* GLIBTOP_IFADDR_TRANSPORT	*/
     u_int8_t	addr_len,		/* GLIBTOP_IFADDR_ADDR_LEN	*/
 	address [GLIBTOP_IFADDR_LEN];	/* GLIBTOP_IFADDR_ADDRESS	*/
-    u_int64_t	subnet,			/* GLIBTOP_IFADDR_SUBNET	*/
+    guint64	subnet,			/* GLIBTOP_IFADDR_SUBNET	*/
 	scope;				/* GLIBTOP_IFADDR_SCOPE	*/
 };
 
 struct _glibtop_interface
 {
-    u_int64_t	flags,
+    guint64	flags,
 	if_flags,		/* GLIBTOP_INTERFACE_IF_FLAGS		*/
 	transport,		/* GLIBTOP_INTERFACE_TRANSPORT		*/
 	type,			/* GLIBTOP_INTERFACE_TYPE		*/
@@ -177,14 +177,14 @@ struct _glibtop_interface
 #define glibtop_get_interface_names_r	glibtop_get_interface_names_s
 #endif
 
-glibtop_interface *glibtop_get_interface_names_l (glibtop_client *client, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);
+glibtop_interface *glibtop_get_interface_names_l (glibtop_client *client, glibtop_array *array, guint64 interface, guint64 number, guint64 instance, guint64 strategy);
 
 #if GLIBTOP_SUID_INTERFACE_NAMES
 int glibtop_init_interface_names_p (glibtop_server *server, glibtop_closure *closure);
-glibtop_interface *glibtop_get_interface_names_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);
+glibtop_interface *glibtop_get_interface_names_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, guint64 interface, guint64 number, guint64 instance, guint64 strategy);
 #else
 int glibtop_init_interface_names_s (glibtop_server *server, glibtop_closure *closure);
-glibtop_interface *glibtop_get_interface_names_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);
+glibtop_interface *glibtop_get_interface_names_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, guint64 interface, guint64 number, guint64 instance, guint64 strategy);
 #endif
 
 #ifdef GLIBTOP_NAMES

include/glibtop/limits.h

@@ -45,8 +45,8 @@ G_BEGIN_DECLS
 /* Length of a network interface address in bytes. */
 #define GLIBTOP_IFADDR_LEN	16
 
-/* This is ((u_int64_t)-1) */
-#define GLIBTOP_UNLIMITED	(~(u_int64_t)0)
+/* This is ((guint64)-1) */
+#define GLIBTOP_UNLIMITED	(~(guint64)0)
 
 /* Maximum length of a backend name. */
 #define GLIBTOP_BACKEND_NAME_LEN	40

include/glibtop/loadavg.h

@@ -40,9 +40,9 @@ typedef struct _glibtop_loadavg	glibtop_loadavg;
 
 struct _glibtop_loadavg
 {
-	u_int64_t flags;
+	guint64 flags;
 	double loadavg [3];		/* GLIBTOP_LOADAVG_LOADAVG	*/
-	u_int64_t nr_running,		/* GLIBTOP_LOADAVG_NR_RUNNING	*/
+	guint64 nr_running,		/* GLIBTOP_LOADAVG_NR_RUNNING	*/
 		nr_tasks,		/* GLIBTOP_LOADAVG_NR_TASKS	*/
 		last_pid;		/* GLIBTOP_LOADAVG_LAST_PID	*/
 };

include/glibtop/mem.h

@@ -44,7 +44,7 @@ typedef struct _glibtop_mem	glibtop_mem;
 
 struct _glibtop_mem
 {
-	u_int64_t	flags,
+	guint64	flags,
 		total,		/* GLIBTOP_MEM_TOTAL	*/
 		used,		/* GLIBTOP_MEM_USED	*/
 		free,		/* GLIBTOP_MEM_FREE	*/

include/glibtop/mountlist.h

@@ -41,7 +41,7 @@ typedef struct _glibtop_mountlist	glibtop_mountlist;
 
 struct _glibtop_mountentry
 {
-	u_int64_t dev;
+	guint64 dev;
 	char devname [GLIBTOP_MOUNTENTRY_LEN+1];
 	char mountdir [GLIBTOP_MOUNTENTRY_LEN+1];
 	char type [GLIBTOP_MOUNTENTRY_LEN+1];
@@ -49,7 +49,7 @@ struct _glibtop_mountentry
 
 struct _glibtop_mountlist
 {
-	u_int64_t	flags,
+	guint64	flags,
 		number,			/* GLIBTOP_MOUNTLIST_NUMBER	*/
 		total,			/* GLIBTOP_MOUNTLIST_TOTAL	*/
 		size;			/* GLIBTOP_MOUNTLIST_SIZE	*/

include/glibtop/msg_limits.h

@@ -43,7 +43,7 @@ typedef struct _glibtop_msg_limits	glibtop_msg_limits;
 
 struct _glibtop_msg_limits
 {
-	u_int64_t	flags,
+	guint64	flags,
 		msgpool,	/* GLIBTOP_IPC_MSGPOOL	*/
 		msgmap,		/* GLIBTOP_IPC_MSGMAP	*/
 		msgmax,		/* GLIBTOP_IPC_MSGMAX	*/

include/glibtop/netinfo.h

@@ -45,7 +45,7 @@ typedef struct _glibtop_netinfo	glibtop_netinfo;
 
 struct _glibtop_netinfo
 {
-    u_int64_t	flags,
+    guint64	flags,
 	if_flags,			/* GLIBTOP_NETINFO_IF_FLAGS	*/
 	transport,			/* GLIBTOP_NETINFO_TRANSPORT	*/
 	mtu;				/* GLIBTOP_NETINFO_MTU		*/
@@ -57,14 +57,14 @@ struct _glibtop_netinfo
 #define glibtop_get_netinfo_r		glibtop_get_netinfo_s
 #endif
 
-glibtop_ifaddr *glibtop_get_netinfo_l (glibtop_client *client, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport);
+glibtop_ifaddr *glibtop_get_netinfo_l (glibtop_client *client, glibtop_array *array, glibtop_netinfo *buf, const char *interface, guint64 transport);
 
 #if GLIBTOP_SUID_NETINFO
 int glibtop_init_netinfo_p (glibtop_server *server, glibtop_closure *closure);
-glibtop_ifaddr *glibtop_get_netinfo_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport);
+glibtop_ifaddr *glibtop_get_netinfo_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, guint64 transport);
 #else
 int glibtop_init_netinfo_s (glibtop_server *server, glibtop_closure *closure);
-glibtop_ifaddr *glibtop_get_netinfo_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport);
+glibtop_ifaddr *glibtop_get_netinfo_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, guint64 transport);
 #endif
 
 #ifdef GLIBTOP_NAMES

include/glibtop/netload.h

@@ -69,7 +69,7 @@ enum {
 
 struct _glibtop_netload
 {
-	u_int64_t	flags,
+	guint64	flags,
 		if_flags,		/* GLIBTOP_NETLOAD_IF_FLAGS	*/
 		mtu,			/* GLIBTOP_NETLOAD_MTU		*/
 		subnet,			/* GLIBTOP_NETLOAD_SUBNET	*/

include/glibtop/ppp.h

@@ -45,7 +45,7 @@ enum {
 
 struct _glibtop_ppp
 {
-	u_int64_t	flags,
+	guint64	flags,
 		state,			/* GLIBTOP_PPP_STATE		*/
 		bytes_in,		/* GLIBTOP_PPP_BYTES_IN		*/
 		bytes_out;		/* GLIBTOP_PPP_BYTES_OUT	*/

include/glibtop/procargs.h

@@ -37,7 +37,7 @@ typedef struct _glibtop_proc_args	glibtop_proc_args;
 
 struct _glibtop_proc_args
 {
-	u_int64_t	flags,
+	guint64	flags,
 		size;			/* GLIBTOP_PROC_ARGS_SIZE	*/
 };
 

include/glibtop/proccwd.h

@@ -45,7 +45,7 @@ typedef struct _glibtop_proc_cwd	glibtop_proc_cwd;
 
 struct _glibtop_proc_cwd
 {
-    u_int64_t	flags,
+    guint64	flags,
 	size,
 	device,
 	inode;

include/glibtop/prockernel.h

@@ -47,8 +47,8 @@ typedef struct _glibtop_proc_kernel	glibtop_proc_kernel;
 
 struct _glibtop_proc_kernel
 {
-	u_int64_t flags;
-	u_int64_t k_flags,	/* kernel flags for the process */
+	guint64 flags;
+	guint64 k_flags,	/* kernel flags for the process */
 		min_flt,	/* number of minor page faults since
 				 * process start */
 		maj_flt,	/* number of major page faults since

include/glibtop/proclist.h

@@ -56,7 +56,7 @@ typedef struct _glibtop_proclist	glibtop_proclist;
 
 struct _glibtop_proclist
 {
-	u_int64_t	flags,
+	guint64	flags,
 		number,			/* GLIBTOP_PROCLIST_NUMBER	*/
 		total,			/* GLIBTOP_PROCLIST_TOTAL	*/
 		size;			/* GLIBTOP_PROCLIST_SIZE	*/

include/glibtop/procmap.h

@@ -59,13 +59,13 @@ typedef struct _glibtop_proc_map	glibtop_proc_map;
 
 struct _glibtop_map_entry
 {
-	u_int64_t flags, start, end, offset, perm, inode, device;
+	guint64 flags, start, end, offset, perm, inode, device;
 	char filename [GLIBTOP_MAP_FILENAME_LEN+1];
 };
 
 struct _glibtop_proc_map
 {
-	u_int64_t	flags,
+	guint64	flags,
 		number,			/* GLIBTOP_PROC_MAP_NUMBER	*/
 		total,			/* GLIBTOP_PROC_MAP_TOTAL	*/
 		size;			/* GLIBTOP_PROC_MAP_SIZE	*/

include/glibtop/procmem.h

@@ -44,7 +44,7 @@ typedef struct _glibtop_proc_mem	glibtop_proc_mem;
 
 struct _glibtop_proc_mem
 {
-	u_int64_t	flags,
+	guint64	flags,
 		size,		/* total # of pages of memory */
 		vsize,		/* number of pages of virtual memory ... */
 		resident,	/* number of resident set

include/glibtop/procsegment.h

@@ -46,7 +46,7 @@ typedef struct _glibtop_proc_segment	glibtop_proc_segment;
 
 struct _glibtop_proc_segment
 {
-	u_int64_t	flags,
+	guint64	flags,
 		text_rss,	/* text resident set size */
 		shlib_rss,	/* shared-lib resident set size */
 		data_rss,	/* data resident set size */

include/glibtop/procsignal.h

@@ -42,7 +42,7 @@ typedef struct _glibtop_proc_signal	glibtop_proc_signal;
 
 struct _glibtop_proc_signal
 {
-	u_int64_t	flags,
+	guint64	flags,
 		signal [2],		/* mask of pending signals */
 		blocked [2],		/* mask of blocked signals */
 		sigignore [2],		/* mask of ignored signals */

include/glibtop/procstate.h

@@ -33,8 +33,20 @@ G_BEGIN_DECLS
 #define GLIBTOP_PROC_STATE_STATE	1
 #define GLIBTOP_PROC_STATE_UID		2
 #define GLIBTOP_PROC_STATE_GID		3
+#define GLIBTOP_PROC_STATE_RUID     4
+#define GLIBTOP_PROC_STATE_RGID     5
+#define GLIBTOP_PROC_STATE_HAS_CPU  6
+#define GLIBTOP_PROC_STATE_PROCESSOR 7
+#define GLIBTOP_PROC_STATE_LAST_PROCESSOR 8
 
-#define GLIBTOP_MAX_PROC_STATE		4
+#define GLIBTOP_MAX_PROC_STATE		9
+
+#define GLIBTOP_PROCESS_RUNNING                 1
+#define GLIBTOP_PROCESS_INTERRUPTIBLE           2
+#define GLIBTOP_PROCESS_UNINTERRUPTIBLE         4
+#define GLIBTOP_PROCESS_ZOMBIE                  8
+#define GLIBTOP_PROCESS_STOPPED                 16
+#define GLIBTOP_PROCESS_SWAPPING                32
 
 typedef struct _glibtop_proc_state	glibtop_proc_state;
 
@@ -42,10 +54,10 @@ typedef struct _glibtop_proc_state	glibtop_proc_state;
 
 struct _glibtop_proc_state
 {
-	u_int64_t flags;
-	char cmd[40],		/* basename of executable file in 
+	guint64 flags;
+	char cmd[40];		/* basename of executable file in 
 				 * call to exec(2) */
-		state;		/* single-char code for process state
+	unsigned state;		/* single-char code for process state
 				 * (S=sleeping) */
 	/* NOTE: when porting the library, TRY HARD to implement the
 	 *       following two fields. */
@@ -53,7 +65,12 @@ struct _glibtop_proc_state
 	 *                   only to set the flags value for those two
 	 *                   fields if their values are corrent ! */
 	int uid,		/* UID of process */
-		gid;		/* GID of process */
+		gid,		/* GID of process */
+        ruid,
+        rgid;
+    int has_cpu,
+        processor,
+        last_processor;
 };
 
 #define glibtop_get_proc_state(p1, p2)	glibtop_get_proc_state_l(glibtop_global_server, p1, p2)

include/glibtop/proctime.h

@@ -50,7 +50,7 @@ typedef struct _glibtop_proc_time	glibtop_proc_time;
 
 struct _glibtop_proc_time
 {
-	u_int64_t	flags,
+	guint64	flags,
 		start_time,	/* start time of process -- 
 				 * seconds since 1-1-70 */
 		rtime,		/* real time accumulated by process */

include/glibtop/procuid.h

@@ -33,28 +33,40 @@ G_BEGIN_DECLS
 #define GLIBTOP_PROC_UID_EUID		1
 #define GLIBTOP_PROC_UID_GID		2
 #define GLIBTOP_PROC_UID_EGID		3
-#define GLIBTOP_PROC_UID_PID		4
-#define GLIBTOP_PROC_UID_PPID		5
-#define GLIBTOP_PROC_UID_PGRP		6
-#define GLIBTOP_PROC_UID_SESSION	7
-#define GLIBTOP_PROC_UID_TTY		8
-#define GLIBTOP_PROC_UID_TPGID		9
-#define GLIBTOP_PROC_UID_PRIORITY	10
-#define GLIBTOP_PROC_UID_NICE		11
+#define GLIBTOP_PROC_UID_SUID		4
+#define GLIBTOP_PROC_UID_SGID		5
+#define GLIBTOP_PROC_UID_FSUID		6
+#define GLIBTOP_PROC_UID_FSGID		7
+#define GLIBTOP_PROC_UID_PID		8
+#define GLIBTOP_PROC_UID_PPID		9
+#define GLIBTOP_PROC_UID_PGRP		10
+#define GLIBTOP_PROC_UID_SESSION	11
+#define GLIBTOP_PROC_UID_TTY		12
+#define GLIBTOP_PROC_UID_TPGID		13
+#define GLIBTOP_PROC_UID_PRIORITY	14
+#define GLIBTOP_PROC_UID_NICE		15
+#define GLIBTOP_PROC_UID_NGROUPS    16
+#define GLIBTOP_PROC_UID_GROUPS     17
 
-#define GLIBTOP_MAX_PROC_UID		12
+#define GLIBTOP_MAX_PROC_UID		18
 
 typedef struct _glibtop_proc_uid	glibtop_proc_uid;
 
+#define GLIBTOP_MAX_GROUPS          64
+
 /* User, Group, Terminal and session */
 
 struct _glibtop_proc_uid
 {
-	u_int64_t flags;
+	guint64 flags;
 	int uid,		/* user id */
 		euid,		/* effective user id */
 		gid,		/* group id */
 		egid,		/* effective group id */
+        suid,       /* set user id */
+        sgid,       /* set group id */
+        fsuid,      /* ??? user id */
+        fsgid,      /* ??? group id */
 		pid,		/* process id */
 		ppid,		/* pid of parent process */
 		pgrp,		/* process group id */
@@ -62,7 +74,10 @@ struct _glibtop_proc_uid
 		tty,		/* full device number of controlling terminal */
 		tpgid,		/* terminal process group id */
 		priority,	/* kernel scheduling priority */
-		nice;		/* standard unix nice level of process */
+		nice,		/* standard unix nice level of process */
+		ngroups,
+        groups [GLIBTOP_MAX_GROUPS];
+
 };
 
 #define glibtop_get_proc_uid(p1, p2)	glibtop_get_proc_uid_l(glibtop_global_server, p1, p2)

include/glibtop/sem_limits.h

@@ -46,7 +46,7 @@ typedef struct _glibtop_sem_limits	glibtop_sem_limits;
 
 struct _glibtop_sem_limits
 {
-	u_int64_t	flags,
+	guint64	flags,
 		semmap,		/* GLIBTOP_IPC_SEMMAP	*/
 		semmni,		/* GLIBTOP_IPC_SEMMNI	*/
 		semmns,		/* GLIBTOP_IPC_SEMMNS	*/

include/glibtop/shm_limits.h

@@ -41,7 +41,7 @@ typedef struct _glibtop_shm_limits	glibtop_shm_limits;
 
 struct _glibtop_shm_limits
 {
-	u_int64_t	flags,
+	guint64	flags,
 		shmmax,		/* GLIBTOP_IPC_SHMMAX	*/
 		shmmin,		/* GLIBTOP_IPC_SHMMIN	*/
 		shmmni,		/* GLIBTOP_IPC_SHMMNI	*/

include/glibtop/swap.h

@@ -41,7 +41,7 @@ typedef struct _glibtop_swap	glibtop_swap;
 
 struct _glibtop_swap
 {
-	u_int64_t	flags,
+	guint64	flags,
 		total,		/* GLIBTOP_SWAP_TOTAL	*/
 		used,		/* GLIBTOP_SWAP_USED	*/
 		free,		/* GLIBTOP_SWAP_FREE	*/

include/glibtop/sysdeps.h

@@ -64,7 +64,7 @@ typedef struct _glibtop_sysdeps	glibtop_sysdeps;
 
 struct _glibtop_sysdeps
 {
-	u_int64_t flags,
+	guint64 flags,
 		features,		/* server features	*/
 		cpu,			/* glibtop_cpu		*/
 		mem,			/* glibtop_mem		*/

include/glibtop/sysinfo.h

@@ -49,7 +49,7 @@ struct _glibtop_entry
 
 struct _glibtop_sysinfo
 {
-	u_int64_t	flags, ncpu;
+	guint64	flags, ncpu;
 	glibtop_entry	cpuinfo [GLIBTOP_NCPU];
 };
 

include/glibtop/uptime.h

@@ -31,16 +31,18 @@ G_BEGIN_DECLS
 
 #define GLIBTOP_UPTIME_UPTIME		0
 #define GLIBTOP_UPTIME_IDLETIME		1
+#define GLIBTOP_UPTIME_BOOT_TIME    2
 
-#define GLIBTOP_MAX_UPTIME		2
+#define GLIBTOP_MAX_UPTIME		3
 
 typedef struct _glibtop_uptime	glibtop_uptime;
 
 struct _glibtop_uptime
 {
-	u_int64_t flags;
+	guint64 flags;
 	double uptime,		/* GLIBTOP_UPTIME_UPTIME	*/
 		idletime;	/* GLIBTOP_UPTIME_IDLETIME	*/
+	guint64 boot_time;
 };
 
 #define glibtop_get_uptime(uptime)	glibtop_get_uptime_l(glibtop_global_server, uptime)

lib/glibtop-backend.c

@@ -146,7 +146,7 @@ load_extra_libs (glibtop_backend_entry *entry, GError **error)
 }
 
 glibtop_backend *
-glibtop_backend_get (const char *backend_name, u_int64_t features,
+glibtop_backend_get (const char *backend_name, guint64 features,
 		     const char **backend_args, GError **error)
 {
     const glibtop_backend_info *info;

lib/glibtop-client.c

@@ -211,7 +211,7 @@ glibtop_client_propagate_warning (glibtop_client *client, GError *error)
 
 void
 glibtop_client_open_backend (glibtop_client *client, const char *backend_name,
-			     u_int64_t features, const char **backend_args)
+			     guint64 features, const char **backend_args)
 {
     glibtop_backend *backend;
     GError *error = NULL;

lib/inodedb.c

@@ -79,7 +79,7 @@ glibtop_inodedb_open_s (glibtop *server, unsigned databases,
 const char *
 glibtop_inodedb_lookup_s (glibtop *server,
 			  glibtop_inodedb *inodedb,
-			  u_int64_t device, u_int64_t inode)
+			  guint64 device, guint64 inode)
 {
 	glibtop_inodedb_key key;
 	datum d_key, d_content;

lib/lib.pl

@@ -37,9 +37,9 @@ print '';
 
 print 'static void';
 print '_glibtop_missing_feature (glibtop *server, const char *feature,';
-print "\t\t\t  const u_int64_t present, u_int64_t *required)";
+print "\t\t\t  const guint64 present, guint64 *required)";
 print '{';
-print "\tu_int64_t old_required = *required;\n";
+print "\tguint64 old_required = *required;\n";
 print "\t/* Return if we have all required fields. */";
 print "\tif ((~present & old_required) == 0)";
 print "\t\treturn;\n";
@@ -68,7 +68,7 @@ print '/* Library functions. */';
 print '';
 
 $convert{'long'} = 'int64_t';
-$convert{'ulong'} = 'u_int64_t';
+$convert{'ulong'} = 'guint64';
 $convert{'pid_t'} = 'pid_t';
 $convert{'int'} = 'int';
 $convert{'ushort'} = 'unsigned short';

lib/read.c

@@ -75,5 +75,5 @@ glibtop_read_l (glibtop *server, size_t size, void *buf)
 	}
 
 	if (ret < 0)
-		glibtop_error_io_r (server, _("read %d bytes"), size);
+		glibtop_error_io_r (server, ngettext ("read %d byte", "read %d bytes", size), size);
 }

lib/read_data.c

@@ -65,7 +65,7 @@ glibtop_read_data_l (glibtop *server)
 	}
 
 	if (ret < 0)
-		glibtop_error_io_r (server, _("read data %d bytes"));
+		glibtop_error_io_r (server, ngettext ("read data %d byte", "read data %d bytes", size));
 
 	return ptr;
 }

lib/sysdeps.c

@@ -109,6 +109,70 @@ glibtop_init_func_t _glibtop_init_hook_s [] = {
 	NULL
 };
 
+glibtop_init_func_t _glibtop_init_hook_p [] = {
+#if GLIBTOP_SUID_CPU
+	glibtop_init_cpu_p,
+#endif
+#if GLIBTOP_SUID_MEM
+	glibtop_init_mem_p,
+#endif
+#if GLIBTOP_SUID_SWAP
+	glibtop_init_swap_p,
+#endif
+#if GLIBTOP_SUID_UPTIME
+	glibtop_init_uptime_p,
+#endif
+#if GLIBTOP_SUID_LOADAVG
+	glibtop_init_loadavg_p,
+#endif
+#if GLIBTOP_SUID_SHM_LIMITS
+	glibtop_init_shm_limits_p,
+#endif
+#if GLIBTOP_SUID_MSG_LIMITS
+	glibtop_init_msg_limits_p,
+#endif
+#if GLIBTOP_SUID_SEM_LIMITS
+	glibtop_init_sem_limits_p,
+#endif
+#if GLIBTOP_SUID_PROCLIST
+	glibtop_init_proclist_p,
+#endif
+#if GLIBTOP_SUID_PROC_STATE
+	glibtop_init_proc_state_p,
+#endif
+#if GLIBTOP_SUID_PROC_UID
+	glibtop_init_proc_uid_p,
+#endif
+#if GLIBTOP_SUID_PROC_MEM
+	glibtop_init_proc_mem_p,
+#endif
+#if GLIBTOP_SUID_PROC_TIME
+	glibtop_init_proc_time_p,
+#endif
+#if GLIBTOP_SUID_PROC_SIGNAL
+	glibtop_init_proc_signal_p,
+#endif
+#if GLIBTOP_SUID_PROC_KERNEL
+	glibtop_init_proc_kernel_p,
+#endif
+#if GLIBTOP_SUID_PROC_SEGMENT
+	glibtop_init_proc_segment_p,
+#endif
+#if GLIBTOP_SUID_PROC_ARGS
+	glibtop_init_proc_args_p,
+#endif
+#if GLIBTOP_SUID_PROC_MAP
+	glibtop_init_proc_map_p,
+#endif
+#if GLIBTOP_SUID_NETLOAD
+	glibtop_init_netload_p,
+#endif
+#if GLIBTOP_SUID_PPP
+	glibtop_init_ppp_p,
+#endif
+	NULL
+};
+
 /* Checks which features are implemented. */
 
 void

lib/write.c

@@ -48,5 +48,5 @@ glibtop_write_l (glibtop *server, size_t size, void *buf)
 	}
 
 	if (ret < 0)
-		glibtop_error_io_r (server, _("write %d bytes"), size);
+		glibtop_error_io_r (server, ngettext ("write %d byte", "write %d bytes", size), size);
 }

libgtop-2.0.pc.in

@@ -7,7 +7,7 @@ Name: libgtop
 Description: Portable System Access Library
 Requires: glib-2.0
 Version: @VERSION@
-Libs: -L${libdir} @LIBGTOP_LIBS@ @LIBGTOP_EXTRA_LIBS@
+Libs: -L${libdir} @LIBGTOP_LIBS@ @LIBGTOP_EXTRA_LIBS@ -lgtop-2.0
 Cflags: -I${includedir}/libgtop-2.0
 
 

libgtop.spec.in

@@ -8,7 +8,7 @@ Summary: LibGTop library
 Name: libgtop
 Version: %ver
 Release: %rel
-Copyright: LGPL
+License: GPL
 Group: X11/Libraries
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/libgtop-%{ver}.tar.gz
 BuildRoot: /tmp/libgtop-root

po/ChangeLog

@@ -1,3 +1,135 @@
+2004-02-08  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2004-02-07  Robert Sedak  <robert.sedak@sk.htnet.hr>
+
+	* hr.po: Updated Croatian translation.
+
+2004-02-05  Pauli Virtanen  <pauli.virtanen@hut.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2004-02-02  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian translation.
+
+2004-01-31  Mətin Əmirov  <metin@karegen.com>
+
+	* az.po: Translation updated.
+
+2004-01-28  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Fixed Czech translation.
+
+2004-01-26 Alastair McKinstry <mckinstry@computer.org>
+
+	* ga.po: Updated Irish translation.
+
+2004-01-24  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation.
+
+2004-01-17  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2004-01-15  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian translation.
+
+2004-01-13  Artur Flinta  <aflinta@cvs.gnome.org>
+
+	* pl.po: Updated Polish translation by GNOME PL Team.
+
+2004-01-13  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian translation.
+
+2004-01-06  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
+2004-01-06  Åsmund Skjæveland  <aasmunds@fys.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation.
+
+2004-01-04  Sanlig Badral  <badral@openmn.org>
+
+	* mn.po: Updated Mongolian translation.
+
+2004-01-04  Christian Neumair  <chris@gnome-de.org>
+
+	* de.po: Updated German translation.
+
+2004-01-04  Christophe Merlet  <redfox@redfoxcenter.org>
+
+	* fr.po: Updated French translation.
+
+2004-01-04  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated and revised Portuguese translation.
+
+2004-01-03  Robert Sedak  <robert.sedak@sk.htnet.hr>
+
+	* hr.po: Updated Croatian translation.
+
+2004-01-02  Sanlig Badral  <Badral@openmn.org>
+
+    * mn.po: Updated Mongolian translation.
+    
+2003-12-14  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2003-12-03  Sanlig Badral  <badral@openmn.org>
+
+        * mn.po: Updated Mongolian translation.
+
+2003-12-02  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2003-11-20  Ole Laursen  <olau@hardworking.dk>
+
+	* da.po: Updated Danish translation.
+
+2002-03-10  Hasbullah Bin Pit <sebol@ikhlas.com>
+
+	* ms.po: Updated Malay translation.
+
+2003-11-07   Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Dutch translation updated by Jeroen van der Vegt.
+
+2003-11-04   Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Dutch translation updated by Jeroen van der Vegt.
+
+2003-11-03  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po: Updated Catalan translation.
+
+2003-11-02  Žygimantas Beručka  <uid0@tuxfamily.org>
+
+	* lt.po: Added Lithuanian translation.
+
+2003-11-02  KAMAGASAKO Masatoshi  <emerald@gnome.gr.jp>
+
+	* ja.po: Updated Japanese translation.
+
+2003-11-01  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
+2003-10-30  Kostas Papadimas <pkst@gnome.org>
+
+	* el.po: Updated Greek translation.
+
+2003-10-22  Danilo Šegan  <dsegan@gmx.net>
+
+	* sr.po, sr@Latn.po: Updated Serbian translation.
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* POTFILES.in: fixed distchecking

scripts/ChangeLog

@@ -1,3 +1,7 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* c_types.pl: s/u_int64_t/guint64/
+
 2000-01-02  Martin Baulig  <martin@home-of-linux.org>
 
 	* c_types.pl ($demarshal_funcs): New variable.

scripts/c_types.pl

@@ -50,7 +50,7 @@ my $c_demarshal_func = sub {
 #
 
 $typeinfo = {'long'	=> ['int64_t',		0],
-	     'ulong'	=> ['u_int64_t',	0],
+	     'ulong'	=> ['guint64',	0],
 	     'pid_t'	=> ['pid_t',		0],
 	     'int'	=> ['int',		0],
 	     'retval'	=> ['int',		0],

src/inodedb/.cvsignore

@@ -1,5 +1,5 @@
 Makefile.in
 Makefile
-mkinodedb
-file_by_inode
+mkinodedb2
+file_by_inode2
 .deps

src/inodedb/Makefile.am

@@ -8,6 +8,7 @@ mkinodedb2_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
 
 file_by_inode2_LDADD	= $(top_builddir)/lib/libgtop-2.0.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la
 
 EXTRA_DIST		= README.inodedb

src/inodedb/README.inodedb

@@ -58,10 +58,10 @@ To look up an entry, use the `glibtop_inodedb_lookup ()' function:
 
 const char *
 glibtop_inodedb_lookup (glibtop_inodedb *inodedb,
-			u_int64_t device, u_int64_t inode)
+			guint64 device, guint64 inode)
 const char *
 glibtop_inodedb_lookup_s (glibtop *server, glibtop_inodedb *inodedb,
-			  u_int64_t device, u_int64_t inode)
+			  guint64 device, guint64 inode)
 
 It will either return a pointer to the filename - which you have to
 `g_free ()' once done with it - or NULL on error.

src/inodedb/mkinodedb2.c

@@ -75,8 +75,8 @@ main (int argc, char *argv [])
 			d_content.dptr = dirname;
 			d_content.dsize = strlen (dirname) + 1;
 			
-			key.device = (u_int64_t) statb.st_dev;
-			key.inode = (u_int64_t) statb.st_ino;
+			key.device = (guint64) statb.st_dev;
+			key.inode = (guint64) statb.st_ino;
 			
 			if (gdbm_store (dbf, d_key, d_content, GDBM_REPLACE))
 				glibtop_error_io ("gdbm_store (%s)", dirname);
@@ -113,8 +113,8 @@ main (int argc, char *argv [])
 			d_content.dptr = filename;
 			d_content.dsize = strlen (filename) + 1;
 			
-			key.device = (u_int64_t) statb.st_dev;
-			key.inode = (u_int64_t) statb.st_ino;
+			key.device = (guint64) statb.st_dev;
+			key.inode = (guint64) statb.st_ino;
 			
 			if (gdbm_store (dbf, d_key, d_content, GDBM_REPLACE))
 				glibtop_error_io ("gdbm_store (%s)", filename);

sysdeps/aix/ChangeLog

@@ -1,3 +1,12 @@
+2003-10-21  Bastien Nocera  <hadess@hadess.net>
+
+	* Makefile.am: install only one library, libgtop-2.0
+	Fix build-time warnings due to the redefinition of guint64
+
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* procsignal.c: (glibtop_get_proc_signal_s): s/u_int64_t/guint64/
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* glibtop_machine.h:

sysdeps/aix/Makefile.am

@@ -1,8 +1,7 @@
-LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
+noinst_LTLIBRARIES		= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
 libgtop_sysdeps_2_0_la_SOURCES  = siglist.c nosuid.c