oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Added Removed

Browse Source 
* 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.
This commit is contained in:
Benoît Dejean
2004-11-28 01:32:55 +00:00
parent faa80b7b24
commit 2fa0dc1cd8
21 changed files with 186 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sysdeps/linux/ChangeLog
View File

@@ -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

5
sysdeps/linux/Makefile.am
View File

@@ -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

2
sysdeps/linux/cpu.c
View File

@@ -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) +

2
sysdeps/linux/fsusage.c
View File

@@ -1,6 +1,8 @@
#include <glibtop.h>
#include <glibtop/fsusage.h>
#include "glibtop_private.h"
#include <glib.h>
#include <mntent.h>

2
sysdeps/linux/glibtop_server.c → sysdeps/linux/glibtop_private.c
View File

@@ -1,6 +1,8 @@
#include <glibtop.h>
#include <glibtop/error.h>
#include "glibtop_private.h"
#include <glib.h>
#include <string.h>

122
sysdeps/linux/glibtop_private.h Normal file
View File

@@ -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__ */

104
sysdeps/linux/glibtop_server.h
View File

@@ -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__ */

2
sysdeps/linux/loadavg.c
View File

@@ -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);

2
sysdeps/linux/mem.c
View File

@@ -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) +

2
sysdeps/linux/netload.c
View File

@@ -25,6 +25,8 @@
#include <glibtop/error.h>
#include <glibtop/netload.h>
#include "glibtop_private.h"
#include <errno.h>
#include <string.h>

2
sysdeps/linux/open.c
View File

@@ -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>

2
sysdeps/linux/prockernel.c
View File

@@ -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) +

2
sysdeps/linux/procmem.c
View File

@@ -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);

2
sysdeps/linux/procsegment.c
View File

@@ -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) +

2
sysdeps/linux/procsignal.c
View File

@@ -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);

2
sysdeps/linux/procstate.c
View File

@@ -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 =

2
sysdeps/linux/proctime.c
View File

@@ -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) +

2
sysdeps/linux/procuid.c
View File

@@ -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);

2
sysdeps/linux/swap.c
View File

@@ -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 =

2
sysdeps/linux/sysinfo.c
View File

@@ -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 =

3
sysdeps/linux/uptime.c
View File

@@ -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 =