Released 2.10.2.

* NEWS: Released 2.10.2.

ChangeLog

@@ -1,3 +1,19 @@
+2005-06-13  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* NEWS: Released 2.10.2.
+
+2005-06-05  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* README: Updated so people can find the ChangeLogs.
+
+2005-04-27  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* configure.in: 2.10.2 post release bump.
+
+	* include/glibtop/Makefile.am:
+	* include/glibtop/parameter.h:
+	* lib/init.c: Re-install open.h to please GTop (libgtop perl wrapper).
+
 2005-04-10  Benoît Dejean  <TazForEver@dlfp.org>
 
 	* NEWS: Released 2.10.1.

NEWS

@@ -1,3 +1,11 @@
+June 12, 2005: Overview of changes from 2.10.1 to 2.10.2
+========================================================
+* glibtop_get_mountlist() : Added tmpfs to ignore list.
+* Re-install open.h to please GTop (libgtop perl wrapper).
+* Linux:
+  * Fixed compilation on mips.
+  * Added pagein/pageout for 2.6.
+
 April 10, 2005: Overview of changes from 2.10.0 to 2.10.1
 =========================================================
 * Updated i18n.

README

@@ -1,8 +1,20 @@
-$Id$
-
 LATEST NEWS:
 ===========
 
 Please look also in the file 'NEWS' for latest news.
  
 Martin
+
+
+ChangeLogs:
+==========
+
+LibGTop has many ChangeLogs files. The following files are the the
+most important :
+
+- ChangeLog is the main ChangeLog.
+- sysdeps/<arch>/ChangeLog is the ChangeLog for arch specific changes.
+- sysdeps/common/ChangeLog is the ChangeLog for common changes (shared
+  implementation between archs).
+
+Benoît

configure.in

@@ -8,7 +8,7 @@ AC_CANONICAL_SYSTEM
 
 LIBGTOP_MAJOR_VERSION=2
 LIBGTOP_MINOR_VERSION=10
-LIBGTOP_MICRO_VERSION=1
+LIBGTOP_MICRO_VERSION=2
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
 AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
 

include/glibtop/Makefile.am

@@ -8,6 +8,6 @@ glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.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 procopenfiles.h
+			  netlist.h procopenfiles.h open.h
 
-noinst_HEADERS		= error.h write.h open.h read_data.h read.h
+noinst_HEADERS		= error.h write.h read_data.h read.h

include/glibtop/parameter.h

@@ -23,7 +23,6 @@
 #define __GLIBTOP_PARAMETER_H__
 
 #include <glibtop.h>
-#include <glibtop/open.h>
 
 G_BEGIN_DECLS
 

lib/init.c

@@ -24,6 +24,7 @@
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/sysdeps.h>
+#include <glibtop/open.h>
 #include <glibtop/parameter.h>
 
 #ifndef DEFAULT_PORT

sysdeps/common/ChangeLog

@@ -1,3 +1,7 @@
+2005-04-26  Jörgen Scheibengruber  <mfcn@gmx.de>
+
+	* mountlist.c: (ignore_mount_entry): Added tmpfs to ignore list.
+
 2005-03-25  Benoît Dejean  <TazForEver@dlfp.org>
 
 	* error.c: (glibtop_error_io_vr), (glibtop_warn_io_vr):

sysdeps/common/mountlist.c

@@ -549,6 +549,7 @@ static gboolean ignore_mount_entry(const struct mount_entry *me)
 		"procfs",
 		"supermount",
 		"sysfs",
+		"tmpfs",
 		"unknown",
 		"usbdevfs",
 		"usbfs"

sysdeps/linux/ChangeLog

@@ -1,3 +1,11 @@
+2005-06-13  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* swap.c: (glibtop_get_swap_s): Added pagein/pageout for linux 2.6.
+
+2005-05-26  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* siglist.c: Fixed compilation on mips. Closes #304570.
+
 2005-04-01  Benoît Dejean  <TazForEver@dlfp.org>
 
 	* glibtop_private.h: Fixed gcc-4.0 warnings.

sysdeps/linux/siglist.c

