Using text_rss', shlib_rss', data_rss' and dirty_size' instead of

1998-08-12  Martin Baulig  <martin@home-of-linux.org>

	* include/glibtop/procsegment.h (glibtop_proc_segment): Using
	`text_rss', `shlib_rss', `data_rss' and `dirty_size' instead of
	`tsr', `lrs', `drs' and `dt'. New field `stack_rss'.

	* sysdeps/linux/procmem.c: Memory sizes now correctly in bytes.
	* sysdeps/linux/procsegment.c: Dito.

	* sysdeps/kernel/procsegment.c: Stack pages are reported via
	`stack_rss' and no longer count towards `data_rss'
	* kernel/table.h (table_proc_segment): Added `srs' field.
	* kernel/table21/module.c (TBL_PROC_SEGMENT): Added kernel support
	for this.

	* sysdeps/{linux, kernel, stub}/procmap.c: New files.

sysdeps/linux/Makefile.am

@@ -8,6 +8,6 @@ libgtop_sysdeps_la_SOURCES	= open.c close.c cpu.c mem.c swap.c \
 				  uptime.c loadavg.c shm_limits.c msg_limits.c \
 				  sem_limits.c proclist.c procstate.c procuid.c \
 				  proctime.c procmem.c procsignal.c prockernel.c \
-				  procsegment.c siglist.c
+				  procsegment.c procmap.c siglist.c
 
 include_HEADERS			= glibtop_server.h glibtop_machine.h

sysdeps/linux/glibtop_server.h

@@ -40,6 +40,7 @@ __BEGIN_DECLS
 #define GLIBTOP_SUID_PROC_SIGNAL	0
 #define GLIBTOP_SUID_PROC_KERNEL	0
 #define GLIBTOP_SUID_PROC_SEGMENT	0
+#define GLIBTOP_SUID_PROC_MAP		0
 
 __END_DECLS
 

sysdeps/linux/proclist.c

@@ -57,7 +57,8 @@ glibtop_init_proclist_s (glibtop *server)
  * On error, NULL is returned and buf->flags is zero. */
 
 unsigned *
-glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf)
+glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
+			int64_t which, int64_t arg)
 {
 	DIR *proc;
 	struct dirent *entry;

sysdeps/linux/procmap.c

@@ -0,0 +1,47 @@
+/* $Id$ */
+
+/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   This file is part of the Gnome Top Library.
+   Contributed by Joshua Sled <jsled@xcf.berkeley.edu>, July 1998.
+
+   The Gnome Top Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Top Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <glibtop.h>
+#include <glibtop/error.h>
+#include <glibtop/xmalloc.h>
+#include <glibtop/procmap.h>
+
+static const unsigned long _glibtop_sysdeps_proc_map = 0;
+
+/* Init function. */
+
+void
+glibtop_init_proc_map_s (glibtop *server)
+{
+	server->sysdeps.proc_map = _glibtop_sysdeps_proc_map;
+}
+
+/* Provides detailed information about a process. */
+
+glibtop_map_entry *
+glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf,	pid_t pid)
+{
+	glibtop_init_s (&server, GLIBTOP_SYSDEPS_PROC_MAP, 0);
+	
+	memset (buf, 0, sizeof (glibtop_proc_map));
+	
+	return NULL;
+}

sysdeps/linux/procmem.c

@@ -28,12 +28,33 @@ static const unsigned long _glibtop_sysdeps_proc_mem =
 (1 << GLIBTOP_PROC_MEM_RESIDENT) + (1 << GLIBTOP_PROC_MEM_SHARE) +
 (1 << GLIBTOP_PROC_MEM_RSS) + (1 << GLIBTOP_PROC_MEM_RSS_RLIM);
 
+#ifndef LOG1024
+#define LOG1024		10
+#endif
+
+/* these are for getting the memory statistics */
+static int pageshift;		/* log base 2 of the pagesize */
+
+/* define pagetok in terms of pageshift */
+#define pagetok(size) ((size) << pageshift)
+
 /* Init function. */
 
 void
 glibtop_init_proc_mem_s (glibtop *server)
 {
+	register int pagesize;
+
 	server->sysdeps.proc_mem = _glibtop_sysdeps_proc_mem;
+
+	/* get the page size with "getpagesize" and calculate pageshift
+	 * from it */
+	pagesize = getpagesize ();
+	pageshift = 0;
+	while (pagesize > 1) {
+		pageshift++;
+		pagesize >>= 1;
+	}
 }
 
 /* Provides detailed information about a process. */
@@ -93,6 +114,11 @@ glibtop_get_proc_mem_s (glibtop *server, glibtop_proc_mem *buf, pid_t pid)
 	sscanf (input, "%Lu %Lu %Lu",
 		&buf->size, &buf->resident, &buf->share);
 
+	buf->size <<= pageshift;
+	buf->resident <<= pageshift;
+	buf->share <<= pageshift;
+	buf->rss <<= pageshift;
+
 	fclose (f);
 
 	buf->flags = _glibtop_sysdeps_proc_mem;

sysdeps/linux/procsegment.c

@@ -24,17 +24,41 @@
 #include <glibtop/procsegment.h>
 
 static const unsigned long _glibtop_sysdeps_proc_segment =
-(1 << GLIBTOP_PROC_SEGMENT_TRS) + (1 << GLIBTOP_PROC_SEGMENT_LRS) +
-(1 << GLIBTOP_PROC_SEGMENT_DRS) + (1 << GLIBTOP_PROC_SEGMENT_DT) +
-(1 << GLIBTOP_PROC_SEGMENT_START_CODE) + (1 << GLIBTOP_PROC_SEGMENT_END_CODE) +
+(1 << GLIBTOP_PROC_SEGMENT_TEXT_RSS) +
+(1 << GLIBTOP_PROC_SEGMENT_SHLIB_RSS) +
+(1 << GLIBTOP_PROC_SEGMENT_DATA_RSS) +
+(1 << GLIBTOP_PROC_SEGMENT_DIRTY_SIZE) +
+(1 << GLIBTOP_PROC_SEGMENT_START_CODE) +
+(1 << GLIBTOP_PROC_SEGMENT_END_CODE) +
 (1 << GLIBTOP_PROC_SEGMENT_START_STACK);
 
+#ifndef LOG1024
+#define LOG1024		10
+#endif
+
+/* these are for getting the memory statistics */
+static int pageshift;		/* log base 2 of the pagesize */
+
+/* define pagetok in terms of pageshift */
+#define pagetok(size) ((size) << pageshift)
+
 /* Init function. */
 
 void
 glibtop_init_proc_segment_s (glibtop *server)
 {
+	register int pagesize;
+
 	server->sysdeps.proc_segment = _glibtop_sysdeps_proc_segment;
+
+	/* get the page size with "getpagesize" and calculate pageshift
+	 * from it */
+	pagesize = getpagesize ();
+	pageshift = 0;
+	while (pagesize > 1) {
+		pageshift++;
+		pagesize >>= 1;
+	}
 }
 
 /* Provides detailed information about a process. */
@@ -94,7 +118,13 @@ glibtop_get_proc_segment_s (glibtop *server, glibtop_proc_segment *buf,
 	input [nread] = 0;
 
 	sscanf (input, "%*d %*d %*d %Lu %Lu %Lu %Lu",
-		&buf->trs, &buf->lrs, &buf->drs, &buf->dt);
+		&buf->text_rss, &buf->shlib_rss,
+		&buf->data_rss, &buf->dirty_size);
+
+	buf->text_rss   <<= pageshift;
+	buf->shlib_rss  <<= pageshift;
+	buf->data_rss   <<= pageshift;
+	buf->dirty_size <<= pageshift;
 
 	fclose (f);