Don't call glibtop_init_s(), this is deprecated.

2000-11-22  Martin Baulig  <martin@home-of-linux.org>

	* *.c: Don't call glibtop_init_s(), this is deprecated.

	* netinfo.c: New file.

23 files changed, 63 insertions, 45 deletions

diff --git a/sysdeps/stub/ChangeLog b/sysdeps/stub/ChangeLog
index 16470426..064ebd08 100644
--- a/sysdeps/stub/ChangeLog
+++ b/sysdeps/stub/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-22  Martin Baulig  <martin@home-of-linux.org>
+
+	* Makefile.am: Don't install libgtop_sysdeps.la.
+
+	* *.c: Don't call glibtop_init_s(), this is deprecated.
+
+	* netinfo.c: New file.
+
 1998-10-26  Martin Baulig  <martin@home-of-linux.org>
 
 	* netload.c: New file.
diff --git a/sysdeps/stub/Makefile.am b/sysdeps/stub/Makefile.am
index 12bcaf9f..1cf5f715 100644
--- a/sysdeps/stub/Makefile.am
+++ b/sysdeps/stub/Makefile.am
@@ -2,16 +2,14 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@ -D_IN_LIBGTOP_SERVER
 
-lib_LTLIBRARIES			= libgtop_sysdeps.la
+noinst_LTLIBRARIES		= libgtop_sysdeps.la
 
 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 procargs.c procmap.c netload.c \
-				  interfaces.c ppp.c
-
-libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
+				  procsegment.c proccwd.c procargs.c procmap.c \
+				  netload.c netinfo.c interfaces.c ppp.c
 
 noinst_HEADERS			= glibtop_server_private.h
 
diff --git a/sysdeps/stub/cpu.c b/sysdeps/stub/cpu.c
index 266afe49..faa64702 100644
--- a/sysdeps/stub/cpu.c
+++ b/sysdeps/stub/cpu.c
@@ -43,8 +43,6 @@ glibtop_init_cpu_s (glibtop_server *server)
 int
 glibtop_get_cpu_s (glibtop_server *server, glibtop_cpu *buf)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_CPU, 0);
-	
     memset (buf, 0, sizeof (glibtop_cpu));
 
     return 0;
diff --git a/sysdeps/stub/interfaces.c b/sysdeps/stub/interfaces.c
index c3dbccf9..0ddb9f24 100644
--- a/sysdeps/stub/interfaces.c
+++ b/sysdeps/stub/interfaces.c
@@ -49,8 +49,6 @@ glibtop_get_interface_names_s (glibtop_server *server, glibtop_array *array,
 			       u_int64_t interface, u_int64_t number,
 			       u_int64_t instance, u_int64_t strategy)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_INTERFACE_NAMES, 0);
-
     memset (array, 0, sizeof (glibtop_array));
 
     return NULL;
diff --git a/sysdeps/stub/loadavg.c b/sysdeps/stub/loadavg.c
index 27fc4bf8..71e83b17 100644
--- a/sysdeps/stub/loadavg.c
+++ b/sysdeps/stub/loadavg.c
@@ -43,8 +43,6 @@ glibtop_init_loadavg_s (glibtop_server *server)
 int
 glibtop_get_loadavg_s (glibtop_server *server, glibtop_loadavg *buf)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_LOADAVG, 0);
-	
     memset (buf, 0, sizeof (glibtop_loadavg));
 
     return 0;
diff --git a/sysdeps/stub/mem.c b/sysdeps/stub/mem.c
index 0a659dcd..6abd288e 100644
--- a/sysdeps/stub/mem.c
+++ b/sysdeps/stub/mem.c
@@ -43,8 +43,6 @@ glibtop_init_mem_s (glibtop_server *server)
 int
 glibtop_get_mem_s (glibtop_server *server, glibtop_mem *buf)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_MEM, 0);
-	
     memset (buf, 0, sizeof (glibtop_mem));
 
     return 0;
diff --git a/sysdeps/stub/msg_limits.c b/sysdeps/stub/msg_limits.c
index d59f0036..b6200f1b 100644
--- a/sysdeps/stub/msg_limits.c
+++ b/sysdeps/stub/msg_limits.c
@@ -43,8 +43,6 @@ glibtop_init_msg_limits_s (glibtop_server *server)
 int
 glibtop_get_msg_limits_s (glibtop_server *server, glibtop_msg_limits *buf)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_MSG_LIMITS, 0);
-	
     memset (buf, 0, sizeof (glibtop_msg_limits));
 
     return 0;
