Added Added Removed

	* Makefile.am:
	* cpu.c:
	* fsusage.c:
	* glibtop_private.c: (get_scaled), (try_file_to_buffer),
	(file_to_buffer): Added
	* glibtop_private.h: Added
	* glibtop_server.c: Removed
	* glibtop_server.h:
	* loadavg.c:
	* mem.c:
	* netload.c:
	* open.c:
	* prockernel.c:
	* procmem.c:
	* procsegment.c:
	* procsignal.c:
	* procstate.c:
	* proctime.c:
	* procuid.c:
	* swap.c:
	* sysinfo.c:
	* uptime.c: Moved linux impl utils function from glibtop_server.* to
	glibtob_private.* because glibtop_server.h is a public header.

21 files changed, 186 insertions, 106 deletions

diff --git a/sysdeps/linux/ChangeLog b/sysdeps/linux/ChangeLog
index de035b30..8aa5f767 100644
--- a/sysdeps/linux/ChangeLog
+++ b/sysdeps/linux/ChangeLog
@@ -1,3 +1,29 @@
+2004-11-28  Benoît Dejean  <tazforever@dlfp.org>
+
+	* Makefile.am:
+	* cpu.c:
+	* fsusage.c:
+	* glibtop_private.c: (get_scaled), (try_file_to_buffer),
+	(file_to_buffer): Added
+	* glibtop_private.h: Added
+	* glibtop_server.c: Removed
+	* glibtop_server.h:
+	* loadavg.c:
+	* mem.c:
+	* netload.c:
+	* open.c:
+	* prockernel.c:
+	* procmem.c:
+	* procsegment.c:
+	* procsignal.c:
+	* procstate.c:
+	* proctime.c:
+	* procuid.c:
+	* swap.c:
+	* sysinfo.c:
+	* uptime.c: Moved linux impl utils function from glibtop_server.* to
+	glibtob_private.* because glibtop_server.h is a public header.
+
 2004-11-15  Benoît Dejean  <tazforever@dlfp.org>
 
 	* netload.c: (get_ipv6), (glibtop_get_netload_s): Added a check for NULL
diff --git a/sysdeps/linux/Makefile.am b/sysdeps/linux/Makefile.am
index 00124fa6..e5bf626a 100644
--- a/sysdeps/linux/Makefile.am
+++ b/sysdeps/linux/Makefile.am
@@ -1,4 +1,3 @@
-
 INCLUDES			= @INCLUDES@
 
 noinst_LTLIBRARIES		= libgtop_sysdeps-2.0.la
@@ -8,7 +7,7 @@ libgtop_sysdeps_2_0_la_SOURCES	= 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 procargs.c procmap.c siglist.c \
-				  sysinfo.c netload.c ppp.c glibtop_server.c \
+				  sysinfo.c netload.c ppp.c glibtop_private.c \
 				  fsusage.c netlist.c
 
 libgtop_sysdeps_2_0_la_LIBADD	=  @GLIB_LIBS@
@@ -17,3 +16,5 @@ libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h
 libgtopincludedir		= $(includedir)/libgtop-2.0
+
+noinst_HEADERS			= glibtop_private.h
diff --git a/sysdeps/linux/cpu.c b/sysdeps/linux/cpu.c
index e6fedfde..7b4669db 100644
--- a/sysdeps/linux/cpu.c
+++ b/sysdeps/linux/cpu.c
@@ -25,6 +25,8 @@
 #include <glibtop/error.h>
 #include <glibtop/cpu.h>
 
+#include "glibtop_private.h"
+
 static const unsigned long _glibtop_sysdeps_cpu =
 (1L << GLIBTOP_CPU_TOTAL) + (1L << GLIBTOP_CPU_USER) +
 (1L << GLIBTOP_CPU_NICE) + (1L << GLIBTOP_CPU_SYS) +
