changed call of 'glibtop_init__r', it now takes two additional arguments.

* sysdeps/linux/*.c: changed call of 'glibtop_init__r',
it now takes two additional arguments.

20 files changed, 25 insertions, 20 deletions

diff --git a/sysdeps/linux/Makefile.am b/sysdeps/linux/Makefile.am
index 7d161c51..5c5cb132 100644
--- a/sysdeps/linux/Makefile.am
+++ b/sysdeps/linux/Makefile.am
@@ -13,3 +13,5 @@ libgtop_sysdeps_la_SOURCES	= init.c 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
+
+include_HEADERS			= glibtop_server.h
diff --git a/sysdeps/linux/cpu.c b/sysdeps/linux/cpu.c
index 9f009092..804d29e9 100644
--- a/sysdeps/linux/cpu.c
+++ b/sysdeps/linux/cpu.c
@@ -34,7 +34,7 @@ glibtop_get_cpu__s (glibtop *server, glibtop_cpu *buf)
 {
 	FILE *f;
 
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_cpu));
 
diff --git a/sysdeps/linux/init.c b/sysdeps/linux/init.c
index f6a9a506..a3cb49ef 100644
--- a/sysdeps/linux/init.c
+++ b/sysdeps/linux/init.c
@@ -26,14 +26,16 @@ static glibtop	_glibtop_global_server;
 glibtop		*glibtop_global_server = NULL;
 
 glibtop *
-glibtop_init__r (glibtop **server)
+glibtop_init__r (glibtop **server, const unsigned long features,
+		 const unsigned flags)
 {
 	if (*server != NULL)
 		return *server;
 
 	if (glibtop_global_server == NULL) {
 		glibtop_global_server = &_glibtop_global_server;
-		glibtop_open (glibtop_global_server, "glibtop");
+		glibtop_open (glibtop_global_server, "glibtop",
+			      features, flags);
 	}
 	
 	return *server = glibtop_global_server;
diff --git a/sysdeps/linux/loadavg.c b/sysdeps/linux/loadavg.c
index 2b759b0f..d497a065 100644
--- a/sysdeps/linux/loadavg.c
+++ b/sysdeps/linux/loadavg.c
@@ -32,7 +32,7 @@ glibtop_get_loadavg__s (glibtop *server, glibtop_loadavg *buf)
 {
 	FILE *f;
 
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_loadavg));
 
diff --git a/sysdeps/linux/mem.c b/sysdeps/linux/mem.c
index 22a8b192..c7d78b1e 100644
--- a/sysdeps/linux/mem.c
+++ b/sysdeps/linux/mem.c
@@ -35,7 +35,7 @@ glibtop_get_mem__s (glibtop *server, glibtop_mem *buf)
 {
 	FILE *f;
 
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_mem));
 
diff --git a/sysdeps/linux/msg_limits.c b/sysdeps/linux/msg_limits.c
index 43b24407..6a1be74e 100644
--- a/sysdeps/linux/msg_limits.c
+++ b/sysdeps/linux/msg_limits.c
@@ -37,7 +37,7 @@ glibtop_get_msg_limits__s (glibtop *server, glibtop_msg_limits *buf)
 {
 	struct msginfo	msginfo;
   
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_msg_limits));
   
diff --git a/sysdeps/linux/open.c b/sysdeps/linux/open.c
index b2da083a..5645683a 100644
--- a/sysdeps/linux/open.c
+++ b/sysdeps/linux/open.c
@@ -51,7 +51,8 @@ static void set_linux_version(void) {
 /* Opens pipe to gtop server. Returns 0 on success and -1 on error. */
 
 void
-glibtop_open (glibtop *server, const char *program_name)
+glibtop_open (glibtop *server, const char *program_name,
+	      const unsigned long features, const unsigned flags)
 {
 	memset (server, 0, sizeof (glibtop));
 	server->name = program_name;
diff --git a/sysdeps/linux/procdata.c b/sysdeps/linux/procdata.c
index 1c9f9cf1..5e2bd856 100644
--- a/sysdeps/linux/procdata.c
+++ b/sysdeps/linux/procdata.c
@@ -85,7 +85,7 @@ glibtop_get_procdata__s (glibtop *server, glibtop_procdata *buf, pid_t pid)
 	int nread;
 	FILE *f;
 	
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 	
 	memset (buf, 0, sizeof (glibtop_procdata));
 
diff --git a/sysdeps/linux/prockernel.c b/sysdeps/linux/prockernel.c
index 5f6cba72..dbd1dcb1 100644
--- a/sysdeps/linux/prockernel.c
+++ b/sysdeps/linux/prockernel.c
@@ -37,7 +37,7 @@ glibtop_get_proc_kernel__s (glibtop *server, glibtop_proc_kernel *buf, pid_t pid
 	int nread;
 	FILE *f;
 	
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_kernel));
 
