Released 2.10.0.

* NEWS:
       * configure.in: Released 2.10.0.

ChangeLog

@@ -1,3 +1,156 @@
+2005-03-07  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* NEWS:
+	* configure.in: Released 2.10.0.
+
+2005-02-28  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* NEWS: Released 2.9.92.
+
+2005-02-25  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* configure.in: /me stupid. I've already post-bumped version.
+
+2005-02-24  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* configure.in: post release bump 2.9.93.
+
+2005-02-22  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* src/Makefile.am: Build and install libgtop2_daemon only if needed.
+
+2005-02-21  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* lib/Makefile.am: don't export private symbols.
+
+2005-02-15  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* backends/server/server.h:
+	* configure.in:
+	* glibtop.h:
+	* include/glibtop/Makefile.am:
+	* include/glibtop/gnuserv.h:
+	* include/glibtop/open.h:
+	* include/glibtop/read.h:
+	* include/glibtop/read_data.h:
+	* include/glibtop/types.h:
+	* include/glibtop/write.h:
+	* lib/close.c:
+	* lib/init.c:
+	* lib/lib.pl:
+	* lib/open.c:
+	* lib/parameter.c:
+	* lib/read.c:
+	* lib/read_data.c:
+	* lib/write.c:
+	* src/daemon/daemon.h:
+	* src/daemon/io.c:
+	* src/daemon/main.c: (handle_parent_connection):
+	* src/daemon/slave.c: (handle_slave_connection),
+	(handle_slave_command):
+	* sysdeps/common/gnuslib.c:
+	* sysdeps/solaris/glibtop_private.h: Removed some dead files.
+	Don't install private headers.
+	
+	Depends on glib-2.6.
+	Post-release bump : 2.9.92
+
+2005-02-15  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* include/glibtop/error.h: Don't export private symbols.
+
+2005-02-15  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* include/glibtop/error.h: G_GNUC_NORETURN love.
+
+	* include/glibtop/errors.h:
+	* lib/errors.c: Bye bye dead code.
+
+2005-02-06  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* NEWS:
+	* configure.in: Released 2.9.91.
+
+2005-01-24  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* NEWS:
+	* configure.in: Released 2.9.90.
+
+2005-01-24  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* include/glibtop/procopenfiles.h:
+	* sysdeps/linux/procopenfiles.c:
+	* sysdeps/stub/procopenfiles.c: UTF-8-ified.
+
+2005-01-22  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* examples/openfiles.c: (show_open_files):
+	* include/glibtop/procopenfiles.h: added localsock { name } to
+	glibtop_open_files_entry. Should not break ABI.
+
+2005-01-12  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* configure.in: 2.9.5.
+
+2005-01-10  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* NEWS: Released 2.9.4.
+
+2005-01-10  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* configure.in:
+	* examples/.cvsignore:
+	* examples/Makefile.am:
+	* examples/openfiles.c: (show_open_files), (main):
+	* features.def:
+	* include/glibtop/Makefile.am:
+	* include/glibtop/command.h:
+	* include/glibtop/procopenfiles.h:
+	* include/glibtop/sysdeps.h:
+	* include/glibtop/union.h:
+	* structures.def:
+	* sysdeps/linux/Makefile.am:
+	* sysdeps/linux/procopenfiles.c: (glibtop_init_proc_open_files_s),
+	(get_socket_endpoint), (glibtop_get_proc_open_files_s):
+	* sysdeps/stub/Makefile.am:
+	* sysdeps/stub/procopenfiles.c: (glibtop_init_proc_open_files_s),
+	(glibtop_get_proc_open_files_s):
+	
+	New feature by nick@reloco.com.ar (Nicolás Lichtmaier).
+	
+	glibtop_get_open_files(pid) -> list of files by process.
+	TODO: Add documentation.
+
+2005-01-03  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* examples/pprint.c: (pprint_get_cpu):
+	* features.def:
+	* include/glibtop/cpu.h:
+	* sysdeps/linux/cpu.c: (glibtop_init_cpu_s), (glibtop_get_cpu_s):
+	Added I/O and IRQ wait time to glibtop_cpu. Closes #160443.
+	
+	* configure.in: Post-release bump 2.9.4
+
+2004-12-29  Benoît Dejean  <tazforever@dlfp.org>
+
+	* lib/read_data.c: (glibtop_read_data_l):
+	* lib/write.c: (glibtop_write_l): Fixed error messages.
+	Closes #162406.
+
+2004-12-23  Benoît Dejean  <tazforever@dlfp.org>
+
+	* include/glibtop/error.h:
+	* lib/parameter.c: (glibtop_set_parameter_l):
+	* lib/read_data.c: (glibtop_read_data_l):
+	* sysdeps/common/error.c: (print_server_name), (glibtop_error_vr),
+	(glibtop_error_io_vr), (glibtop_warn_vr), (glibtop_warn_io_vr),
+	(glibtop_error_r), (glibtop_warn_r), (glibtop_error_io_r),
+	(glibtop_warn_io_r), (glibtop_error), (glibtop_warn),
+	(glibtop_error_io), (glibtop_warn_io): Turned all macros to functions.
+	Marked everything as G_GNUC_PRINTF and fixed format bugs.
+
+	* sysdeps/common/fsusage.c: Marked some functions as G_GNUC_INTERNAL
+
 2004-12-20  Benoît Dejean  <tazforever@dlfp.org>
 
 	* NEWS:

NEWS

@@ -1,3 +1,27 @@
+Mars 7, 2005: Overview of Changes from 2.9.92 to 2.10.0
+=======================================================
+* Updated i18n.
+
+February 28, 2005: Overview of Changes from 2.9.90 to 2.9.92
+============================================================
+* *BSD updated by marcus@freebsd.org (Joe Marcus Clarke).
+* Removed a lot of dead files :)
+* Don't build&install libgtop_daemon when it's never used.
+
+February 6, 2004: Overview of Changes from 2.9.90 to 2.9.91
+==========================================================
+* Fixed typo in stub.
+* Updated i18n.
+
+January 24, 2004: Overview of Changes from 2.9.4 to 2.9.90
+==========================================================
+* Updated Linux support.
+
+January 10, 2004: Overview of Changes from 2.9.3 to 2.9.4
+=========================================================
+* New glibtop_proc_open_files nick@reloco.com.ar (Nicolás Lichtmaier).
+* Updated AIX support (Christophe Belle).
+
 December 20, 2004: Overview of Changes from 2.9.0 to 2.9.3
 ==========================================================
 * Removed libgtop_names.

backends/server/server.h

@@ -27,7 +27,6 @@
 #define __GLIBTOP_DAEMON_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 #include <glibtop/open.h>
 #include <glibtop/union.h>

configure.in

@@ -7,8 +7,8 @@ AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
 
 LIBGTOP_MAJOR_VERSION=2
-LIBGTOP_MINOR_VERSION=9
-LIBGTOP_MICRO_VERSION=3
+LIBGTOP_MINOR_VERSION=10
+LIBGTOP_MICRO_VERSION=0
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
 AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
 
@@ -122,7 +122,7 @@ else
 fi
 
 if test "x$enable_static" != xno; then
-  static_targets="first_static second_static mountlist_static procmap_static netload_static sysdeps_static timings_static $smp_static_examples pprint_static procargs_static df_static netlist netlist_static"
+  static_targets="first_static second_static mountlist_static procmap_static netload_static sysdeps_static timings_static $smp_static_examples pprint_static procargs_static df_static netlist netlist_static openfiles_static"
 else
   static_targets=""
 fi
@@ -133,7 +133,7 @@ AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes)
 AC_SUBST(static_targets)
 AC_SUBST(smp_examples)
 
-GLIB_REQUIRED=2.4.0
+GLIB_REQUIRED=2.6.0
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GLIB_CFLAGS)
@@ -254,7 +254,7 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
 
-ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id it ja ko lt lv mi mk ml mn ms nb nl nn no or pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id it ja ko lt lv mi mk ml mn ms nb ne nl nn no or pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
 
 GETTEXT_PACKAGE=libgtop-2.0
 AC_SUBST(GETTEXT_PACKAGE)

doc/ChangeLog

@@ -1,3 +1,7 @@
+2005-01-03  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* reference.texi: Updated.
+
 2004-12-04  Benoît Dejean  <tazforever@dlfp.org>
 
 	* reference.texi: Updated.

doc/reference.texi

@@ -56,18 +56,19 @@ struct _glibtop_cpu
         nice,
         sys,
         idle,
+        iowait,
+        irq,
+        softirq,
         frequency,
         xcpu_total [GLIBTOP_NCPU],
         xcpu_user [GLIBTOP_NCPU],
         xcpu_nice [GLIBTOP_NCPU],
         xcpu_sys  [GLIBTOP_NCPU],
-@ifset LIBGTOP-1-1
         xcpu_idle [GLIBTOP_NCPU],
+        xcpu_iowait [GLIBTOP_NCPU],
+        xcpu_irq [GLIBTOP_NCPU],
+        xcpu_softirq [GLIBTOP_NCPU],
         xcpu_flags;
-@end ifset
-@ifclear LIBGTOP-1-1
-        xcpu_idle [GLIBTOP_NCPU];
-@end ifclear
 @};
 @end cartouche
 @end example
@@ -92,25 +93,33 @@ Number of clock ticks the system spent in system mode.
 @item idle
 Number of clock ticks the system spent in the idle task.
 
+@item iowait
+Number of clock ticks the system spent waiting for I/O to complete.
+
+@item irq
+Number of clock ticks the system spent servicing interrupts.
+
+@item softirq
+Number of clock ticks the system spent servicing softirqs.
+
 @item frequency
 Tick frequency (default is 100).
 
 @end table
 
 The @samp{xcpu_} values are for SMP systems - they are the same than
-@code{total}, @code{user}, @code{nice}, @code{sys} and @code{idle}
+@code{total}, @code{user}, @code{nice}, @code{sys}, @code{idle},
+@code{iowait}, @code{irq} and @code{softirq}
 except that they are arrays of @code{GLIBTOP_NCPU} (defined in
 @file{<glibtop/limits.h>}) elements and contain one value for each CPU
 in the system.
 
-@ifset LIBGTOP-1-1
 @table @code
 @item xcpu_flags
 This is interpreted as a bit-field: on systems like Solaris, not all CPUs
 need to be running all the time, so we set the corresponding bit for each
 CPU that is currently running.
 @end table
-@end ifset
 
 Please note that all of the cpu values are absolute values measured in
 certain units (to get seconds, divide them by @code{frequency}) since system