diff --git a/sysdeps/linux/fsusage.c b/sysdeps/linux/fsusage.c
index 47f81b5e..67572469 100644
--- a/sysdeps/linux/fsusage.c
+++ b/sysdeps/linux/fsusage.c
@@ -1,6 +1,8 @@
 #include <glibtop.h>
 #include <glibtop/fsusage.h>
 
+#include "glibtop_private.h"
+
 #include <glib.h>
 
 #include <mntent.h>
diff --git a/sysdeps/linux/glibtop_server.c b/sysdeps/linux/glibtop_private.c
index ed112f08..2faddb03 100644
--- a/sysdeps/linux/glibtop_server.c
+++ b/sysdeps/linux/glibtop_private.c
@@ -1,6 +1,8 @@
 #include <glibtop.h>
 #include <glibtop/error.h>
 
+#include "glibtop_private.h"
+
 #include <glib.h>
 
 #include <string.h>
diff --git a/sysdeps/linux/glibtop_private.h b/sysdeps/linux/glibtop_private.h
new file mode 100644
index 00000000..5b9e69b6
--- /dev/null
+++ b/sysdeps/linux/glibtop_private.h
@@ -0,0 +1,122 @@
+/* Copyright (C) 2004 Benoît Dejean
+   This file is part of LibGTop 2.0.
+
+   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.
+*/
+
+#ifndef __LINUX__GLIBTOP_PRIVATE_H__
+#define __LINUX__GLIBTOP_PRIVATE_H__
+
+#include <glibtop.h>
+
+#include <glib.h>
+
+#include <fcntl.h>
+#include <ctype.h>
+#include <string.h>
+
+G_BEGIN_DECLS
+
+#define LINUX_VERSION_CODE(x,y,z)   (0x10000*(x) + 0x100*(y) + z)
+
+
+static inline char*
+next_token(const char *p)
+{
+	while (isspace(*p)) p++;
+	return (char*) p;
+}
+
+static inline char *
+skip_token (const char *p)
+{
+	p = next_token(p);
+	while (*p && !isspace(*p)) p++;
+	p = next_token(p);
+	return (char *)p;
+}
+
+static inline char *
+skip_multiple_token (const char *p, size_t count)
+{
+	while(count--)
+		p = skip_token (p);
+
+	return (char *)p;
+}
+
+
+static inline char *
+skip_line (const char *p)
+{
+	while (*p && *p != '\n') p++;
+	return (char *) (*p ? p+1 : p);
+}
+
+
+unsigned long long
+get_scaled(const char *buffer, const char *key);
+
+
+/* aborts on error */
+void
+file_to_buffer(glibtop *server, char *buffer, const char *filename);
+
+/* return < 0 on error, otherwise 0 on success */
+int
+try_file_to_buffer(char *buffer, const char *format, ...);
+
+
+/* some inline functions that wrap proc path
+ * as fast as macros :)
+ */
+
+static inline int
+proc_file_to_buffer (char *buffer, const char *fmt, pid_t pid)
+{
+	return try_file_to_buffer(buffer, fmt, pid);
+}
+
+static inline int
+proc_stat_to_buffer (char *buffer, pid_t pid)
+{
+	return proc_file_to_buffer (buffer, "/proc/%d/stat", pid);
+}
+
+static inline int
+proc_status_to_buffer (char *buffer, pid_t pid)
+{
+	return proc_file_to_buffer (buffer, "/proc/%d/status", pid);
+}
+
+static inline int
+proc_statm_to_buffer (char *buffer, pid_t pid)
+{
+	return proc_file_to_buffer (buffer, "/proc/%d/statm", pid);
+}
+
+
+static inline char *
+proc_stat_after_cmd (char *p)
+{
+	p = strrchr (p, ')');
+	if (G_LIKELY(p))
+		*p++ = '\0';
+	return p;
+}
+G_END_DECLS
+
+#endif /* __LINUX__GLIBTOP_PRIVATE_H__ */
diff --git a/sysdeps/linux/glibtop_server.h b/sysdeps/linux/glibtop_server.h
index bff9f775..38ac1d1f 100644
--- a/sysdeps/linux/glibtop_server.h
+++ b/sysdeps/linux/glibtop_server.h
@@ -24,108 +24,6 @@
 #ifndef __LINUX__GLIBTOP_SERVER_H__
 #define __LINUX__GLIBTOP_SERVER_H__
 