@@ -35,40 +35,110 @@ perl -nle 'print "{$1,\t\"$1\",\t\"$2\"}," if m|^#define\s*(SIG[A-Z0-9]+).*?/\*\
 
 const glibtop_signame glibtop_sys_siglist [] =
 {
+#ifdef SIGHUP
 	{SIGHUP,	"SIGHUP",       "Hangup (POSIX)."},
+#endif
+#ifdef SIGINT
 	{SIGINT,	"SIGINT",       "Interrupt (ANSI)."},
+#endif
+#ifdef SIGQUIT
 	{SIGQUIT,       "SIGQUIT",      "Quit (POSIX)."},
+#endif
+#ifdef SIGILL
 	{SIGILL,	"SIGILL",       "Illegal instruction (ANSI)."},
+#endif
+#ifdef SIGTRAP
 	{SIGTRAP,       "SIGTRAP",      "Trace trap (POSIX)."},
+#endif
+#ifdef SIGABRT
 	{SIGABRT,       "SIGABRT",      "Abort (ANSI)."},
+#endif
+#ifdef SIGIOT
 	{SIGIOT,	"SIGIOT",       "IOT trap (4.2 BSD)."},
+#endif
+#ifdef SIGBUS
 	{SIGBUS,	"SIGBUS",       "BUS error (4.2 BSD)."},
+#endif
+#ifdef SIGFPE
 	{SIGFPE,	"SIGFPE",       "Floating-point exception (ANSI)."},
+#endif
+#ifdef SIGKILL
 	{SIGKILL,       "SIGKILL",      "Kill, unblockable (POSIX)."},
+#endif
+#ifdef SIGUSR1
 	{SIGUSR1,	"SIGUSR1",      "User-defined signal 1 (POSIX)."},
+#endif
+#ifdef SIGSEGV
 	{SIGSEGV,	"SIGSEGV",      "Segmentation violation (ANSI)."},
+#endif
+#ifdef SIGUSR2
 	{SIGUSR2,	"SIGUSR2",      "User-defined signal 2 (POSIX)."},
+#endif
+#ifdef SIGPIPE
 	{SIGPIPE,       "SIGPIPE",      "Broken pipe (POSIX)."},
+#endif
+#ifdef SIGALRM
 	{SIGALRM,       "SIGALRM",      "Alarm clock (POSIX)."},
+#endif
+#ifdef SIGTERM
 	{SIGTERM,       "SIGTERM",      "Termination (ANSI)."},
+#endif
+#ifdef SIGSTKFLT
 	{SIGSTKFLT,     "SIGSTKFLT",    "Stack fault."},
+#endif
+#ifdef SIGCLD
 	{SIGCLD,	"SIGCLD",       "Same as SIGCHLD (System V)."},
+#endif
+#ifdef SIGCHLD
 	{SIGCHLD,       "SIGCHLD",      "Child status has changed (POSIX)."},
+#endif
+#ifdef SIGCONT
 	{SIGCONT,       "SIGCONT",      "Continue (POSIX)."},
+#endif
+#ifdef SIGSTOP
 	{SIGSTOP,       "SIGSTOP",      "Stop, unblockable (POSIX)."},
+#endif
+#ifdef SIGTSTP
 	{SIGTSTP,       "SIGTSTP",      "Keyboard stop (POSIX)."},
+#endif
+#ifdef SIGTTIN
 	{SIGTTIN,       "SIGTTIN",      "Background read from tty (POSIX)."},
+#endif
+#ifdef SIGTTOU
 	{SIGTTOU,       "SIGTTOU",      "Background write to tty (POSIX)."},
+#endif
+#ifdef SIGURG
 	{SIGURG,	"SIGURG",       "Urgent condition on socket (4.2 BSD)."},
+#endif
+#ifdef SIGXCPU
 	{SIGXCPU,       "SIGXCPU",      "CPU limit exceeded (4.2 BSD)."},
+#endif
+#ifdef SIGXFSZ
 	{SIGXFSZ,       "SIGXFSZ",      "File size limit exceeded (4.2 BSD)."},
+#endif
+#ifdef SIGVTALRM
 	{SIGVTALRM,     "SIGVTALRM",    "Virtual alarm clock (4.2 BSD)."},
+#endif
+#ifdef SIGPROF
 	{SIGPROF,       "SIGPROF",      "Profiling alarm clock (4.2 BSD)."},
+#endif
+#ifdef SIGWINCH
 	{SIGWINCH,      "SIGWINCH",     "Window size change (4.3 BSD, Sun)."},
+#endif
+#ifdef SIGPOLL
 	{SIGPOLL,       "SIGPOLL",      "Pollable event occurred (System V)."},
+#endif
+#ifdef SIGIO
 	{SIGIO,		"SIGIO",	"I/O now possible (4.2 BSD)."},
+#endif
+#ifdef SIGPWR
 	{SIGPWR,	"SIGPWR",       "Power failure restart (System V)."},
+#endif
+#ifdef SIGSYS
 	{SIGSYS,	"SIGSYS",       "Bad system call."},
+#endif
+#ifdef SIGUNUSED
 	{SIGUNUSED,	"SIGUNUSED",	""},
+#endif
 	{0,		NULL,		NULL}
 };

sysdeps/linux/swap.c

@@ -49,6 +49,7 @@ glibtop_init_swap_s (glibtop *server)
 
 #define MEMINFO		"/proc/meminfo"
 #define PROC_STAT	"/proc/stat"
+#define PROC_VMSTAT	"/proc/vmstat"
 
 void
 glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
@@ -69,15 +70,38 @@ glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
 
 	buf->flags = _glibtop_sysdeps_swap;
 
-	file_to_buffer(server, buffer, PROC_STAT);
 
-	p = strstr (buffer, "\nswap");
-	if (p == NULL) return;
+	if(server->os_version_code >= LINUX_VERSION_CODE(2, 6, 0))
+	{
+		file_to_buffer (server, buffer, PROC_VMSTAT);
 
-	p = skip_token (p);
+		p = strstr (buffer, "\npswpin");
 
-	buf->pagein  = strtoull (p, &p, 0);
-	buf->pageout = strtoull (p, &p, 0);
+		if(p)
+		{
+			p = skip_token(p);
+			buf->pagein  = strtoull (p, &p, 0);
 
-	buf->flags |= _glibtop_sysdeps_swap_paging;
+			p = skip_token(p);
+			buf->pageout  = strtoull (p, &p, 0);
+
+			buf->flags |= _glibtop_sysdeps_swap_paging;
+		}
+	}
+	else /* Linux 2.4 */
+	{
+		file_to_buffer (server, buffer, PROC_STAT);
+
+		p = strstr (buffer, "\nswap");
+
+		if(p)
+		{
+			p = skip_token (p);
+
+			buf->pagein  = strtoull (p, &p, 0);
+			buf->pageout = strtoull (p, &p, 0);
+
+			buf->flags |= _glibtop_sysdeps_swap_paging;
+		}
+	}
 }