diff --git a/sysdeps/stub/netinfo.c b/sysdeps/stub/netinfo.c
new file mode 100644
index 00000000..fd7079b2
--- /dev/null
+++ b/sysdeps/stub/netinfo.c
@@ -0,0 +1,52 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+/* $Id$ */
+
+/* Copyright (C) 1998-99 Martin Baulig
+   This file is part of LibGTop 1.0.
+
+   Contributed by Martin Baulig <martin@home-of-linux.org>, October 1998.
+
+   LibGTop is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License,
+   or (at your option) any later version.
+
+   LibGTop 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 General Public License
+   for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with LibGTop; see the file COPYING. 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/netinfo.h>
+
+static const unsigned long _glibtop_sysdeps_netinfo = 0;
+
+/* Init function. */
+
+int
+glibtop_init_netinfo_s (glibtop_server *server)
+{
+    server->info->sysdeps.netinfo = _glibtop_sysdeps_netinfo;
+
+    return 0;
+}
+
+/* Provides network statistics. */
+
+glibtop_ifaddr *
+glibtop_get_netinfo_s (glibtop_server *server, glibtop_array *array,
+		       glibtop_netinfo *buf, const char *interface,
+		       u_int64_t transport)
+{
+    memset (buf, 0, sizeof (glibtop_netinfo));
+
+    return NULL;
+}
diff --git a/sysdeps/stub/netload.c b/sysdeps/stub/netload.c
index 239194fe..317a27d5 100644
--- a/sysdeps/stub/netload.c
+++ b/sysdeps/stub/netload.c
@@ -46,8 +46,6 @@ glibtop_get_netload_s (glibtop_server *server, glibtop_netload *buf,
 		       const char *interface, unsigned transport,
 		       unsigned protocol)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_NETLOAD, 0);
-	
     memset (buf, 0, sizeof (glibtop_netload));
 
     return 0;
diff --git a/sysdeps/stub/ppp.c b/sysdeps/stub/ppp.c
index 6d165881..baa17294 100644
--- a/sysdeps/stub/ppp.c
+++ b/sysdeps/stub/ppp.c
@@ -45,8 +45,6 @@ int
 glibtop_get_ppp_s (glibtop_server *server, glibtop_ppp *buf,
 		   unsigned short device, unsigned short isdn)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_PPP, 0);
-	
     memset (buf, 0, sizeof (glibtop_ppp));
 
     return 0;
diff --git a/sysdeps/stub/procargs.c b/sysdeps/stub/procargs.c
index 63a57a4d..3ac7a0f9 100644
--- a/sysdeps/stub/procargs.c
+++ b/sysdeps/stub/procargs.c
@@ -45,8 +45,6 @@ glibtop_init_proc_args_s (glibtop_server *server)
 char **
 glibtop_get_proc_args_s (glibtop_server *server, glibtop_array *array, pid_t pid)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_PROC_ARGS, 0);
-	
     memset (array, 0, sizeof (glibtop_array));
 
     return NULL;
diff --git a/sysdeps/stub/proccwd.c b/sysdeps/stub/proccwd.c
index 03d99ee4..56e1d83d 100644
--- a/sysdeps/stub/proccwd.c
+++ b/sysdeps/stub/proccwd.c
@@ -45,8 +45,6 @@ glibtop_init_proc_cwd_s (glibtop_server *server)
 char *
 glibtop_get_proc_cwd_s (glibtop_server *server, glibtop_proc_cwd *buf, pid_t pid)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_PROC_CWD, 0);
-	
     memset (buf, 0, sizeof (glibtop_proc_cwd));
 
     return NULL;
diff --git a/sysdeps/stub/prockernel.c b/sysdeps/stub/prockernel.c
index 4e132d5d..092b8ca0 100644
--- a/sysdeps/stub/prockernel.c
+++ b/sysdeps/stub/prockernel.c
@@ -44,8 +44,6 @@ int
 glibtop_get_proc_kernel_s (glibtop_server *server, glibtop_proc_kernel *buf,
 			   pid_t pid)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_PROC_KERNEL, 0);
-	
     memset (buf, 0, sizeof (glibtop_proc_kernel));
 
     return 0;
diff --git a/sysdeps/stub/proclist.c b/sysdeps/stub/proclist.c
index a7e8523d..7a51ced4 100644
--- a/sysdeps/stub/proclist.c
+++ b/sysdeps/stub/proclist.c
@@ -51,8 +51,6 @@ unsigned *
 glibtop_get_proclist_s (glibtop_server *server, glibtop_proclist *buf,
 			int64_t which, int64_t arg)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_PROCLIST, 0);
-	
     memset (buf, 0, sizeof (glibtop_proclist));
 
     return NULL;