-#include <glibtop.h>
-
-#include <glib.h>
-
-#include <fcntl.h>
-#include <ctype.h>
-#include <string.h>
-
-G_BEGIN_DECLS
-
-#ifdef _IN_LIBGTOP
-
-#define LINUX_VERSION_CODE(x,y,z)   (0x10000*(x) + 0x100*(y) + z)
-
-
-static inline char*
-next_token(const char *p)
-{
-	while (isspace(*p)) p++;
-	return (char*) p;
-}
-
-static inline char *
-skip_token (const char *p)
-{
-	p = next_token(p);
-	while (*p && !isspace(*p)) p++;
-	p = next_token(p);
-	return (char *)p;
-}
-
-static inline char *
-skip_multiple_token (const char *p, size_t count)
-{
-	while(count--)
-		p = skip_token (p);
-
-	return (char *)p;
-}
-
-
-static inline char *
-skip_line (const char *p)
-{
-	while (*p && *p != '\n') p++;
-	return (char *) (*p ? p+1 : p);
-}
-
-
-unsigned long long
-get_scaled(const char *buffer, const char *key);
-
-
-/* aborts on error */
-void
-file_to_buffer(glibtop *server, char *buffer, const char *filename);
-
-/* return < 0 on error, otherwise 0 on success */
-int
-try_file_to_buffer(char *buffer, const char *format, ...);
-
-
-/* some inline functions that wrap proc path
- * as fast as macros :)
- */
-
-static inline int
-proc_file_to_buffer (char *buffer, const char *fmt, pid_t pid)
-{
-	return try_file_to_buffer(buffer, fmt, pid);
-}
-
-static inline int
-proc_stat_to_buffer (char *buffer, pid_t pid)
-{
-	return proc_file_to_buffer (buffer, "/proc/%d/stat", pid);
-}
-
-static inline int
-proc_status_to_buffer (char *buffer, pid_t pid)
-{
-	return proc_file_to_buffer (buffer, "/proc/%d/status", pid);
-}
-
-static inline int
-proc_statm_to_buffer (char *buffer, pid_t pid)
-{
-	return proc_file_to_buffer (buffer, "/proc/%d/statm", pid);
-}
-
-
-static inline char *
-proc_stat_after_cmd (char *p)
-{
-	p = strrchr (p, ')');
-	if (G_LIKELY(p))
-		*p++ = '\0';
-	return p;
-}
-
-#endif
-
 #define GLIBTOP_SUID_CPU		0
 #define GLIBTOP_SUID_MEM		0
 #define GLIBTOP_SUID_SWAP		0
@@ -147,6 +45,4 @@ proc_stat_after_cmd (char *p)
 #define GLIBTOP_SUID_NETLOAD		0
 #define GLIBTOP_SUID_PPP		0
 
-G_END_DECLS
-
 #endif /* __LINUX__GLIBTOP_SERVER_H__ */
diff --git a/sysdeps/linux/loadavg.c b/sysdeps/linux/loadavg.c
index 7a96c95e..664c1f02 100644
--- a/sysdeps/linux/loadavg.c
+++ b/sysdeps/linux/loadavg.c
@@ -25,6 +25,8 @@
 #include <glibtop/error.h>
 #include <glibtop/loadavg.h>
 
+#include "glibtop_private.h"
+
 static const unsigned long _glibtop_sysdeps_loadavg =
 (1L << GLIBTOP_LOADAVG_LOADAVG);
 
