removed #if's - we now decide at runtime whether to use the server or to

* lib/*.c: removed #if's - we now decide at runtime
whether to use the server or to call the appropriate
function for the sysdeps directory.

lib/command.c

@@ -33,7 +33,7 @@ glibtop_call__l (glibtop *server, unsigned command, size_t send_size, void *send
 	glibtop_command *cmnd;
 	void *ptr;
 
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	cmnd = glibtop_calloc__r (server, 1, sizeof (glibtop_command));
 	

lib/cpu.c

@@ -23,16 +23,17 @@
 #include <glibtop/cpu.h>
 #include <glibtop/command.h>
 
-#if GLIBTOP_SUID_CPU
-
 /* Provides information about cpu usage. */
 
 void
 glibtop_get_cpu__l (glibtop *server, glibtop_cpu *buf)
 {
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, GLIBTOP_SYSDEPS_CPU, 0);
+
+	if (server->features & GLIBTOP_SYSDEPS_CPU) {
 		glibtop_call__l (server, GLIBTOP_CMND_CPU, 0, NULL,
 				 sizeof (glibtop_cpu), buf);
+	} else {
+		glibtop_get_cpu__r (server, buf);
+	}
 }
-
-#endif

lib/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;

lib/loadavg.c

@@ -23,16 +23,17 @@
 #include <glibtop/loadavg.h>
 #include <glibtop/command.h>
 
-#if GLIBTOP_SUID_LOADAVG
-
 /* Provides load averange. */
 
 void
 glibtop_get_loadavg__l (glibtop *server, glibtop_loadavg *buf)
 {
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, GLIBTOP_SYSDEPS_LOADAVG, 0);
+
+	if (server->features & GLIBTOP_SYSDEPS_LOADAVG) {
 		glibtop_call__l (server, GLIBTOP_CMND_LOADAVG, 0, NULL,
 				 sizeof (glibtop_loadavg), buf);
+	} else {
+		glibtop_get_loadavg__r (server, buf);
+	}
 }
-
-#endif

lib/mem.c

@@ -22,16 +22,17 @@
 #include <glibtop/mem.h>
 #include <glibtop/command.h>
 
-#if GLIBTOP_SUID_MEM
-
 /* Provides information about memory usage. */
 
 void
 glibtop_get_mem__l (glibtop *server, glibtop_mem *buf)
 {
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, GLIBTOP_SYSDEPS_MEM, 0);
+
+	if (server->features & GLIBTOP_SYSDEPS_MEM) {
 		glibtop_call__l (server, GLIBTOP_CMND_MEM, 0, NULL,
 				 sizeof (glibtop_mem), buf);
+	} else {
+		glibtop_get_mem__r (server, buf);
+	}
 }
-
-#endif

lib/msg_limits.c

@@ -22,16 +22,17 @@
 #include <glibtop/msg_limits.h>
 #include <glibtop/command.h>
 
-#if GLIBTOP_SUID_MSG_LIMITS
-
 /* Provides information about sysv ipc limits. */
 
 void
 glibtop_get_msg_limits__l (glibtop *server, glibtop_msg_limits *buf)
 {
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, GLIBTOP_SYSDEPS_MSG_LIMITS, 0);
+
+	if (server->features & GLIBTOP_SYSDEPS_MSG_LIMITS) {
 		glibtop_call__l (server, GLIBTOP_CMND_MSG_LIMITS, 0, NULL,
 				 sizeof (glibtop_msg_limits), buf);
+	} else {
+		glibtop_get_msg_limits__r (server, buf);
+	}
 }
-
-#endif

lib/open.c

@@ -19,19 +19,80 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include <glibtop.h>
 #include <glibtop/open.h>
