Released 2.10.2.

* NEWS: Released 2.10.2.

ChangeLog

@@ -1,3 +1,7 @@
+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.

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.

sysdeps/linux/ChangeLog

@@ -1,3 +1,7 @@
+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.

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);
+
+	if(server->os_version_code >= LINUX_VERSION_CODE(2, 6, 0))
+	{
+		file_to_buffer (server, buffer, PROC_VMSTAT);
+
+		p = strstr (buffer, "\npswpin");
+
+		if(p)
+		{
+			p = skip_token(p);
+			buf->pagein  = strtoull (p, &p, 0);
+
+			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 == NULL) return;
 
+		if(p)
+		{
 			p = skip_token (p);
 
 			buf->pagein  = strtoull (p, &p, 0);
 			buf->pageout = strtoull (p, &p, 0);
 
 			buf->flags |= _glibtop_sysdeps_swap_paging;
+		}
+	}
 }