diff --git a/sysdeps/linux/mem.c b/sysdeps/linux/mem.c
index 61b4c4a8..516fd69f 100644
--- a/sysdeps/linux/mem.c
+++ b/sysdeps/linux/mem.c
@@ -25,6 +25,8 @@
 #include <glibtop/error.h>
 #include <glibtop/mem.h>
 
+#include "glibtop_private.h"
+
 static const unsigned long _glibtop_sysdeps_mem =
 (1L << GLIBTOP_MEM_TOTAL) + (1L << GLIBTOP_MEM_USED) +
 (1L << GLIBTOP_MEM_FREE) + (1L << GLIBTOP_MEM_SHARED) +
diff --git a/sysdeps/linux/netload.c b/sysdeps/linux/netload.c
index f720c828..e15f572c 100644
--- a/sysdeps/linux/netload.c
+++ b/sysdeps/linux/netload.c
@@ -25,6 +25,8 @@
 #include <glibtop/error.h>
 #include <glibtop/netload.h>
 
+#include "glibtop_private.h"
+
 #include <errno.h>
 #include <string.h>
 
diff --git a/sysdeps/linux/open.c b/sysdeps/linux/open.c
index ee35ba2b..2db429df 100644
--- a/sysdeps/linux/open.c
+++ b/sysdeps/linux/open.c
@@ -25,6 +25,8 @@
 #include <glibtop/cpu.h>
 #include <glibtop/open.h>
 