+#include <glibtop/xmalloc.h>
 
 /* 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)
 {
 	char	version [BUFSIZ], buffer [BUFSIZ];
+	char	*server_command, *server_rsh, *temp;
+	char	*server_host, *server_user;
 
 	memset (server, 0, sizeof (glibtop));
 
 	server->name = program_name;
 
+	/* Try to get data from environment. */
+
+	temp = getenv ("LIBGTOP_SERVER") ?
+	  getenv ("LIBGTOP_SERVER") : GTOP_SERVER;
+
+	server_command = glibtop_malloc__r (server, strlen (temp) + 1);
+	
+	strcpy (server_command, temp);
+
+	temp = getenv ("LIBGTOP_RSH") ?
+	  getenv ("LIBGTOP_RSH") : "rsh";
+
+	server_rsh = glibtop_malloc__r (server, strlen (temp) + 1);
+
+	strcpy (server_rsh, temp);
+
+	/* Extract host and user information. */
+
+	temp = strstr (server_command, ":");
+
+	if (temp) {
+	  *temp = 0;
+	  server_host = server_command;
+	  server_command = temp+1;
+
+	  temp = strstr (server_host, "@");
+	  
+	  if (temp) {
+	    *temp = 0;
+	    server_user = server_host;
+	    server_host = temp+1;
+	  } else {
+	    server_user = NULL;
+	  }
+
+	} else {
+	  server_host = NULL;
+	  server_user = NULL;
+	}
+
+	/* Store everything in `server'. */
+
+	server->server_command = server_command;
+	server->server_host = server_host;
+	server->server_user = server_user;
+	server->server_rsh = server_rsh;
+
+	/* Get server features. */
+
+	if (server->server_host)
+		glibtop_error__r (server, _("Remote server not yet supported by library\n"));
+
+	server->features = glibtop_server_features;
+
+	/* Fork and exec server. */
+
 	if (pipe (server->input) || pipe (server->output))
 		glibtop_error__r (server, _("cannot make a pipe: %s\n"), strerror (errno));
 
@@ -44,7 +105,20 @@ glibtop_open (glibtop *server, const char *program_name)
 		close (server->input [0]); close (server->output [1]);
 		dup2 (server->input [1], 1); /* dup2 (server->input [1], 2); */
 		dup2 (server->output [0], 0);
-		execl (GTOP_SERVER, NULL);
+
+		if (server_host) {
+			if (server_user) {
+				execl (server->server_rsh, "gtop_server", "-l",
+				       server->server_user, server->server_host,
+				       server->server_command, NULL);
+			} else {
+				execl (server->server_rsh, "gtop_server",
+				       server->server_host, server_command, NULL);
+			}
+		} else {
+			execl (server->server_command, "gtop_server", NULL);
+		}
+
 		_exit (2);
 	}
 

lib/prockernel.c

@@ -23,17 +23,18 @@
 #include <glibtop/prockernel.h>
 #include <glibtop/command.h>
 
-#if GLIBTOP_SUID_PROC_KERNEL
-
 /* Provides detailed information about a process. */
 
 void
 glibtop_get_proc_kernel__l (glibtop *server, glibtop_proc_kernel *buf,
 			    pid_t pid)
 {
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, GLIBTOP_SYSDEPS_PROC_KERNEL, 0);
+
+	if (server->features & GLIBTOP_SYSDEPS_PROC_KERNEL) {
 		glibtop_call__l (server, GLIBTOP_CMND_PROC_KERNEL, sizeof (pid_t),
 				 &pid, sizeof (glibtop_proc_kernel), buf);
+	} else {
+		glibtop_get_proc_kernel__r (server, buf, pid);
+	}
 }
-
-#endif

lib/proclist.c

@@ -22,16 +22,17 @@
 #include <glibtop/proclist.h>
 #include <glibtop/command.h>
 
-#if GLIBTOP_SUID_PROCLIST
-
 /* Fetch list of currently running processes. */
 
 unsigned *
 glibtop_get_proclist__l (glibtop *server, glibtop_proclist *buf)
 {
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, GLIBTOP_SYSDEPS_PROCLIST, 0);
+
+	if (server->features & GLIBTOP_SYSDEPS_PROCLIST) {
 		return glibtop_call__l (server, GLIBTOP_CMND_PROCLIST, 0, NULL,
 					sizeof (glibtop_proclist), buf);
+	} else {
+		return glibtop_get_proclist__r (server, buf);
+	}
 }
-
-#endif

lib/procmem.c

@@ -23,17 +23,18 @@
 #include <glibtop/procmem.h>
 #include <glibtop/command.h>
 
-#if GLIBTOP_SUID_PROC_MEM
-
 /* Provides detailed information about a process. */
 
 void
 glibtop_get_proc_mem__l (glibtop *server, glibtop_proc_mem *buf,
 			 pid_t pid)
 {
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, GLIBTOP_SYSDEPS_PROC_MEM, 0);
+
+	if (server->features & GLIBTOP_SYSDEPS_PROC_MEM) {
 		glibtop_call__l (server, GLIBTOP_CMND_PROC_MEM, sizeof (pid_t),
 				 &pid, sizeof (glibtop_proc_mem), buf);
+	} else {
+		glibtop_get_proc_mem__r (server, buf, pid);
+	}
 }
