Increased GLIBTOP_NCPU to 32. Added real_ncpu to struct glibtop. Added

	* configure.in:
	* glibtop.h:
	* include/glibtop/cpu.h:
	* include/glibtop/procmap.h:

	Increased GLIBTOP_NCPU to 32.
	Added real_ncpu to struct glibtop.
	Added smaps members to glibtop_map_entry.

	Bumped version number to 2.13.0
	Broke ABI again. Sorry.

5 files changed, 37 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 5f4ad5b5..dcb03c02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-12-09  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	* glibtop.h:
+	* include/glibtop/cpu.h:
+	* include/glibtop/procmap.h:
+
+	Increased GLIBTOP_NCPU to 32.
+	Added real_ncpu to struct glibtop.
+	Added smaps members to glibtop_map_entry.
+
+	Bumped version number to 2.13.0
+	Broke ABI again. Sorry.
+
 2005-12-08  Benoît Dejean  <benoit@placenet.org>
 
 	* doc/reference.texi:
diff --git a/configure.in b/configure.in
index 023294af..06539fc1 100644
--- a/configure.in
+++ b/configure.in
@@ -7,13 +7,13 @@ AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
 
 LIBGTOP_MAJOR_VERSION=2
-LIBGTOP_MINOR_VERSION=12
-LIBGTOP_MICRO_VERSION=3
+LIBGTOP_MINOR_VERSION=13
+LIBGTOP_MICRO_VERSION=0
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
 AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
 
 dnl  increment if the interface has additions, changes, removals.
-LIBGTOP_CURRENT=6
+LIBGTOP_CURRENT=7
 
 dnl  increment any time the source changes; set to
 dnl  0 if you increment CURRENT
@@ -22,7 +22,7 @@ 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=1
+LIBGTOP_AGE=0
 
 # you can set this to `-snap' for instance to create
 # a `libgtop-1.x.y-snap.tar.gz' tarball.
diff --git a/glibtop.h b/glibtop.h
index dced6d77..8e5defa2 100644
--- a/glibtop.h
+++ b/glibtop.h
@@ -77,6 +77,7 @@ struct _glibtop
 	int output [2];			/* Pipe client -> server */
 	int socket;			/* Accepted connection of a socket */
 	int ncpu;			/* Number of CPUs, zero if single-processor */
+	int real_ncpu;			/* Real number of CPUs. Only ncpu are monitored */
 	unsigned long os_version_code;	/* Version code of the operating system */
 	const char *name;		/* Program name for error messages */
 	const char *server_command;	/* Command used to invoke server */
diff --git a/include/glibtop/cpu.h b/include/glibtop/cpu.h
index 3b2d5537..914fb1e9 100644
--- a/include/glibtop/cpu.h
+++ b/include/glibtop/cpu.h
@@ -52,8 +52,11 @@ G_BEGIN_DECLS
 
 #define GLIBTOP_MAX_CPU		18
 
-/* Nobody should really be using more than 4 processors. */
-#define GLIBTOP_NCPU		4
+/* Nobody should really be using more than 4 processors.
+   Yes we are :)
+   Nobody should really be using more than 32 processors.
+*/
+#define GLIBTOP_NCPU		32
 
 typedef struct _glibtop_cpu	glibtop_cpu;
 
diff --git a/include/glibtop/procmap.h b/include/glibtop/procmap.h
index 4a3e3083..c4eea343 100644
--- a/include/glibtop/procmap.h
+++ b/include/glibtop/procmap.h
@@ -43,7 +43,15 @@ G_BEGIN_DECLS
 #define GLIBTOP_MAP_ENTRY_DEVICE	5
 #define GLIBTOP_MAP_ENTRY_FILENAME	6
 
-#define GLIBTOP_MAX_MAP_ENTRY		7
+/* Smap support */
+#define GLIBTOP_MAP_ENTRY_SIZE			 7
+#define GLIBTOP_MAP_ENTRY_RSS			 8
+#define GLIBTOP_MAP_ENTRY_SHARED_CLEAN		 9
+#define GLIBTOP_MAP_ENTRY_SHARED_DIRTY		10
+#define GLIBTOP_MAP_ENTRY_PRIVATE_CLEAN		11
+#define GLIBTOP_MAP_ENTRY_PRIVATE_DIRTY		12
+
+#define GLIBTOP_MAX_MAP_ENTRY		13
 
 #define GLIBTOP_MAP_FILENAME_LEN	215
 
@@ -60,6 +68,10 @@ typedef struct _glibtop_proc_map	glibtop_proc_map;
 struct _glibtop_map_entry
 {
 	guint64 flags, start, end, offset, perm, inode, device;
+	guint64 size,
+		rss,
+		shared_clean, shared_dirty,
+		private_clean, private_dirty;
 	char filename [GLIBTOP_MAP_FILENAME_LEN+1];
 };