@@ -1051,16 +1060,7 @@ struct _glibtop_proc_segment
         dirty_size,
         start_code,
         end_code,
-        start_data,
-        end_data,
-        start_brk,
-        end_brk,
-        start_stack,
-        start_mmap,
-        arg_start,
-        arg_end,
-        env_start,
-        env_end;
+        start_stack;
 @};
 @end cartouche
 @end example

examples/.cvsignore

@@ -22,4 +22,5 @@ df
 df_static
 netlist
 netlist_static
-
+openfiles
+openfiles_static

examples/ChangeLog

@@ -1,3 +1,12 @@
+2005-01-22  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* openfiles.c: (show_open_files): Updated.
+
+2004-12-23  Benoît Dejean  <tazforever@dlfp.org>
+
+	* netload.c: (main):
+	* procmap.c: (main): s/glibtop_error/g_error/g
+
 2004-11-15  Benoît Dejean  <tazforever@dlfp.org>
 
 	* netload.c: (hwaddress_format_for_display), (main): Updated.

examples/Makefile.am

@@ -8,11 +8,12 @@ DEFS			= @DEFS@
 
 noinst_PROGRAMS	= 	first second pprint procargs df netlist \
 			  mountlist procmap netload sysdeps timings \
+			  openfiles \
 			  @static_targets@ @smp_examples@
 
 EXTRA_PROGRAMS		= first_static second_static \
 			  mountlist_static procmap_static \
-			  smp smp_static \
+			  smp smp_static openfiles_static \
 			  netload_static sysdeps_static \
 			  timings_static pprint_static procargs_static \
 			  df_static netlist_static
@@ -108,3 +109,11 @@ netlist_static_LDADD	= $(netlist_LDADD)
 netlist_static_LDFLAGS	= -static
 
 
+openfiles_SOURCES	= openfiles.c
+openfiles_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+
+openfiles_static_SOURCES	= $(openfiles_SOURCES)
+openfiles_static_LDADD		= $(openfiles_LDADD)
+openfiles_static_LDFLAGS	= -static
+
+

examples/netload.c

@@ -96,7 +96,7 @@ main (int argc, char *argv [])
 	glibtop_init_r (&glibtop_global_server, 0, 0);
 
 	if (argc != 2)
-		glibtop_error ("Usage: %s interface", argv [0]);
+		g_error ("Usage: %s interface", argv [0]);
 
 	glibtop_get_netload (&netload, argv [1]);
 

examples/openfiles.c

@@ -0,0 +1,64 @@
+#include <glibtop.h>
+#include <glibtop/procopenfiles.h>
+
+#include <stdlib.h>
+
+#include <unistd.h>
+
+static void show_open_files(pid_t pid)
+{
+  glibtop_proc_open_files buf;
+  glibtop_open_files_entry *files;
+  unsigned i;
+
+  files = glibtop_get_proc_open_files(&buf, pid);
+
+  printf("<%ld>\n", (long)pid);
+
+  for(i = 0; i < buf.number; ++i)
+  {
+	  printf("\tfd = %d\t", files[i].fd);
+
+	  switch(files[i].type)
+	  {
+	  case GLIBTOP_FILE_TYPE_FILE:
+		  printf("file \"%s\"\n", files[i].info.file.name);
+		  break;
+
+	  case GLIBTOP_FILE_TYPE_PIPE:
+		  printf("pipe\n");
+		  break;
+
+	  case GLIBTOP_FILE_TYPE_INETSOCKET:
+		  printf("socket %s:%d\n", files[i].info.sock.dest_host, files[i].info.sock.dest_port);
+		  break;
+
+	  case GLIBTOP_FILE_TYPE_LOCALSOCKET:
+		  printf("localsocket %s\n", files[i].info.localsock.name);
+		  break;
+	  }
+  }
+
+  putchar('\n');
+
+  g_free(files);
+}
+
+
+int main(int argc, char **argv)
+{
+  glibtop_init();
+
+  show_open_files(getpid());
+
+  while(*++argv)
+    {
+      pid_t pid = strtol(*argv, NULL, 10);
+      show_open_files(pid);
+    }
+
+  glibtop_close();
+
+  return 0;
+}
+

examples/pprint.c

@@ -41,12 +41,18 @@ static void pprint_get_cpu()
   PPRINT(nice, "%llu");
   PPRINT(sys, "%llu");
   PPRINT(idle, "%llu");
+  PPRINT(iowait, "%llu");
+  PPRINT(irq, "%llu");
+  PPRINT(softirq, "%llu");
   PPRINT(frequency, "%llu");
   PPRINT_ARRAY(xcpu_total, GLIBTOP_NCPU, "%llu");
   PPRINT_ARRAY(xcpu_user, GLIBTOP_NCPU, "%llu");
   PPRINT_ARRAY(xcpu_nice, GLIBTOP_NCPU, "%llu");
   PPRINT_ARRAY(xcpu_sys, GLIBTOP_NCPU, "%llu");
   PPRINT_ARRAY(xcpu_idle, GLIBTOP_NCPU, "%llu");
+  PPRINT_ARRAY(xcpu_iowait, GLIBTOP_NCPU, "%llu");
+  PPRINT_ARRAY(xcpu_irq, GLIBTOP_NCPU, "%llu");
+  PPRINT_ARRAY(xcpu_softirq, GLIBTOP_NCPU, "%llu");
   PPRINT(xcpu_flags, "%llx");
   FOOTER_PPRINT();
 }

examples/procmap.c

@@ -83,7 +83,7 @@ main (int argc, char *argv [])
 	glibtop_init_r (&glibtop_global_server, 0, 0);
 
 	if ((argc != 2) || (sscanf (argv [1], "%d", (int *) &pid) != 1))
-		glibtop_error ("Usage: %s pid", argv [0]);
+		g_error ("Usage: %s pid", argv [0]);
 
 #ifdef GLIBTOP_INODEDB
 	inodedb = glibtop_inodedb_open (0, 0);

features.def

@@ -1,4 +1,4 @@
-void|cpu|ulong(total,user,nice,sys,idle,frequency,xcpu_total[4],xcpu_user[4],xcpu_nice[4],xcpu_sys[4],xcpu_idle[4])
+void|cpu|ulong(total,user,nice,sys,idle,iowait,irq,softirq,frequency,xcpu_total[4],xcpu_user[4],xcpu_nice[4],xcpu_sys[4],xcpu_idle[4],xcpu_iowait[4],xcpu_irq[4],xcpu_softirq[4])
 void|mem|ulong(total,used,free,shared,buffer,cached,user,locked)
 void|swap|ulong(total,used,free,pagein,pageout)
 void|uptime|double(uptime,idletime)
@@ -16,6 +16,7 @@ void|proc_kernel|ulong(k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt,kstk_esp,kstk_e
 void|proc_segment|ulong(text_rss,shlib_rss,data_rss,stack_rss,dirty_size,start_code,end_code,start_stack)|pid_t(pid)
 char *|proc_args|ulong(size)|pid_t(pid):unsigned(max_len)
 glibtop_map_entry *|proc_map|ulong(number,size,total)|pid_t(pid)
+glibtop_open_files_entry *|proc_open_files|ulong(number)|pid_t(pid)
 glibtop_mountentry *|@mountlist|ulong(number,size,total)|int(all_fs)
 void|@fsusage|ulong(blocks,bfree,bavail,files,ffree)|string|mount_dir
 void|netload|ulong(if_flags,mtu,subnet,address,packets_in,packets_out,packets_total,bytes_in,bytes_out,bytes_total,errors_in,errors_out,errors_total,collisions)|string|interface

glibtop.h

@@ -51,7 +51,6 @@ LIBGTOP_MICRO_VERSION >= (micro)))
 #include <glibtop/global.h>
 
 #include <glibtop_server.h>
-#include <glibtop/types.h>
 
 #ifdef HAVE_GLIBTOP_MACHINE_H
 #include <glibtop_machine.h>

include/glibtop/Makefile.am

@@ -3,8 +3,11 @@ 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 \
-			  procmem.h procuid.h swap.h write.h error.h open.h \
-			  procsegment.h read.h sysdeps.h global.h \
-			  procsignal.h read_data.h union.h types.h gnuserv.h \
+			  procmem.h procuid.h swap.h \
+			  procsegment.h sysdeps.h global.h \
+			  procsignal.h union.h gnuserv.h \
 			  parameter.h mountlist.h fsusage.h procmap.h signal.h \
-			  inodedb.h sysinfo.h ppp.h procargs.h netload.h netlist.h
+			  inodedb.h sysinfo.h ppp.h procargs.h netload.h \
+			  netlist.h procopenfiles.h
+
+noinst_HEADERS		= error.h write.h open.h read_data.h read.h

include/glibtop/command.h

@@ -58,8 +58,9 @@ G_BEGIN_DECLS
 #define GLIBTOP_CMND_NETLOAD		22
 #define GLIBTOP_CMND_PPP		23
 #define GLIBTOP_CMND_NETLIST		24
+#define GLIBTOP_CMND_PROC_OPEN_FILES	25
 
-#define GLIBTOP_MAX_CMND		25
+#define GLIBTOP_MAX_CMND		26
 
 #define _GLIBTOP_PARAM_SIZE		16
 

include/glibtop/cpu.h

@@ -41,9 +41,16 @@ G_BEGIN_DECLS
 #define GLIBTOP_XCPU_NICE	8
 #define GLIBTOP_XCPU_SYS	9
 #define GLIBTOP_XCPU_IDLE	10
-#define GLIBTOP_XCPU_FLAGS  11
+#define GLIBTOP_XCPU_FLAGS	11
 
-#define GLIBTOP_MAX_CPU		12
+#define GLIBTOP_CPU_IOWAIT	12
+#define GLIBTOP_CPU_IRQ		13
+#define GLIBTOP_CPU_SOFTIRQ	14
+#define GLIBTOP_XCPU_IOWAIT	15
+#define GLIBTOP_XCPU_IRQ	16
+#define GLIBTOP_XCPU_SOFTIRQ	17
+
+#define GLIBTOP_MAX_CPU		18
 
 /* Nobody should really be using more than 4 processors. */
 #define GLIBTOP_NCPU		4
@@ -58,12 +65,18 @@ struct _glibtop_cpu
 		nice,				/* GLIBTOP_CPU_NICE		*/
 		sys,				/* GLIBTOP_CPU_SYS		*/
 		idle,				/* GLIBTOP_CPU_IDLE		*/