-
-#endif

lib/procsegment.c

@@ -23,17 +23,18 @@
 #include <glibtop/procsegment.h>
 #include <glibtop/command.h>
 
-#if GLIBTOP_SUID_PROC_SEGMENT
-
 /* Provides detailed information about a process. */
 
 void
 glibtop_get_proc_segment__l (glibtop *server, glibtop_proc_segment *buf,
 			     pid_t pid)
 {
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, GLIBTOP_SYSDEPS_PROC_SEGMENT, 0);
+
+	if (server->features & GLIBTOP_SYSDEPS_PROC_SEGMENT) {
 		glibtop_call__l (server, GLIBTOP_CMND_PROC_SEGMENT, sizeof (pid_t),
 				 &pid, sizeof (glibtop_proc_segment), buf);
+	} else {
+		glibtop_get_proc_segment__r (server, buf, pid);
+	}
 }
-
-#endif

lib/procsignal.c

@@ -23,17 +23,18 @@
 #include <glibtop/procsignal.h>
 #include <glibtop/command.h>
 
-#if GLIBTOP_SUID_PROC_SIGNAL
-
 /* Provides detailed information about a process. */
 
 void
 glibtop_get_proc_signal__l (glibtop *server, glibtop_proc_signal *buf,
 			    pid_t pid)
 {
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, GLIBTOP_SYSDEPS_PROC_SIGNAL, 0);
+
+	if (server->features & GLIBTOP_SYSDEPS_PROC_SIGNAL) {
 		glibtop_call__l (server, GLIBTOP_CMND_PROC_SIGNAL, sizeof (pid_t),
 				 &pid, sizeof (glibtop_proc_signal), buf);
+	} else {
+		glibtop_get_proc_signal__r (server, buf, pid);
+	}
 }
-
-#endif

lib/procstate.c

@@ -23,17 +23,18 @@
 #include <glibtop/procstate.h>
 #include <glibtop/command.h>
 
-#if GLIBTOP_SUID_PROC_STATE
-
 /* Provides detailed information about a process. */
 
 void
 glibtop_get_proc_state__l (glibtop *server, glibtop_proc_state *buf,
 			   pid_t pid)
 {
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, GLIBTOP_SYSDEPS_PROC_STATE, 0);
+
+	if (server->features & GLIBTOP_SYSDEPS_PROC_STATE) {
 		glibtop_call__l (server, GLIBTOP_CMND_PROC_STATE, sizeof (pid_t),
 				 &pid, sizeof (glibtop_proc_state), buf);
+	} else {
+		glibtop_get_proc_state__r (server, buf, pid);
+	}
 }
-
-#endif

lib/proctime.c

@@ -23,17 +23,18 @@
 #include <glibtop/proctime.h>
 #include <glibtop/command.h>
 
-#if GLIBTOP_SUID_PROC_TIME
-
 /* Provides detailed information about a process. */
 
 void
 glibtop_get_proc_time__l (glibtop *server, glibtop_proc_time *buf,
 			  pid_t pid)
 {
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, GLIBTOP_SYSDEPS_PROC_TIME, 0);
+
+	if (server->features & GLIBTOP_SYSDEPS_PROC_TIME) {
 		glibtop_call__l (server, GLIBTOP_CMND_PROC_TIME, sizeof (pid_t),
 				 &pid, sizeof (glibtop_proc_time), buf);
+	} else {
+		glibtop_get_proc_time__r (server, buf, pid);
+	}
 }
-
-#endif

lib/procuid.c

@@ -23,17 +23,18 @@
 #include <glibtop/procuid.h>
 #include <glibtop/command.h>
 
-#if GLIBTOP_SUID_PROC_UID
-
 /* Provides detailed information about a process. */
 
 void
 glibtop_get_proc_uid__l (glibtop *server, glibtop_proc_uid *buf,
 			   pid_t pid)
 {
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, GLIBTOP_SYSDEPS_PROC_UID, 0);
+
+	if (server->features & GLIBTOP_SYSDEPS_PROC_UID) {
 		glibtop_call__l (server, GLIBTOP_CMND_PROC_UID, sizeof (pid_t),
 				 &pid, sizeof (glibtop_proc_uid), buf);
+	} else {
+		glibtop_get_proc_uid__r (server, buf, pid);
+	}
 }
-
-#endif

lib/read.c