+#include "glibtop_private.h"
+
 /* =====================================================
  * Linux kernel version information for procps utilities
  * Copyright (c) 1996 Charles Blake <cblake@bbn.com>
diff --git a/sysdeps/linux/prockernel.c b/sysdeps/linux/prockernel.c
index ba6fa2e8..84601af3 100644
--- a/sysdeps/linux/prockernel.c
+++ b/sysdeps/linux/prockernel.c
@@ -25,6 +25,8 @@
 #include <glibtop/error.h>
 #include <glibtop/prockernel.h>
 
+#include "glibtop_private.h"
+
 static const unsigned long _glibtop_sysdeps_proc_kernel =
 (1L << GLIBTOP_PROC_KERNEL_K_FLAGS) + (1L << GLIBTOP_PROC_KERNEL_MIN_FLT) +
 (1L << GLIBTOP_PROC_KERNEL_MAJ_FLT) + (1L << GLIBTOP_PROC_KERNEL_CMIN_FLT) +
diff --git a/sysdeps/linux/procmem.c b/sysdeps/linux/procmem.c
index fc9ec22a..61e03c92 100644
--- a/sysdeps/linux/procmem.c
+++ b/sysdeps/linux/procmem.c
@@ -25,6 +25,8 @@
 #include <glibtop/error.h>
 #include <glibtop/procmem.h>
 
+#include "glibtop_private.h"
+
 static const unsigned long _glibtop_sysdeps_proc_mem =
 (1L << GLIBTOP_PROC_MEM_VSIZE) + (1L << GLIBTOP_PROC_MEM_RSS) +
 (1L << GLIBTOP_PROC_MEM_RSS_RLIM);
diff --git a/sysdeps/linux/procsegment.c b/sysdeps/linux/procsegment.c
index 8276df1d..cc371d1b 100644
--- a/sysdeps/linux/procsegment.c
+++ b/sysdeps/linux/procsegment.c
@@ -25,6 +25,8 @@
 #include <glibtop/error.h>
 #include <glibtop/procsegment.h>
 
+#include "glibtop_private.h"
+
 static const unsigned long _glibtop_sysdeps_proc_segment =
 (1L << GLIBTOP_PROC_SEGMENT_START_CODE) +
 (1L << GLIBTOP_PROC_SEGMENT_END_CODE) +
diff --git a/sysdeps/linux/procsignal.c b/sysdeps/linux/procsignal.c
index d7547ea9..94af3082 100644
--- a/sysdeps/linux/procsignal.c
+++ b/sysdeps/linux/procsignal.c
@@ -25,6 +25,8 @@
 #include <glibtop/error.h>
 #include <glibtop/procsignal.h>
 
+#include "glibtop_private.h"
+
 static const unsigned long _glibtop_sysdeps_proc_signal =
 (1L << GLIBTOP_PROC_SIGNAL_SIGNAL) + (1L << GLIBTOP_PROC_SIGNAL_BLOCKED) +
 (1L << GLIBTOP_PROC_SIGNAL_SIGIGNORE) + (1L << GLIBTOP_PROC_SIGNAL_SIGCATCH);
diff --git a/sysdeps/linux/procstate.c b/sysdeps/linux/procstate.c
index bf4380f9..ba39655d 100644
--- a/sysdeps/linux/procstate.c
+++ b/sysdeps/linux/procstate.c
@@ -25,6 +25,8 @@
 #include <glibtop/error.h>
 #include <glibtop/procstate.h>
 
+#include "glibtop_private.h"
+
 #include <sys/stat.h>
 
 static const unsigned long _glibtop_sysdeps_proc_state =
diff --git a/sysdeps/linux/proctime.c b/sysdeps/linux/proctime.c
index 9e7b6910..78831d64 100644
--- a/sysdeps/linux/proctime.c
+++ b/sysdeps/linux/proctime.c
@@ -26,6 +26,8 @@
 #include <glibtop/proctime.h>
 #include <glibtop/uptime.h>
 
+#include "glibtop_private.h"
+
 static const unsigned long _glibtop_sysdeps_proc_time =
 (1L << GLIBTOP_PROC_TIME_UTIME) + (1L << GLIBTOP_PROC_TIME_CUTIME) +
 (1L << GLIBTOP_PROC_TIME_RTIME) +
diff --git a/sysdeps/linux/procuid.c b/sysdeps/linux/procuid.c
index 612d952d..bdbf3afb 100644
--- a/sysdeps/linux/procuid.c
+++ b/sysdeps/linux/procuid.c
@@ -25,6 +25,8 @@
 #include <glibtop/error.h>
 #include <glibtop/procuid.h>
 
+#include "glibtop_private.h"
+
 static const unsigned long _glibtop_sysdeps_proc_uid =
 (1L << GLIBTOP_PROC_UID_UID) + (1L << GLIBTOP_PROC_UID_EUID) +
 (1L << GLIBTOP_PROC_UID_GID) + (1L << GLIBTOP_PROC_UID_EGID);
diff --git a/sysdeps/linux/swap.c b/sysdeps/linux/swap.c
index 5299c65a..b736da77 100644
--- a/sysdeps/linux/swap.c
+++ b/sysdeps/linux/swap.c
@@ -25,6 +25,8 @@
 #include <glibtop/error.h>
 #include <glibtop/swap.h>
 
+#include "glibtop_private.h"
+
 #include <fcntl.h>
 
 static const unsigned long _glibtop_sysdeps_swap =
diff --git a/sysdeps/linux/sysinfo.c b/sysdeps/linux/sysinfo.c
index 29191ac2..20c62395 100644
--- a/sysdeps/linux/sysinfo.c
+++ b/sysdeps/linux/sysinfo.c
@@ -26,6 +26,8 @@
 #include <glibtop/cpu.h>
 #include <glibtop/sysinfo.h>
 
+#include "glibtop_private.h"
+
 #define FILENAME "/proc/cpuinfo"
 
 static const unsigned long _glibtop_sysdeps_sysinfo =
diff --git a/sysdeps/linux/uptime.c b/sysdeps/linux/uptime.c
index 8e73c478..bb0ebc29 100644
--- a/sysdeps/linux/uptime.c
+++ b/sysdeps/linux/uptime.c
@@ -24,6 +24,9 @@
 #include <config.h>
 #include <glibtop/error.h>
 #include <glibtop/uptime.h>
+
+#include "glibtop_private.h"
+
 #include <time.h>
 
 static const unsigned long _glibtop_sysdeps_uptime =