diff --git a/sysdeps/linux/proclist.c b/sysdeps/linux/proclist.c
index 93f79e34..e23ccbfe 100644
--- a/sysdeps/linux/proclist.c
+++ b/sysdeps/linux/proclist.c
@@ -60,7 +60,7 @@ glibtop_get_proclist__s (glibtop *server, glibtop_proclist *buf)
 	struct stat statb;
 	int len, i, ok;
 
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proclist));
 
diff --git a/sysdeps/linux/procmem.c b/sysdeps/linux/procmem.c
index 727565e6..fb5db2b1 100644
--- a/sysdeps/linux/procmem.c
+++ b/sysdeps/linux/procmem.c
@@ -36,7 +36,7 @@ glibtop_get_proc_mem__s (glibtop *server, glibtop_proc_mem *buf, pid_t pid)
 	int nread;
 	FILE *f;
 	
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_mem));
 
diff --git a/sysdeps/linux/procsegment.c b/sysdeps/linux/procsegment.c
index 70fd131d..1ed83167 100644
--- a/sysdeps/linux/procsegment.c
+++ b/sysdeps/linux/procsegment.c
@@ -38,7 +38,7 @@ glibtop_get_proc_segment__s (glibtop *server, glibtop_proc_segment *buf,
 	int nread;
 	FILE *f;
 	
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_segment));
 
diff --git a/sysdeps/linux/procsignal.c b/sysdeps/linux/procsignal.c
index 0e978eef..09754f62 100644
--- a/sysdeps/linux/procsignal.c
+++ b/sysdeps/linux/procsignal.c
@@ -35,7 +35,7 @@ glibtop_get_proc_signal__s (glibtop *server, glibtop_proc_signal *buf, pid_t pid
 	int nread;
 	FILE *f;
 	
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_signal));
 
diff --git a/sysdeps/linux/procstate.c b/sysdeps/linux/procstate.c
index 5a423622..91af0b4c 100644
--- a/sysdeps/linux/procstate.c
+++ b/sysdeps/linux/procstate.c
@@ -38,7 +38,7 @@ glibtop_get_proc_state__s (glibtop *server, glibtop_proc_state *buf, pid_t pid)
 	int nread;
 	FILE *f;
 	
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_state));
 
diff --git a/sysdeps/linux/proctime.c b/sysdeps/linux/proctime.c
index 01c8bf43..9d63a8a2 100644
--- a/sysdeps/linux/proctime.c
+++ b/sysdeps/linux/proctime.c
@@ -37,7 +37,7 @@ glibtop_get_proc_time__s (glibtop *server, glibtop_proc_time *buf, pid_t pid)
 	int nread;
 	FILE *f;
 	
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_time));
 
diff --git a/sysdeps/linux/procuid.c b/sysdeps/linux/procuid.c
index f3d5b8f5..3820f7fd 100644
--- a/sysdeps/linux/procuid.c
+++ b/sysdeps/linux/procuid.c
@@ -41,7 +41,7 @@ glibtop_get_proc_uid__s (glibtop *server, glibtop_proc_uid *buf, pid_t pid)
 	int nread;
 	FILE *f;
 	
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_uid));
 
diff --git a/sysdeps/linux/sem_limits.c b/sysdeps/linux/sem_limits.c
index fda5c0e5..6b64c153 100644
--- a/sysdeps/linux/sem_limits.c
+++ b/sysdeps/linux/sem_limits.c
@@ -39,7 +39,7 @@ glibtop_get_sem_limits__s (glibtop *server, glibtop_sem_limits *buf)
 	struct seminfo	seminfo;
 	union semun	arg;  
   
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_sem_limits));
   
diff --git a/sysdeps/linux/shm_limits.c b/sysdeps/linux/shm_limits.c
index d3c3193a..78f823c7 100644
--- a/sysdeps/linux/shm_limits.c
+++ b/sysdeps/linux/shm_limits.c
@@ -36,7 +36,7 @@ glibtop_get_shm_limits__s (glibtop *server, glibtop_shm_limits *buf)
 {
 	struct shminfo	shminfo;
   
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_shm_limits));
   
diff --git a/sysdeps/linux/swap.c b/sysdeps/linux/swap.c
index 8fb5e41e..1439e5d1 100644
--- a/sysdeps/linux/swap.c
+++ b/sysdeps/linux/swap.c
@@ -33,7 +33,7 @@ glibtop_get_swap__s (glibtop *server, glibtop_swap *buf)
 {
 	FILE *f;
 
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_swap));
 
diff --git a/sysdeps/linux/uptime.c b/sysdeps/linux/uptime.c
index 69f5b6b5..8c3e3da0 100644
--- a/sysdeps/linux/uptime.c
+++ b/sysdeps/linux/uptime.c
@@ -32,7 +32,7 @@ glibtop_get_uptime__s (glibtop *server, glibtop_uptime *buf)
 {
 	FILE *f;
 
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_uptime));