+		iowait,				/* GLIBTOP_CPU_IOWAIT		*/
+		irq,				/* GLIBTOP_CPU_IRQ		*/
+		softirq,			/* GLIBTOP_CPU_SOFTIRQ		*/
 		frequency,			/* GLIBTOP_CPU_FREQUENCY	*/
 		xcpu_total [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_TOTAL		*/
 		xcpu_user [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_USER		*/
 		xcpu_nice [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_NICE		*/
 		xcpu_sys  [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_SYS		*/
 		xcpu_idle [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_IDLE		*/
+		xcpu_iowait [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_IOWAIT		*/
+		xcpu_irq [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_IRQ		*/
+		xcpu_softirq  [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_SOFTIRQ		*/
 		xcpu_flags;	                /* GLIBTOP_XCPU_IDLE		*/
 };
 

include/glibtop/error.h

@@ -21,6 +21,11 @@
    Boston, MA 02111-1307, USA.
 */
 
+
+/*
+ * This is private API
+ */
+
 #ifndef __GLIBTOP_ERROR_H__
 #define __GLIBTOP_ERROR_H__
 
@@ -28,42 +33,20 @@
 
 G_BEGIN_DECLS
 
-void glibtop_error_vr (glibtop *server, char *format, va_list args);
-void glibtop_warn_vr (glibtop *server, char *format, va_list args);
+void glibtop_error_vr (glibtop *server, const char *format, va_list args) G_GNUC_INTERNAL G_GNUC_NORETURN;
+void glibtop_warn_vr (glibtop *server, const char *format, va_list args) G_GNUC_INTERNAL;
+void glibtop_error_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_INTERNAL G_GNUC_NORETURN;
+void glibtop_warn_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_INTERNAL;
 
-void glibtop_error_io_vr (glibtop *server, char *format, int, va_list args);
-void glibtop_warn_io_vr (glibtop *server, char *format, int, va_list args);
+void glibtop_error_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
+void glibtop_warn_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
+void glibtop_error_io_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
+void glibtop_warn_io_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
 
-void G_GNUC_UNUSED glibtop_error_r (glibtop *server, char *format, ...);
-void G_GNUC_UNUSED glibtop_warn_r (glibtop *server, char *format, ...);
-void G_GNUC_UNUSED glibtop_error_io_r (glibtop *server, char *format, ...);
-void G_GNUC_UNUSED glibtop_warn_io_r (glibtop *server, char *format, ...);
-
-
-#ifdef  __GNUC__
-
-#define glibtop_error(p1, args...)	glibtop_error_r(glibtop_global_server , p1 , ## args)
-#define glibtop_warn(p1, args...)	glibtop_warn_r(glibtop_global_server , p1 , ## args)
-
-#define glibtop_error_io(p1, args...)	glibtop_error_io_r(glibtop_global_server , p1 , ## args)
-#define glibtop_warn_io(p1, args...)	glibtop_warn_io_r(glibtop_global_server , p1 , ## args)
-
-#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-
-#define glibtop_error(p1, ...)	glibtop_error_r(glibtop_global_server , p1 , __VA_ARGS__)
-#define glibtop_warn(p1, ...)	glibtop_warn_r(glibtop_global_server , p1 , __VA_ARGS__)
-
-#define glibtop_error_io(p1, ...)	glibtop_error_io_r(glibtop_global_server , p1 , __VA_ARGS__)
-#define glibtop_warn_io(p1, ...)	glibtop_warn_io_r(glibtop_global_server , p1 , __VA_ARGS__)
-
-#else /* no __GNUC__, no C99*/
-
-void glibtop_error (char *format, ...);
-void glibtop_warn (char *format, ...);
-void glibtop_error_io (char *format, ...);
-void glibtop_warn_io (char *format, ...);
-
-#endif /* no __GNUC__ */
+void glibtop_error (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
+void glibtop_warn (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);
+void glibtop_error_io (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
+void glibtop_warn_io (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);
 
 G_END_DECLS
 

include/glibtop/errors.h

@@ -1,95 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_ERRORS_H__
-#define __GLIBTOP_ERRORS_H__
-
-#include <glibtop.h>
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_ERROR glibtop_error_quark ()
-
-GQuark glibtop_error_quark (void) G_GNUC_CONST;
-
-typedef enum {
-    GLIBTOP_ERROR_NO_ERROR = 0,
-    GLIBTOP_ERROR_UNKNOWN,
-    GLIBTOP_ERROR_INVALID_ARGUMENT,
-    GLIBTOP_ERROR_NO_SUCH_PARAMETER,
-    GLIBTOP_ERROR_READONLY_VALUE,
-    GLIBTOP_ERROR_SIZE_MISMATCH,
-
-    GLIBTOP_ERROR_SERVER_COMM_FAILURE,
-
-    GLIBTOP_ERROR_NO_SUCH_PROCESS,
-
-    GLIBTOP_ERROR_NO_KERNEL_SUPPORT,
-    GLIBTOP_ERROR_INCOMPATIBLE_KERNEL,
-
-    GLIBTOP_ERROR_NO_SUCH_BACKEND,
-    GLIBTOP_ERROR_NOT_IMPLEMENTED,
-    GLIBTOP_ERROR_NO_BACKEND_OPENED,
-
-    GLIBTOP_ERROR_DEMARSHAL_ERROR
-} glibtop_error;
-
-void
-glibtop_error_vl (glibtop_client *client, glibtop_error code,
-		  const char *format, va_list args);
-
-void
-glibtop_error_io_vl (glibtop_client *client, glibtop_error code,
-		     int io_errno, const char *format, va_list args);
-
-void
-glibtop_warn_vl (glibtop_client *client, glibtop_error code,
-		 const char *format, va_list args);
-
-void
-glibtop_warn_io_vl (glibtop_client *client, glibtop_error code,
-		    int io_errno, const char *format, va_list args);
-
-void
-glibtop_error_l (glibtop_client *client, glibtop_error code,
-		 char *format, ...);
-
-void
-glibtop_warn_l (glibtop_client *client, glibtop_error code,
-		char *format, ...);
-
-void
-glibtop_error_io_l (glibtop_client *client, glibtop_error code,
-		    char *format, ...);
-
-void
-glibtop_warn_io_l (glibtop_client *client, glibtop_error code,
-		   char *format, ...);
-
-G_END_DECLS
-
-#endif

include/glibtop/gnuserv.h

@@ -42,7 +42,6 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
 /* gnuserv should not be compiled using SOCKS */
 #define DO_NOT_SOCKSIFY
 #include <glibtop.h>
-#include <glibtop/error.h>
 #undef read
 #undef write
 #undef open

include/glibtop/open.h

@@ -23,8 +23,6 @@
 #define __GLIBTOP_OPEN_H__
 
 #include <glibtop.h>
-#include <glibtop/read.h>
-#include <glibtop/error.h>
 
 G_BEGIN_DECLS
 

include/glibtop/procopenfiles.h

@@ -0,0 +1,122 @@
+/* $Id$ */
+
+/* Copyright (C) 1998-99 Martin Baulig
+   Copyright (C) 2004 Nicolás Lichtmaier
+   This file is part of LibGTop 1.0.
+
+   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
+
+   Modified by Nicolás Lichtmaier to give open process files.
+
+   LibGTop is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License,
+   or (at your option) any later version.
+
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+   for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with LibGTop; see the file COPYING. If not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#ifndef __GLIBTOP_PROC_OPEN_FILES_H__
+#define __GLIBTOP_PROC_OPEN_FILES_H__
+
+#include <glibtop.h>
+#include <glibtop/global.h>
+
+
+G_BEGIN_DECLS
+
+#define GLIBTOP_PROC_OPEN_FILES_NUMBER		0
+#define GLIBTOP_PROC_OPEN_FILES_TOTAL		1
+#define GLIBTOP_PROC_OPEN_FILES_SIZE		2
+
+#define GLIBTOP_MAX_PROC_OPEN_FILES		3
+
+#define GLIBTOP_FILE_ENTRY_FD				0
+#define GLIBTOP_FILE_ENTRY_NAME				1
+#define GLIBTOP_FILE_ENTRY_TYPE				2
+#define GLIBTOP_FILE_ENTRY_INETSOCKET_DST_HOST		3
+#define GLIBTOP_FILE_ENTRY_INETSOCKET_DST_PORT		4
+
+#define GLIBTOP_MAX_OPEN_FILE_ENTRY		5
+
+#define GLIBTOP_OPEN_FILENAME_LEN	215
+ /* ready for IPv6 */
+#define GLIBTOP_OPEN_DEST_HOST_LEN	46
+
+enum glibtop_file_type {
+	GLIBTOP_FILE_TYPE_FILE		= 1,
+	GLIBTOP_FILE_TYPE_PIPE		= 2,
+	GLIBTOP_FILE_TYPE_INETSOCKET	= 4,
+	GLIBTOP_FILE_TYPE_LOCALSOCKET	= 8
+};
+
+typedef struct _glibtop_open_files_entry glibtop_open_files_entry;
+
+typedef struct _glibtop_proc_open_files	glibtop_proc_open_files;
+
+struct _glibtop_open_files_entry
+{
+	int fd;
+	guint16 type; /* An "enum glibtop_file_type" value. */
+	union {
+		/* When type == GLIBTOP_FILE_TYPE_INETSOCKET */
+		struct {
+			char dest_host[GLIBTOP_OPEN_DEST_HOST_LEN+1];
+			int dest_port;
+		} sock;
+
+		/* When type == GLIBTOP_FILE_TYPE_FILE */
+		struct {
+			char name[GLIBTOP_OPEN_FILENAME_LEN+1];
+		} file;
+
+		/* When type == GLIBTOP_FILE_TYPE_LOCALSOCKET */
+		struct {
+			char name[GLIBTOP_OPEN_FILENAME_LEN+1];
+		} localsock;
+
+	} info;
+};
+
+struct _glibtop_proc_open_files
+{
+	guint64	flags,
+		number,			/* GLIBTOP_PROC_OPEN_FILES_NUMBER */
+		total,			/* GLIBTOP_PROC_OPEN_FILES_TOTAL  */
+		size;			/* GLIBTOP_PROC_OPEN_FILES_SIZE   */
+};
+
+#define glibtop_get_proc_open_files(proc_open_files,pid) glibtop_get_proc_open_files_l(glibtop_global_server, proc_open_files, pid)
+
+#if GLIBTOP_SUID_PROC_FILE
+#define glibtop_get_proc_open_files_r		glibtop_get_proc_open_files_p
+#else
+#define glibtop_get_proc_open_files_r		glibtop_get_proc_open_files_s
+#endif
+
+glibtop_open_files_entry *
+glibtop_get_proc_open_files_l (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
+
+#if GLIBTOP_SUID_PROC_FILE
+void glibtop_init_proc_open_files_p (glibtop *server);
+
+glibtop_open_files_entry *
+glibtop_get_proc_open_files_p (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
+#else
+void glibtop_init_proc_open_files_s (glibtop *server);
+
+glibtop_open_files_entry *
+glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
+#endif
+
+G_END_DECLS
+
+#endif

include/glibtop/read.h

@@ -25,7 +25,6 @@
 #define __GLIBTOP_READ_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 G_BEGIN_DECLS
 

include/glibtop/read_data.h

@@ -25,7 +25,6 @@
 #define __GLIBTOP_READ_DATA_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 G_BEGIN_DECLS
 

include/glibtop/sysdeps.h

@@ -52,8 +52,9 @@ G_BEGIN_DECLS
 #define GLIBTOP_SYSDEPS_NETLOAD		21
 #define GLIBTOP_SYSDEPS_PPP		22
 #define GLIBTOP_SYSDEPS_NETLIST		23
+#define GLIBTOP_SYSDEPS_PROC_OPEN_FILES	24
 
-#define GLIBTOP_MAX_SYSDEPS		24
+#define GLIBTOP_MAX_SYSDEPS		25
 
 #define GLIBTOP_SYSDEPS_ALL		((1 << GLIBTOP_MAX_SYSDEPS) - 1)
 
@@ -85,6 +86,7 @@ struct _glibtop_sysdeps
 		proc_segment,		/* glibtop_proc_segment	*/
 		proc_args,		/* glibtop_proc_args	*/
 		proc_map,		/* glibtop_proc_map	*/
+		proc_open_files,	/* glibtop_proc_open_files */
 		mountlist,		/* glibtop_mountlist	*/
 		fsusage,		/* glibtop_fsusage	*/
 		netlist,		/* glibtop_netlist	*/

include/glibtop/union.h

@@ -43,6 +43,7 @@
 #include <glibtop/procsegment.h>
 #include <glibtop/procargs.h>
 #include <glibtop/procmap.h>
+#include <glibtop/procopenfiles.h>
 
 #include <glibtop/mountlist.h>
 #include <glibtop/fsusage.h>
@@ -80,6 +81,7 @@ union _glibtop_union
 	glibtop_netlist		netlist;
 	glibtop_netload		netload;
 	glibtop_ppp		ppp;
+	glibtop_proc_open_files proc_open_files;
 };
 
 G_END_DECLS

include/glibtop/write.h

@@ -25,7 +25,6 @@
 #define __GLIBTOP_WRITE_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 G_BEGIN_DECLS
 

lib/Makefile.am

@@ -7,7 +7,7 @@ libgtop_2_0_la_SOURCES		= init.c open.c close.c command.c read.c \
 				  read_data.c write.c lib.c parameter.c \
 				  sysdeps.c
 
-libgtop_2_0_la_LDFLAGS		= $(LT_VERSION_INFO)
+libgtop_2_0_la_LDFLAGS		= $(LT_VERSION_INFO) -export-symbols-regex "^[^_].*"
 libgtop_2_0_la_LIBADD		= $(GLIB_LIBS) $(top_builddir)/sysdeps/common/libgtop_common-2.0.la $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la $(sysdeps_suid_lib)
 
 BUILT_SOURCES			= lib.c

lib/close.c

@@ -23,6 +23,7 @@
 
 #include <glibtop.h>
 #include <glibtop/open.h>
+#include <glibtop/error.h>
 #include <glibtop/close.h>
 #include <glibtop/command.h>
 

lib/errors.c

@@ -1,156 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-#include <glibtop/errors.h>
-
-/* Error quark */
-GQuark
-glibtop_error_quark (void)
-{
-    static GQuark q = 0;
-    if (G_UNLIKELY(q == 0))
-	q = g_quark_from_static_string ("glibtop-error-quark");
-
-    return q;
-}
-
-void
-glibtop_error_vl (glibtop_client *client, glibtop_error code,
-		  const char *format, va_list args)
-{
-    gchar *message;
-    GError *error;
-
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-    message = g_strdup_vprintf (format, args);
-
-    error = g_error_new_literal (GLIBTOP_ERROR, code, message);
-    glibtop_client_propagate_error (client, error);
-
-    g_error_free (error);
-    g_free (message);
-}
-
-void
-glibtop_error_io_vl (glibtop_client *client, glibtop_error code,
-		     int io_errno, const char *format, va_list args)
-{
-    gchar *message, *fullmessage;
-    GError *error;
-
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-    message = g_strdup_vprintf (format, args);
-    fullmessage = g_strdup_printf ("%s: %s", message, strerror (io_errno));
-
-    error = g_error_new_literal (GLIBTOP_ERROR, code, message);
-    glibtop_client_propagate_error (client, error);
-
-    g_error_free (error);
-    g_free (fullmessage);
-    g_free (message);
-}
-
-void
-glibtop_warn_vl (glibtop_client *client, glibtop_error code,
-		 const char *format, va_list args)
-{
-    gchar *message;
-    GError *error;
-
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-    message = g_strdup_vprintf (format, args);
-
-    error = g_error_new_literal (GLIBTOP_ERROR, code, message);
-    glibtop_client_propagate_warning (client, error);
-
-    g_error_free (error);
-    g_free (message);
-}
-
-void
-glibtop_warn_io_vl (glibtop_client *client, glibtop_error code,
-		    int io_errno, const char *format, va_list args)
-{
-    gchar *message, *fullmessage;
-    GError *error;
-
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-    message = g_strdup_vprintf (format, args);
-    fullmessage = g_strdup_printf ("%s: %s", message, strerror (io_errno));
-
-    error = g_error_new_literal (GLIBTOP_ERROR, code, message);
-    glibtop_client_propagate_warning (client, error);
-
-    g_error_free (error);
-    g_free (fullmessage);
-    g_free (message);
-}
-
-void
-glibtop_error_l (glibtop_client *client, glibtop_error code,
-		 char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_error_vl (client, code, format, args);
-    va_end (args);
-}
-
-void
-glibtop_warn_l (glibtop_client *client, glibtop_error code,
-		char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_warn_vl (client, code, format, args);
-    va_end (args);
-}
-
-void
-glibtop_error_io_l (glibtop_client *client, glibtop_error code,
-		    char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_error_io_vl (client, code, errno, format, args);
-    va_end (args);
-}
-
-void
-glibtop_warn_io_l (glibtop_client *client, glibtop_error code,
-		   char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_warn_io_vl (client, code, errno, format, args);
-    va_end (args);
-}
-

lib/init.c

@@ -22,6 +22,7 @@
 */
 
 #include <glibtop.h>
+#include <glibtop/error.h>
 #include <glibtop/sysdeps.h>
 #include <glibtop/parameter.h>
 

lib/lib.pl

@@ -23,6 +23,7 @@ print '';
 print '#include <config.h>';
 print '';
 print '#include <glibtop.h>';
+print '#include <glibtop/error.h>';
 print '#include <glibtop/open.h>';
 print '';
 print '#include <glibtop/sysdeps.h>';

lib/open.c

@@ -23,6 +23,8 @@
 
 #include <glibtop.h>
 #include <glibtop/open.h>
+#include <glibtop/read.h>
+#include <glibtop/error.h>
 #include <glibtop/version.h>
 #include <glibtop/sysdeps.h>
 #include <glibtop/command.h>

lib/parameter.c

@@ -23,6 +23,7 @@
 
 #include <glibtop.h>
 #include <glibtop/parameter.h>
+#include <glibtop/error.h>
 
 #define _write_data(ptr,size)	\
 	if ((data_ptr == NULL) || (data_size < size)) return -size; \
@@ -32,9 +33,9 @@
 
 #define _check_data(size)	\
 	if ((data_ptr == NULL) || (data_size != size)) { \
-		glibtop_warn_r (server, "glibtop_set_parameter (%d): " \
+		glibtop_warn_r (server, "glibtop_set_parameter (%u): " \
 				"Expected %lu bytes but got %lu.", \
-				parameter, size, data_size); \
+				(unsigned) parameter, (unsigned long) size, (unsigned long) data_size); \
 		return; \
 	}
 
@@ -82,7 +83,7 @@ glibtop_set_parameter_l (glibtop *server, const unsigned parameter,
 		break;
 	case GLIBTOP_PARAM_FEATURES:
 		/* You should not be allowed to set this field. */
-		glibtop_warn_r (server, "glibtop_set_parameter (%d): " \
+		glibtop_warn_r (server, "glibtop_set_parameter (%u): " \
 				"Cannot modify read-only value.",
 				parameter);
 		break;

lib/read.c

@@ -23,6 +23,7 @@
 
 #include <config.h>
 #include <glibtop/read.h>
+#include <glibtop/error.h>
 #include "libgtop-i18n.h"
 
 

lib/read_data.c

@@ -23,6 +23,7 @@
 
 #include <config.h>
 
+#include <glibtop/error.h>
 #include <glibtop/read_data.h>
 #include "libgtop-i18n.h"
 
@@ -38,7 +39,8 @@ glibtop_read_data_l (glibtop *server)
 	glibtop_init_r (&server, 0, 0);
 
 #ifdef DEBUG
-	fprintf (stderr, "LIBRARY: reading %d data bytes.\n", sizeof (size_t));
+	fprintf (stderr, "LIBRARY: reading %lu data bytes.\n",
+		 (unsigned long) sizeof (size_t));
 #endif
 
 	if (server->socket) {
@@ -51,7 +53,8 @@ glibtop_read_data_l (glibtop *server)
 		glibtop_error_io_r (server, _("read data size"));
 
 #ifdef DEBUG
-	fprintf (stderr, "LIBRARY: really reading %d data bytes (ret = %d).\n", size, ret);
+	fprintf (stderr, "LIBRARY: really reading %lu data bytes (ret = %d).\n",
+		 (unsigned long) size, ret);
 #endif
 
 	if (!size) return NULL;
@@ -65,7 +68,10 @@ glibtop_read_data_l (glibtop *server)
 	}
 
 	if (ret < 0)
-		glibtop_error_io_r (server, ngettext ("read data %d byte", "read data %d bytes", size));
+		glibtop_error_io_r (server,
+				    ngettext ("read %lu byte of data",
+					      "read %lu bytes of data",
+					      (unsigned long) size));
 
 	return ptr;
 }

lib/write.c

@@ -24,6 +24,7 @@
 #include <config.h>
 
 #include <glibtop/write.h>
+#include <glibtop/error.h>
 #include "libgtop-i18n.h"
 
 /* Writes some data to server. */
@@ -48,5 +49,5 @@ glibtop_write_l (glibtop *server, size_t size, void *buf)
 	}
 
 	if (ret < 0)
-		glibtop_error_io_r (server, ngettext ("write %d byte", "write %d bytes", size), size);
+		glibtop_error_io_r (server, ngettext ("wrote %d byte", "wrote %d bytes", size), size);
 }

po/.cvsignore

@@ -1,13 +1,14 @@
-Makefile
-Makefile.in
-POTFILES
-cat-id-tbl.c
 *.gmo
 *.mo
-libgtop.pot
-libgtop-2.0.pot
+*.pot
+Makefile
+Makefile.in
 Makefile.in.in
+POTFILES
+cat-id-tbl.c
 messages
-stamp-cat-id
-po2tbl.sed
 missing
+notexist
+po2tbl.sed
+po2tbl.sed.in
+stamp-cat-id

po/ChangeLog

@@ -1,3 +1,207 @@
+2005-03-07  Dan Damian  <dand@gnome.ro>
+
+	* ro.po: Updated Romanian translation by
+	Mişu Moldovan <dumol@go.ro>.
+
+2005-03-06  Danilo Šegan  <dsegan@gmx.net>
+
+	* sr.po, sr@Latn.po: Updated Serbian translation.
+
+2005-03-05  Abel Cheung  <maddog@linuxhall.org>
+
+	* zh_TW.po: Updated traditional Chinese translation from GNOME HK Team
+	* bg.po: Mark wrong entry as fuzzy (msgfmt check failed).
+
+2005-03-04  Laszlo Dvornik  <dvornik@gnome.hu>
+
+	* hu.po: Hungarian translation updated by Gabor Kelemen.
+
+2005-03-03  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation.
+
+2005-02-24  Artur Flinta  <aflinta@cvs.gnome.org>
+
+	* pl.po: Updated Polish translation by GNOME PL Team.
+
+2004-02-24  Ankit Patel <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.
+
+2004-02-22  Roozbeh Pournader  <roozbeh@farsiweb.info>
+
+	* fa.po: Updated Persian translation by
+	  Azin Azadi <aazadi@gmail.com>.
+
+2005-02-22  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
+
+2005-02-20  Raphael Higino  <raphaelh@cvs.gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation.
+
+2005-02-18  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2005-02-18  Kostas Papadimas <pkst@gnome.org>
+
+	* el.po: Updated Greek translation.
+
+2005-02-17  Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Translation updated by Tino Meinen.
+
+2005-02-16  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po: Updated Catalan translation.
+
+2005-02-15  Maxim Dziumanenko <mvd@mylinux.com.ua>
+
+	* uk.po: Updated Ukrainian translation.
+
+2005-02-14  Christophe Merlet  <redfox@redfoxcenter.org>
+
+	* fr.po: Updated French translation.
+
+2005-02-14  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian translation.
+
+2005-02-14  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* fr.po: Updated French translation.
+
+2005-02-08  Leonid Kanter <leon@asplinux.ru>
+
+	* ru.po: Updated Russian translation
+
+2005-02-07  David Lodge <dave@cirt.net>
+                                                                                
+        * en_GB.po: Updated British translation.
+                                                                                
+2005-02-06  Ole Laursen  <olau@hardworking.dk>
+
+	* da.po: Updated Danish translation.
+
+2005-02-06  Pauli Virtanen <pauli.virtanen@hut.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2005-02-04  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Tõivo Leedjärv.
+
+2005-01-30  Žygimantas Beručka  <uid0@akl.lt>
+
+	* lt.po: Updated Lithuanian translation.
+
+2005-01-28  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Update
+	* no.po: Update
+
+2005-01-27  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Iassen Pramatarov <turin@fsa-bg.org>
+
+2005-01-26  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2005-01-24  Funda Wang  <fundawang@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation.
+
+2005-01-24  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Vladimir Petkov <vpetkov@i-space.org>
+
+2005-01-24  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* POTFILES.in:
+	* POTFILES.skip: Removed lib/lib.c as it is generated.
+	Closes #165038.
+
+2005-01-17  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* POTFILES.in: Updated.
+
+2005-01-16  Hendrik Richter  <hendrik@gnome-de.org>
+
+	* de.po: Updated German translation.
+
+2005-01-16  Takeshi AIHANA <aihana@gnome.gr.jp>
+
+	* ja.po: Updated Japanese translation.
+
+2005-01-13  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* POTFILES.in:
+	* POTFILES.skip: Don't translate examples/smp.c.
+
+2005-01-13  Christian Rose  <menthos@menthos.com>
+
+	* POTFILES.in: Added missing file.
+
+2005-01-02  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2004-12-29  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2004-12-29  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
+2004-12-29  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
+2004-12-29  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
+2004-12-29  Pawan Chitrakar  <pawan@nplinux.org>
+
+	* ne.po: Added Nepali Translation
+
+2004-12-29  Benoît Dejean  <tazforever@dlfp.org>
+
+	* POTFILES.in: Removed a bunch of strings. 
+
+2004-12-28  Christian Rose  <menthos@menthos.com>
+
+	* POTFILES.in: Added comment and missing file.
+	* .cvsignore: Added entries and cleaned up.
+	* sv.po: Updated Swedish translation.
+
+2004-12-28  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Update
+	* no.po: Update
+
+2004-12-28  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
+2004-12-27  Benoît Dejean  <tazforever@dlfp.org>
+
+	* POTFILES.in: Removed a lot of unused/useless files.
+
+2004-12-26  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
+2004-12-25  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
 2004-12-04  Žygimantas Beručka  <uid0@akl.lt>
 
 	* lt.po: Updated Lithuanian translation.

po/POTFILES.in

@@ -1,40 +1,5 @@
-examples/smp.c
-include/glibtop/close.h
-include/glibtop/command.h
-include/glibtop/cpu.h
-include/glibtop/error.h
-include/glibtop/fsusage.h
-include/glibtop/global.h
-include/glibtop/gnuserv.h
-include/glibtop/inodedb.h
-include/glibtop/loadavg.h
-include/glibtop/mem.h
-include/glibtop/mountlist.h
-include/glibtop/msg_limits.h
-include/glibtop/open.h
-include/glibtop/parameter.h
-include/glibtop/prockernel.h
-include/glibtop/proclist.h
-include/glibtop/procmap.h
-include/glibtop/procmem.h
-include/glibtop/procsegment.h
-include/glibtop/procsignal.h
-include/glibtop/procstate.h
-include/glibtop/proctime.h
-include/glibtop/procuid.h
-include/glibtop/read_data.h
-include/glibtop/read.h
-include/glibtop/sem_limits.h
-include/glibtop/shm_limits.h
-include/glibtop/signal.h
-include/glibtop/swap.h
-include/glibtop/sysdeps.h
-include/glibtop/sysinfo.h
-include/glibtop/types.h
-include/glibtop/union.h
-include/glibtop/uptime.h
-include/glibtop/version.h
-include/glibtop/write.h
+# List of source files containing translatable strings.
+# Please keep this file sorted alphabetically.
 lib/close.c
 lib/command.c
 lib/init.c
@@ -52,34 +17,6 @@ src/daemon/slave.c
 src/daemon/version.c
 src/inodedb/file_by_inode2.c
 src/inodedb/mkinodedb2.c
-sysdeps/common/error.c
-sysdeps/common/fsusage.c
-sysdeps/common/gnuslib.c
-sysdeps/common/inodedb.c
-sysdeps/common/mountlist.c
-sysdeps/common/sysdeps_suid.c
-sysdeps/linux/close.c
-sysdeps/linux/cpu.c
-sysdeps/linux/glibtop_machine.h
-sysdeps/linux/glibtop_server.h
-sysdeps/linux/loadavg.c
-sysdeps/linux/mem.c
-sysdeps/linux/msg_limits.c
-sysdeps/linux/open.c
-sysdeps/linux/prockernel.c
-sysdeps/linux/proclist.c
-sysdeps/linux/procmap.c
-sysdeps/linux/procmem.c
-sysdeps/linux/procsegment.c
-sysdeps/linux/procsignal.c
-sysdeps/linux/procstate.c
-sysdeps/linux/proctime.c
-sysdeps/linux/procuid.c
-sysdeps/linux/sem_limits.c
-sysdeps/linux/shm_limits.c
 sysdeps/linux/siglist.c
-sysdeps/linux/swap.c
-sysdeps/linux/sysinfo.c
-sysdeps/linux/uptime.c
 sysdeps/osf1/siglist.c
 sysdeps/sun4/siglist.c

po/POTFILES.skip

@@ -2,3 +2,5 @@ support/error.c
 support/getopt.c
 support/popt.c
 support/popthelp.c
+examples/smp.c
+lib/lib.c

po/ne.po

@@ -0,0 +1,322 @@
+# Nepali Translation Project.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the libgtop package.
+# Pawan Chitrakar  <pawan@nplinux.org>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: levgtop.HEAD.ne.po\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-12-11 04:37+0100\n"
+"PO-Revision-Date: 2004-12-25 04:13+0545\n"
+"Last-Translator: Rajeev Shrestha <rstha@ecomail.com.np>\n"
+"Language-Team: NEPALI <info@mpp.org.np>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Nepali\n"
+"X-Poedit-Country: NEPAL\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: examples/smp.c:76
+#, c-format
+msgid "Ticks (%ld per second):"
+msgstr "टिकटिक गर्छ (%ld प्रति सेकेन्ड):"
+
+#: examples/smp.c:79
+msgid "Total"
+msgstr "जम्मा"
+
+#: examples/smp.c:79
+msgid "User"
+msgstr "प्रयोगकर्ता"
+
+#: examples/smp.c:79
+msgid "Nice"
+msgstr "असल"
+
+#: examples/smp.c:79
+msgid "Sys"
+msgstr "प्रणाली"
+
+#: examples/smp.c:79
+msgid "Idle"
+msgstr "बेकाम"
+
+#: examples/smp.c:81
+#, c-format
+msgid ""
+"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
+"\n"
+msgstr ""
+"सिपियु  (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
+"\n"
+
+#: examples/smp.c:85
+#, c-format
+msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
+msgstr "सिपियु%3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
+
+#: examples/smp.c:102
+msgid "Percent:"
+msgstr "प्रतिशत:"
+
+#: examples/smp.c:103
+msgid "Total (%)"
+msgstr "जम्मा(%)"
+
+#: examples/smp.c:103
+msgid "User (%)"
+msgstr "प्रयोगकर्ता(%)"
+
+#: examples/smp.c:103
+msgid "Nice (%)"
+msgstr "असल(%)"
+
+#: examples/smp.c:103
+msgid "Sys (%)"
+msgstr "प्रणाली(%)"
+
+#: examples/smp.c:104
+msgid "Idle (%)"
+msgstr "बेकाम(%)"
+
+#: examples/smp.c:106
+#, c-format
+msgid ""
+"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+"\n"
+msgstr ""
+"सिपियु   (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+"\n"
+
+#: examples/smp.c:122
+#, c-format
+msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+msgstr "सिपियु%3d       (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+
+#: examples/smp.c:128
+msgid "Spin:"
+msgstr "घुम:"
+
+#: lib/read.c:64
+#, fuzzy, c-format
+msgid "read %d byte"
+msgid_plural "read %d bytes"
+msgstr[0] "[पढ्ने मात्र]"
+msgstr[1] ""
+
+#: lib/read_data.c:51
+msgid "read data size"
+msgstr "तथ्य आकार पढ"
+
+#: lib/read_data.c:68
+#, c-format
+msgid "read data %d byte"
+msgid_plural "read data %d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/write.c:51
+#, fuzzy, c-format
+msgid "write %d byte"
+msgid_plural "write %d bytes"
+msgstr[0] "लेख्न निषेध"
+msgstr[1] ""
+
+#: src/daemon/gnuserv.c:461
+msgid "Enable debugging"
+msgstr "डिबग गर्न सक्षम गर"
+
+#: src/daemon/gnuserv.c:461
+msgid "DEBUG"
+msgstr "डिबग"
+
+#: src/daemon/gnuserv.c:463
+msgid "Enable verbose output"
+msgstr "भर्बोज निवेश सक्षम गर"
+
+#: src/daemon/gnuserv.c:463
+msgid "VERBOSE"
+msgstr "भर्बोज"
+
+#: src/daemon/gnuserv.c:465
+msgid "Don't fork into background"
+msgstr ""
+
+#: src/daemon/gnuserv.c:465
+msgid "NO-DAEMON"
+msgstr "अवतारिक छैन"
+
+#: src/daemon/gnuserv.c:467
+msgid "Invoked from inetd"
+msgstr "इनेट्डबाट जगाइएको"
+
+#: src/daemon/gnuserv.c:467
+msgid "INETD"
+msgstr "इनेट्ड"
+
+#: src/daemon/gnuserv.c:501
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s: %s विकल्पमा त्रटि।\n"
+"उपलब्ध आदेशरेखाको विकल्पहरुको एउटा पूर्ण सूची हेर्नको निम्ति '%s --मद्दत' सञ्चालन गर।\n"
+
+#: sysdeps/osf1/siglist.c:28
+#: sysdeps/sun4/siglist.c:28
+msgid "Hangup"
+msgstr "सम्पर्क छुटाउ"
+
+#: sysdeps/osf1/siglist.c:29
+#: sysdeps/sun4/siglist.c:29
+msgid "Interrupt"
+msgstr "रोक(अबरोध) "
+
+#: sysdeps/osf1/siglist.c:30
+#: sysdeps/sun4/siglist.c:30
+msgid "Quit"
+msgstr "बाहिर जाउ"
+
+#: sysdeps/osf1/siglist.c:31
+#: sysdeps/sun4/siglist.c:31
+msgid "Illegal instruction"
+msgstr "अवैध उपदेश"
+
+#: sysdeps/osf1/siglist.c:32
+#: sysdeps/sun4/siglist.c:32
+msgid "Trace trap"
+msgstr "ट्याप खोज"
+
+#: sysdeps/osf1/siglist.c:33
+#: sysdeps/sun4/siglist.c:33
+msgid "Abort"
+msgstr "रोक्नु"
+
+#: sysdeps/osf1/siglist.c:34
+#: sysdeps/sun4/siglist.c:34
+msgid "EMT error"
+msgstr "इयमटि त्रुटि"
+
+#: sysdeps/osf1/siglist.c:35
+#: sysdeps/sun4/siglist.c:35
+msgid "Floating-point exception"
+msgstr "फ्लोटिङ्ग-प्वाइन्ट अपबाद"
+
+#: sysdeps/osf1/siglist.c:36
+#: sysdeps/sun4/siglist.c:36
+msgid "Kill"
+msgstr "नास गर"
+
+#: sysdeps/osf1/siglist.c:37
+#: sysdeps/sun4/siglist.c:37
+msgid "Bus error"
+msgstr "बस त्रुटि"
+
+#: sysdeps/osf1/siglist.c:38
+#: sysdeps/sun4/siglist.c:38
+msgid "Segmentation violation"
+msgstr "खण्डीकरण उल्लंघन"
+
+#: sysdeps/osf1/siglist.c:39
+#: sysdeps/sun4/siglist.c:39
+msgid "Bad argument to system call"
+msgstr "प्रणाली बोलाहटलाई खराब आर्गुमेन्ट"
+
+#: sysdeps/osf1/siglist.c:40
+#: sysdeps/sun4/siglist.c:40
+msgid "Broken pipe"
+msgstr "फुटेको पाइप"
+
+#: sysdeps/osf1/siglist.c:41
+#: sysdeps/sun4/siglist.c:41
+msgid "Alarm clock"
+msgstr "जागरन घडी"
+
+#: sysdeps/osf1/siglist.c:42
+#: sysdeps/sun4/siglist.c:42
+msgid "Termination"
+msgstr "समाप्त गर"
+
+#: sysdeps/osf1/siglist.c:43
+#: sysdeps/sun4/siglist.c:43
+msgid "Urgent condition on socket"
+msgstr "खोपिल्टोमा आकस्मिक अवस्था(गतिविधि)"
+
+#: sysdeps/osf1/siglist.c:44
+#: sysdeps/sun4/siglist.c:44
+msgid "Stop"
+msgstr "रोक"
+
+#: sysdeps/osf1/siglist.c:45
+#: sysdeps/sun4/siglist.c:45
+msgid "Keyboard stop"
+msgstr "किबोर्ड रोक"
+
+#: sysdeps/osf1/siglist.c:46
+#: sysdeps/sun4/siglist.c:46
+msgid "Continue"
+msgstr "जारी राख"
+
+#: sysdeps/osf1/siglist.c:47
+#: sysdeps/sun4/siglist.c:47
+msgid "Child status has changed"
+msgstr "बालक वस्तुस्थिति परिवर्तन गरिएको छ"
+
+#: sysdeps/osf1/siglist.c:48
+#: sysdeps/sun4/siglist.c:48
+msgid "Background read from tty"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:49
+#: sysdeps/sun4/siglist.c:49
+msgid "Background write to tty"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:50
+#: sysdeps/sun4/siglist.c:50
+msgid "I/O now possible"
+msgstr "प्र/नि अब सम्भव "
+
+#: sysdeps/osf1/siglist.c:51
+#: sysdeps/sun4/siglist.c:51
+msgid "CPU limit exceeded"
+msgstr "सिपियुको सीमा नाघियो"
+
+#: sysdeps/osf1/siglist.c:52
+#: sysdeps/sun4/siglist.c:52
+msgid "File size limit exceeded"
+msgstr "फाईलको आकारको सीमा नाघियो"
+
+#: sysdeps/osf1/siglist.c:53
+#: sysdeps/sun4/siglist.c:53
+msgid "Virtual alarm clock"
+msgstr "काल्पनिक जागरन घडी "
+
+#: sysdeps/osf1/siglist.c:54
+#: sysdeps/sun4/siglist.c:54
+msgid "Profiling alarm clock"
+msgstr "जागरन घडीको प्रोफाईलहुदैछ"
+
+#: sysdeps/osf1/siglist.c:55
+#: sysdeps/sun4/siglist.c:55
+msgid "Window size change"
+msgstr "विन्डो आकार परिवर्तन"
+
+#: sysdeps/osf1/siglist.c:56
+#: sysdeps/sun4/siglist.c:56
+msgid "Information request"
+msgstr "जानकारी अनुरोध"
+
+#: sysdeps/osf1/siglist.c:57
+#: sysdeps/sun4/siglist.c:57
+msgid "User defined signal 1"
+msgstr "प्रयोगकर्ताद्वारा परिभषित संकेत १"
+
+#: sysdeps/osf1/siglist.c:58
+#: sysdeps/sun4/siglist.c:58
+msgid "User defined signal 2"
+msgstr "प्रयोगकर्ताद्वारा परिभषित संकेत २"
+

src/Makefile.am

@@ -4,7 +4,13 @@ else
 inodedb_SUBDIRS		=
 endif
 
-SUBDIRS			= daemon $(inodedb_SUBDIRS)
+if NEED_LIBGTOP
+daemon_SUBDIRS		= daemon
+else
+daemon_SUBDIRS		=
+endif
+
+SUBDIRS			= $(daemon_SUBDIRS) $(inodedb_SUBDIRS)
 
 DIST_SUBDIRS		= daemon inodedb
 

src/daemon/ChangeLog

@@ -1,3 +1,10 @@
+2005-02-15  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* daemon.h:
+	* gnuserv.c: (syslog_message), (syslog_io_message):
+	* main.c: (handle_parent_connection):
+	* slave.c: (handle_slave_connection), (handle_slave_command): Misc. cleanups.
+
 2004-09-19  Benoît Dejean  <tazforever@dlfp.org>
 
 	* gnuserv.c: (setup_table): 'screen' is only defined when AUTH_MAGIC_COOKIE

src/daemon/daemon.h

@@ -25,7 +25,6 @@
 #define __GLIBTOP_DAEMON_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 #include <glibtop/gnuserv.h>
 
 #include <glibtop/open.h>
@@ -60,17 +59,17 @@ G_BEGIN_DECLS
 #define MSG_BUFSZ		sizeof (struct _glibtop_ipc_message)
 #define MSG_MSGSZ		(MSG_BUFSZ - sizeof (long))
 
-void handle_parent_connection (int s);
-void handle_slave_connection (int input, int output);
+void handle_parent_connection (int s) G_GNUC_INTERNAL;
+void handle_slave_connection (int input, int output) G_GNUC_INTERNAL;
 void handle_slave_command (glibtop_command *cmnd, glibtop_response *resp,
-			   const void *parameter);
+			   const void *parameter) G_GNUC_INTERNAL ;
 
 void do_output (int s, glibtop_response *resp, off_t offset,
-		size_t data_size, const void *data);
-int do_read (int s, void *ptr, size_t total_size);
+		size_t data_size, const void *data) G_GNUC_INTERNAL;
+int do_read (int s, void *ptr, size_t total_size) G_GNUC_INTERNAL;
 
-void syslog_message (int priority, char *format, ...);
-void syslog_io_message (int priority, char *format, ...);
+void syslog_message (int priority, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
+void syslog_io_message (int priority, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
 
 extern int enable_debug;
 extern int verbose_output;

src/daemon/gnuserv.c

@@ -65,8 +65,6 @@ char *program_invocation_short_name;
 char *program_invocation_name;
 #endif
 
-void handle_parent_connection (int s);
-void handle_slave_connection (int input, int output);
 
 #if !defined(INTERNET_DOMAIN_SOCKETS)
 #error "Internet Domain sockets are required"
@@ -87,7 +85,7 @@ static int invoked_from_inetd = 0;
 static int changed_uid = 0;
 
 void
-syslog_message (int priority, char *format, ...)
+syslog_message (int priority, const char *format, ...)
 {
     va_list ap;
     char buffer [BUFSIZ];
@@ -100,7 +98,7 @@ syslog_message (int priority, char *format, ...)
 }
 
 void
-syslog_io_message (int priority, char *format, ...)
+syslog_io_message (int priority, const char *format, ...)
 {
     va_list ap;
     char buffer [BUFSIZ];

src/daemon/io.c

@@ -22,6 +22,7 @@
 */
 
 #include "daemon.h"
+#include <glibtop/error.h>
 
 void
 do_output (int s, glibtop_response *resp, off_t offset,

src/daemon/main.c

@@ -62,13 +62,13 @@ handle_parent_connection (int s)
     while (do_read (s, cmnd, sizeof (glibtop_command))) {
 	if (enable_debug)
 	    syslog_message (LOG_DEBUG,
-			    "Parent (%d) received command %d from client.",
-			    getpid (), (int) cmnd->command);
+			    "Parent (%d) received command %llu from client.",
+			    getpid (), cmnd->command);
 
 	if (cmnd->data_size >= BUFSIZ) {
 	    syslog_message (LOG_WARNING,
-			    "Client sent %d bytes, but buffer is %d",
-			    cmnd->data_size, BUFSIZ);
+			    "Client sent %llu bytes, but buffer is %lu",
+			    cmnd->data_size, (unsigned long)BUFSIZ);
 	    return;
 	}
 
@@ -78,8 +78,8 @@ handle_parent_connection (int s)
 
 	if (cmnd->data_size) {
 	    if (enable_debug)
-		syslog_message (LOG_DEBUG, "Client has %d bytes of data.",
-				(int) cmnd->data_size);
+		syslog_message (LOG_DEBUG, "Client has %llu bytes of data.",
+				cmnd->data_size);
 
 	    do_read (s, parameter, cmnd->data_size);
 
@@ -229,7 +229,7 @@ handle_parent_connection (int s)
 		       0, NULL);
 	    break;
 	default:
-	    syslog_message (LOG_ERR, "Parent received unknown command %u.",
+	    syslog_message (LOG_ERR, "Parent received unknown command %llu.",
 			    cmnd->command);
 	    break;
 	}

src/daemon/slave.c

@@ -22,6 +22,7 @@
 */
 
 #include "daemon.h"
+#include <glibtop/error.h>
 
 void
 handle_slave_connection (int input, int output)
@@ -42,13 +43,13 @@ handle_slave_connection (int input, int output)
 	while (do_read (input, cmnd, sizeof (glibtop_command))) {
 #ifdef SLAVE_DEBUG
 		fprintf (stderr, "Slave %d received command "
-			 "%d from client.\n", getpid (), cmnd->command);
+			 "%llu from client.\n", getpid (), cmnd->command);
 #endif
 
 		if (cmnd->data_size >= BUFSIZ)
-			glibtop_error ("Client sent %d bytes, "
-				       "but buffer is %d",
-				       cmnd->size, BUFSIZ);
+			glibtop_error ("Client sent %llu bytes, "
+				       "but buffer is %lu",
+				       cmnd->size, (unsigned long)BUFSIZ);
 
 		memset (resp, 0, sizeof (glibtop_response));
 
@@ -56,7 +57,7 @@ handle_slave_connection (int input, int output)
 
 		if (cmnd->data_size) {
 #ifdef SLAVE_DEBUG
-			fprintf (stderr, "Client has %d bytes of data.\n",
+			fprintf (stderr, "Client has %llu bytes of data.\n",
 				 cmnd->data_size);
 #endif
 
@@ -249,7 +250,7 @@ handle_slave_command (glibtop_command *cmnd, glibtop_response *resp,
 		break;
 #endif
 	default:
-		glibtop_error ("Child received unknown command %u",
+		glibtop_error ("Child received unknown command %llu",
 			       cmnd->command);
 		break;
 	}

structures.def

@@ -1,4 +1,5 @@
 glibtop_map_entry|ulong(flags,start,end,offset,perm,inode,device):string(filename)
+glibtop_open_file_entry|ulong(flags,fd,type,dest_port):string(filename,dest_host)
 glibtop_mountentry|ulong(dev):string(devname,mountdir,type)
 glibtop_sysdeps|ulong(features,pointer_size,cpu,mem,swap,uptime,loadavg,shm_limits,msg_limits,sem_limits,proclist,proc_state,proc_uid,proc_mem,proc_time,proc_signal,proc_kernel,proc_segment,proc_args,proc_map,mountlist,fsusage,interface_names,netlist,netload,ppp)
 

sysdeps/aix/ChangeLog

@@ -1,3 +1,8 @@
+2004-12-23  Benoît Dejean  <tazforever@dlfp.org>
+
+	* netlist.c:
+	* Makefile.am: Added dummy glibtop_get_netlist.
+
 2004-10-22  Benoît Dejean  <tazforever@dlfp.org>
 
 	* procargs.c: (glibtop_get_proc_args_s):

sysdeps/aix/Makefile.am

@@ -7,8 +7,8 @@ libgtop_sysdeps_2_0_la_SOURCES  = siglist.c nosuid.c mem.c swap.c uptime.c \
 				  procargs.c prockernel.c proclist.c procmap.c \
 				  procmem.c procsegment.c procsignal.c \
 				  proctime.c procuid.c procmem.c utils.c \
-				  procstate.c sysinfo.c
-				
+				  procstate.c sysinfo.c netlist.c
+
 
 libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 

sysdeps/aix/netlist.c

@@ -1,9 +1,6 @@
 /* $Id$ */
 
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
+/* This file is part of LibGTop 2.0.
 
    LibGTop is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
@@ -21,18 +18,23 @@
    Boston, MA 02111-1307, USA.
 */
 
-#ifndef __GLIBTOP_TYPES_H__
-#define __GLIBTOP_TYPES_H__
+#include <glibtop.h>
+#include <glibtop/netlist.h>
 
-G_BEGIN_DECLS
+static const unsigned long _glibtop_sysdeps_netlist = 0;
 
-#define GLIBTOP_TYPE_LONG	1
-#define GLIBTOP_TYPE_ULONG	2
-#define GLIBTOP_TYPE_DOUBLE	3
-#define GLIBTOP_TYPE_INT	4
-#define GLIBTOP_TYPE_CHAR	5
-#define GLIBTOP_TYPE_STRING	6
+/* Init function. */
 
-G_END_DECLS
+void
+glibtop_init_netlist_s (glibtop *server)
+{
+	server->sysdeps.netlist = _glibtop_sysdeps_netlist;
+}
 
-#endif
+char**
+glibtop_get_netlist_s (glibtop *server, glibtop_netlist *buf)
+{
+	memset (buf, 0, sizeof (glibtop_netlist));
+
+	return NULL;
+}

sysdeps/common/ChangeLog

@@ -1,3 +1,23 @@
+2005-02-28  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* fsusage.c: * Add support for file system read and write counting
+	(needed for the disk load feature of the multiload applet).
+
+2005-02-23  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* fsusage.c: (glibtop_get_fsusage_s): Correct file system size calculations.
+	Patch from marcus@freebsd.org (Joe Marcus Clarke).
+	Closes #168232.
+
+2005-02-15  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* fsusage.c: (_glibtop_get_fsusage_read_write): Fixed G_GNUC attribute usage.
+	Replaced macro by inline function.
+
+2005-01-18  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* mountlist.c: (ignore_mount_entry): Re-worked with bsearch.
+
 2004-12-09  Benoît Dejean  <tazforever@dlfp.org>
 
 	* mountlist.c: (ignore_mount_entry): Ignores "unkown" file system type.

sysdeps/common/error.c

@@ -30,17 +30,17 @@
 static void
 print_server_name (const glibtop *server)
 {
-	fprintf (stderr, "%s: ", server ?
-		 (server->name ? server->name : DEFAULT_NAME)
+	fprintf (stderr, "%s: ", server && server->name
+		 ? server->name
 		 : DEFAULT_NAME);
 }
 
 void
-glibtop_error_vr (glibtop *server, char *format, va_list args)
+glibtop_error_vr (glibtop *server, const char *format, va_list args)
 {
 	print_server_name (server);
 	vfprintf (stderr, format, args);
-	fprintf (stderr, "\n");
+	fputc('\n', stderr);
 
 #ifdef LIBGTOP_ENABLE_DEBUG
 	abort ();
@@ -50,7 +50,7 @@ glibtop_error_vr (glibtop *server, char *format, va_list args)
 }
 
 void
-glibtop_error_io_vr (glibtop *server, char *format, int error, va_list args)
+glibtop_error_io_vr (glibtop *server, const char *format, int error, va_list args)
 {
 	print_server_name (server);
 	vfprintf (stderr, format, args);
@@ -64,11 +64,11 @@ glibtop_error_io_vr (glibtop *server, char *format, int error, va_list args)
 }
 
 void
-glibtop_warn_vr (glibtop *server, char *format, va_list args)
+glibtop_warn_vr (glibtop *server, const char *format, va_list args)
 {
 	print_server_name (server);
 	vfprintf (stderr, format, args);
-	fprintf (stderr, "\n");
+	fputc('\n', stderr);
 
 #ifdef LIBGTOP_FATAL_WARNINGS
 	abort ();
@@ -76,7 +76,7 @@ glibtop_warn_vr (glibtop *server, char *format, va_list args)
 }
 
 void
-glibtop_warn_io_vr (glibtop *server, char *format, int error, va_list args)
+glibtop_warn_io_vr (glibtop *server, const char *format, int error, va_list args)
 {
 	print_server_name (server);
 	vfprintf (stderr, format, args);
@@ -88,8 +88,8 @@ glibtop_warn_io_vr (glibtop *server, char *format, int error, va_list args)
 }
 
 
-void G_GNUC_UNUSED
-glibtop_error_r (glibtop *server, char *format, ...)
+void
+glibtop_error_r (glibtop *server, const char *format, ...)
 {
 	va_list args;
 
@@ -99,8 +99,8 @@ glibtop_error_r (glibtop *server, char *format, ...)
 }
 
 
-void G_GNUC_UNUSED
-glibtop_warn_r (glibtop *server, char *format, ...)
+void
+glibtop_warn_r (glibtop *server, const char *format, ...)
 {
 	va_list args;
 
@@ -109,8 +109,8 @@ glibtop_warn_r (glibtop *server, char *format, ...)
 	va_end (args);
 }
 
-void G_GNUC_UNUSED
-glibtop_error_io_r (glibtop *server, char *format, ...)
+void
+glibtop_error_io_r (glibtop *server, const char *format, ...)
 {
 	va_list args;
 
@@ -119,8 +119,8 @@ glibtop_error_io_r (glibtop *server, char *format, ...)
 	va_end (args);
 }
 
-void G_GNUC_UNUSED
-glibtop_warn_io_r (glibtop *server, char *format, ...)
+void
+glibtop_warn_io_r (glibtop *server, const char *format, ...)
 {
 	va_list args;
 
@@ -129,10 +129,9 @@ glibtop_warn_io_r (glibtop *server, char *format, ...)
 	va_end (args);
 }
 
-#ifndef __GNUC__
 
 void
-glibtop_error (char *format, ...)
+glibtop_error (const char *format, ...)
 {
 	va_list args;
 	va_start (args, format);
@@ -141,7 +140,7 @@ glibtop_error (char *format, ...)
 }
 
 void
-glibtop_warn (char *format, ...)
+glibtop_warn (const char *format, ...)
 {
 	va_list args;
 	va_start (args, format);
@@ -150,7 +149,7 @@ glibtop_warn (char *format, ...)
 }
 
 void
-glibtop_error_io (char *format, ...)
+glibtop_error_io (const char *format, ...)
 {
 	va_list args;
 	va_start (args, format);
@@ -159,12 +158,10 @@ glibtop_error_io (char *format, ...)
 }
 
 void
-glibtop_warn_io (char *format, ...)
+glibtop_warn_io (const char *format, ...)
 {
 	va_list args;
 	va_start (args, format);
 	glibtop_warn_io_vr (glibtop_global_server, format, errno, args);
 	va_end (args);
 }
-
-#endif /* __GNUC__ */

sysdeps/common/fsusage.c

@@ -126,12 +126,28 @@ static const unsigned long _glibtop_sysdeps_fsusage =
  */
 
 #ifdef linux
-void _glibtop_linux_get_fsusage_read_write(glibtop *server,
-					   glibtop_fsusage *buf,
-					   const char *path);
+void
+_glibtop_linux_get_fsusage_read_write(glibtop *server,
+				      glibtop_fsusage *buf,
+				      const char *path) G_GNUC_INTERNAL;
+
+static inline void
+_glibtop_get_fsusage_read_write(glibtop *server,
+				glibtop_fsusage *buf,
+				const char *path)
+{
+	_glibtop_linux_get_fsusage_read_write(server, buf, path);
+}
+
+
+#elif defined(__FreeBSD__)
+void G_GNUC_INTERNAL
+_glibtop_freebsd_get_fsusage_read_write(glibtop *server,
+					glibtop_fsusage *buf,
+					const char *path);
 
 #define _glibtop_get_fsusage_read_write(S, B, P) \
-        _glibtop_linux_get_fsusage_read_write(S, B, P)
+	_glibtop_freebsd_get_fsusage_read_write(S, B, P)
 
 #else /* default fallback */
 #warning glibtop_get_fsusage .read .write are not implemented.
@@ -142,7 +158,7 @@ _glibtop_get_fsusage_read_write(glibtop *server,
 {
   /* NOOP */
 }
-#endif
+#endif /* default fallback */
 
 /* end _glibtop_get_fsusage_read_write */
 
@@ -253,8 +269,9 @@ glibtop_get_fsusage_s (glibtop *server, glibtop_fsusage *buf,
   if (statvfs (path, &fsd) < 0)
     return;
 
-#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))
-  /* Solaris but not SunOS */
+#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) \
+	|| defined(__FreeBSD__)
+  /* Solaris but not SunOS and FreeBSD */
   buf->block_size = fsd.f_frsize;
 #else
   /* else, including Linux */

sysdeps/common/gnuslib.c

@@ -30,6 +30,7 @@
  */
 
 #include <glibtop.h>
+#include <glibtop/error.h>
 #include <glibtop/gnuserv.h>
 
 #include <fcntl.h>

sysdeps/common/mountlist.c

@@ -21,6 +21,7 @@
 
 #include <glib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/types.h>
 
 #if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
@@ -535,31 +536,28 @@ read_filesystem_list (void)
 
 static gboolean ignore_mount_entry(const struct mount_entry *me)
 {
+	/* keep sorted */
 	static const char ignored[][12] = {
+		"autofs",
+		"binfmt_misc",
+		"devpts",
+		"mntfs",
+		"none",
+		"openpromfs",
 		"proc",
 		"procfs",
-		"autofs",
-		"sysfs",
-		"usbfs",
-		"none",
-		"devpts",
-		"usbdevfs",
-		"binfmt_misc",
 		"supermount",
-		"mntfs",
-		"openpromfs",
-		"unknown"
+		"sysfs",
+		"unknown",
+		"usbdevfs",
+		"usbfs"
 	};
 
-	const char (*i)[12] = &ignored[0];
+	typedef int (*Comparator)(const void*, const void*);
 
-	while(i != (&ignored[0] + G_N_ELEMENTS(ignored))) {
-		if(strcmp(*i, me->me_type) == 0)
-			return TRUE;
-		++i;
-	}
-
-	return FALSE;
+	return bsearch(me->me_type,
+		       ignored, G_N_ELEMENTS(ignored), sizeof ignored[0],
+		       (Comparator) strcmp) != NULL;
 }
 
 

sysdeps/freebsd/ChangeLog

@@ -1,3 +1,51 @@
+2005-02-28  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* fsusage.c: (_glibtop_freebsd_get_fsusage_read_write): Forgot to add
+	this file :)
+
+2005-02-28  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* Makefile.am:
+	* cpu.c: (glibtop_get_cpu_p):
+	* netlist.c: (glibtop_get_netlist_s):
+	* netload.c: (glibtop_get_netload_p):
+	* procmem.c: (glibtop_get_proc_mem_p):
+	
+	Fix a bug in netlist where glibtop_netlist.number was never initialized to 0
+	(this resulted in a NULL pointer dereference in the network load feature
+	of the multiload applet)
+
+	* Add support for getting interface flags and packet counts even on interfaces
+	without IP addresses (needed for the network load feature of the multiload applet)
+
+	* Restore per-process limits in the !FreeBSD or __FreeBSD_version < 500013
+	case
+
+	* Add CPU interrupt time as IOWAIT to get support for the cpu load feature of
+	the multiload applet.
+	
+	Patch from marcus@freebsd.org (Joe Marcus Clarke).
+	Closes #168704.
+
+2005-02-23  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* Makefile.am:
+	* netlist.c: (glibtop_get_netlist_s):
+	* procmap.c: (glibtop_get_proc_map_p):
+	* procmem.c: (glibtop_get_proc_mem_p):
+	* procopenfiles.c: (glibtop_init_proc_open_files_s),
+	(glibtop_get_proc_open_files_s):
+	* proctime.c:
+	
+	Add support for FreeBSD 6-CURRENT.
+	Use the more portable getrlimit to obtain process memory limits.
+	Correctly determine process time.
+	Stub out the procopenfiles() function (this is not yet implemented, however).
+	Fix a nasty infinite loop and memory leak due to a forgot pointer increment.
+	
+	Patch from marcus@freebsd.org (Joe Marcus Clarke).
+	Closes #168232.
+
 2004-12-05  Benoît Dejean  <tazforever@dlfp.org>
 
 	* Makefile.am:

sysdeps/freebsd/Makefile.am

@@ -12,7 +12,7 @@ libgtop_sysdeps_suid_2_0_la_SOURCES	= open.c close.c cpu.c mem.c swap.c \
 				  sem_limits.c proclist.c procstate.c procuid.c \
 				  proctime.c procmem.c procsignal.c prockernel.c \
 				  procsegment.c procargs.c procmap.c netlist.c \
-				  netload.c ppp.c
+				  netload.c ppp.c procopenfiles.c fsusage.c
 
 libgtop_sysdeps_suid_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 

sysdeps/freebsd/cpu.c

@@ -34,7 +34,8 @@
 static const unsigned long _glibtop_sysdeps_cpu =
 (1L << GLIBTOP_CPU_TOTAL) + (1L << GLIBTOP_CPU_USER) +
 (1L << GLIBTOP_CPU_NICE) + (1L << GLIBTOP_CPU_SYS) +
-(1L << GLIBTOP_CPU_IDLE) + (1L << GLIBTOP_CPU_FREQUENCY);
+(1L << GLIBTOP_CPU_IDLE) + (1L << GLIBTOP_CPU_FREQUENCY) +
+(1L << GLIBTOP_CPU_IOWAIT);
 
 #ifndef KERN_CP_TIME
 /* nlist structure for kernel access */
@@ -122,6 +123,8 @@ glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
 	buf->sys = cpts [CP_SYS];
 	/* set idle time */
 	buf->idle = cpts [CP_IDLE];
+	/* set iowait (really just interrupt) time */
+	buf->iowait = cpts [CP_INTR];
 
 	/* set frequency */
 	/*

sysdeps/freebsd/fsusage.c

@@ -0,0 +1,41 @@
+#include <glibtop.h>
+#include <glibtop/error.h>
+#include <glibtop/fsusage.h>
+
+#include <glibtop_suid.h>
+
+#include <glib.h>
+
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/mount.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+void
+G_GNUC_INTERNAL
+_glibtop_freebsd_get_fsusage_read_write(glibtop *server,
+				      glibtop_fsusage *buf,
+				      const char *path);
+
+void G_GNUC_INTERNAL
+_glibtop_freebsd_get_fsusage_read_write(glibtop *server,
+				      glibtop_fsusage *buf,
+				      const char *path)
+{
+	int result;
+	struct statfs sfs;
+
+	result = statfs (path, &sfs);
+
+	if (result == -1) {
+		return;
+	}
+
+	buf->read = sfs.f_syncreads + sfs.f_asyncreads;
+	buf->write = sfs.f_syncwrites + sfs.f_asyncwrites;
+
+	buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE);
+}