diff --git a/sysdeps/stub/procmap.c b/sysdeps/stub/procmap.c
index 18484cc9..da44e047 100644
--- a/sysdeps/stub/procmap.c
+++ b/sysdeps/stub/procmap.c
@@ -47,8 +47,6 @@ glibtop_map_entry *
 glibtop_get_proc_map_s (glibtop_server *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;
diff --git a/sysdeps/stub/procmem.c b/sysdeps/stub/procmem.c
index fe989df6..b448bf2d 100644
--- a/sysdeps/stub/procmem.c
+++ b/sysdeps/stub/procmem.c
@@ -44,8 +44,6 @@ int
 glibtop_get_proc_mem_s (glibtop_server *server, glibtop_proc_mem *buf,
 			pid_t pid)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_PROC_MEM, 0);
-	
     memset (buf, 0, sizeof (glibtop_proc_mem));
 
     return 0;
diff --git a/sysdeps/stub/procsegment.c b/sysdeps/stub/procsegment.c
index 4afca8ad..916b5a69 100644
--- a/sysdeps/stub/procsegment.c
+++ b/sysdeps/stub/procsegment.c
@@ -44,8 +44,6 @@ int
 glibtop_get_proc_segment_s (glibtop_server *server, glibtop_proc_segment *buf,
 			    pid_t pid)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_PROC_SEGMENT, 0);
-	
     memset (buf, 0, sizeof (glibtop_proc_segment));
 
     return 0;
diff --git a/sysdeps/stub/procsignal.c b/sysdeps/stub/procsignal.c
index 0fce3989..4bba74f9 100644
--- a/sysdeps/stub/procsignal.c
+++ b/sysdeps/stub/procsignal.c
@@ -44,8 +44,6 @@ int
 glibtop_get_proc_signal_s (glibtop_server *server, glibtop_proc_signal *buf,
 			   pid_t pid)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_PROC_SIGNAL, 0);
-	
     memset (buf, 0, sizeof (glibtop_proc_signal));
 
     return 0;
diff --git a/sysdeps/stub/procstate.c b/sysdeps/stub/procstate.c
index 6a9cbab9..22ba36b5 100644
--- a/sysdeps/stub/procstate.c
+++ b/sysdeps/stub/procstate.c
@@ -44,8 +44,6 @@ int
 glibtop_get_proc_state_s (glibtop_server *server, glibtop_proc_state *buf,
 			  pid_t pid)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_PROC_STATE, 0);
-	
     memset (buf, 0, sizeof (glibtop_proc_state));
 
     return 0;
diff --git a/sysdeps/stub/proctime.c b/sysdeps/stub/proctime.c
index b8704918..0b3f99b9 100644
--- a/sysdeps/stub/proctime.c
+++ b/sysdeps/stub/proctime.c
@@ -44,8 +44,6 @@ int
 glibtop_get_proc_time_s (glibtop_server *server, glibtop_proc_time *buf,
 			 pid_t pid)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_PROC_TIME, 0);
-	
     memset (buf, 0, sizeof (glibtop_proc_time));
 
     return 0;
diff --git a/sysdeps/stub/procuid.c b/sysdeps/stub/procuid.c
index 53277fbf..b9560731 100644
--- a/sysdeps/stub/procuid.c
+++ b/sysdeps/stub/procuid.c
@@ -44,8 +44,6 @@ int
 glibtop_get_proc_uid_s (glibtop_server *server, glibtop_proc_uid *buf,
 			pid_t pid)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_PROC_UID, 0);
-	
     memset (buf, 0, sizeof (glibtop_proc_uid));
 
     return 0;
diff --git a/sysdeps/stub/swap.c b/sysdeps/stub/swap.c
index 5ceac8ac..f88353f4 100644
--- a/sysdeps/stub/swap.c
+++ b/sysdeps/stub/swap.c
@@ -43,8 +43,6 @@ glibtop_init_swap_s (glibtop_server *server)
 int
 glibtop_get_swap_s (glibtop_server *server, glibtop_swap *buf)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_SWAP, 0);
-	
     memset (buf, 0, sizeof (glibtop_swap));
 
     return 0;
diff --git a/sysdeps/stub/uptime.c b/sysdeps/stub/uptime.c
index a0e1c489..b26aab82 100644
--- a/sysdeps/stub/uptime.c
+++ b/sysdeps/stub/uptime.c
@@ -43,8 +43,6 @@ glibtop_init_uptime_s (glibtop_server *server)
 int
 glibtop_get_uptime_s (glibtop_server *server, glibtop_uptime *buf)
 {
-    glibtop_init_s (server, GLIBTOP_SYSDEPS_UPTIME, 0);
-	
     memset (buf, 0, sizeof (glibtop_uptime));
 
     return 0;