@@ -28,7 +28,7 @@ glibtop_read__l (glibtop *server, size_t size, void *buf)
 {
 	size_t	ssize;
 
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 	
 	if (read (server->input [0], &ssize, sizeof (size_t)) < 0)
 		glibtop_error__r (server, _("read size: %s"), strerror (errno));

lib/read_data.c

@@ -30,7 +30,7 @@ glibtop_read_data__l (glibtop *server)
 	size_t	size;
 	void *ptr;
 
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	if (read (server->input [0], &size, sizeof (size_t)) < 0)
 		glibtop_error__r (server, _("read data size: %s"),
@@ -38,8 +38,6 @@ glibtop_read_data__l (glibtop *server)
 
 	if (!size) return NULL;	
 
-	fprintf (stderr, "Server has %d bytes of data.\n", size);
-	
 	ptr = glibtop_malloc__r (server, size);
 	
 	if (read (server->input [0], ptr, size) < 0)

lib/sem_limits.c

@@ -22,16 +22,17 @@
 #include <glibtop/sem_limits.h>
 #include <glibtop/command.h>
 
-#if GLIBTOP_SUID_SEM_LIMITS
-
 /* Provides information about sysv ipc limits. */
 
 void
 glibtop_get_sem_limits__l (glibtop *server, glibtop_sem_limits *buf)
 {
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, GLIBTOP_SYSDEPS_SEM_LIMITS, 0);
+
+	if (server->features & GLIBTOP_SYSDEPS_SEM_LIMITS) {
 		glibtop_call__l (server, GLIBTOP_CMND_SEM_LIMITS, 0, NULL,
 				 sizeof (glibtop_sem_limits), buf);
+	} else {
+		glibtop_get_sem_limits__r (server, buf);
+	}
 }
-
-#endif

lib/shm_limits.c

@@ -22,16 +22,17 @@
 #include <glibtop/shm_limits.h>
 #include <glibtop/command.h>
 
-#if GLIBTOP_SUID_SHM_LIMITS
-
 /* Provides information about sysv ipc limits. */
 
 void
 glibtop_get_shm_limits__l (glibtop *server, glibtop_shm_limits *buf)
 {
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, GLIBTOP_SYSDEPS_SHM_LIMITS, 0);
+
+	if (server->features & GLIBTOP_SYSDEPS_SHM_LIMITS) {
 		glibtop_call__l (server, GLIBTOP_CMND_SHM_LIMITS, 0, NULL,
 				 sizeof (glibtop_shm_limits), buf);
+	} else {
+		glibtop_get_shm_limits__r (server, buf);
+	}
 }
-
-#endif

lib/swap.c

@@ -22,16 +22,17 @@
 #include <glibtop/swap.h>
 #include <glibtop/command.h>
 
-#if GLIBTOP_SUID_SWAP
-
 /* Provides information about swap usage. */
 
 void
 glibtop_get_swap__l (glibtop *server, glibtop_swap *buf)
 {
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, GLIBTOP_SYSDEPS_SWAP, 0);
+
+	if (server->features & GLIBTOP_SYSDEPS_SWAP) {
 		glibtop_call__l (server, GLIBTOP_CMND_SWAP, 0, NULL,
 				 sizeof (glibtop_swap), buf);
+	} else {
+		glibtop_get_swap__r (server, buf);
+	}
 }
-
-#endif

lib/uptime.c

@@ -23,16 +23,17 @@
 #include <glibtop/uptime.h>
 #include <glibtop/command.h>
 
-#if GLIBTOP_SUID_UPTIME
-
 /* Provides uptime and idle time. */
 
 void
 glibtop_get_uptime__l (glibtop *server, glibtop_uptime *buf)
 {
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, GLIBTOP_SYSDEPS_UPTIME, 0);
+
+	if (server->features & GLIBTOP_SYSDEPS_UPTIME) {
 		glibtop_call__l (server, GLIBTOP_CMND_UPTIME, 0, NULL,
 				 sizeof (glibtop_uptime), buf);
+	} else {
+		glibtop_get_uptime__r (server, buf);
+	}
 }
-
-#endif

lib/write.c

@@ -26,7 +26,7 @@
 void
 glibtop_write__l (glibtop *server, size_t size, void *buf)
 {
-	glibtop_init__r (&server);
+	glibtop_init__r (&server, 0, 0);
 
 	if (write (server->output [1], &size, sizeof (size_t)) < 0)
 		glibtop_error__r (server, _("write size: %s"), strerror (errno));