From d97a151695487e84faa2a05039a60fb40e6ab62a Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Fri, 28 May 1999 16:38:20 +0000 Subject: [PATCH] Remove the `GLIBTOP_SYSDEPS_FEATURES' and `GLIBTOP_SYSDEPS_POINTER_SIZE' 1999-05-28 Martin Baulig * include/glibtop/sysdeps.h: Remove the `GLIBTOP_SYSDEPS_FEATURES' and `GLIBTOP_SYSDEPS_POINTER_SIZE' constants and let numbering start at zero for `GLIBTOP_SYSDEPS_CPU'. --- ChangeLog | 6 +++++ include/glibtop/sysdeps.h | 46 +++++++++++++++++++-------------------- src/daemon/slave.c | 3 +-- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index daa4c84f..b117724b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1999-05-28 Martin Baulig + + * include/glibtop/sysdeps.h: Remove the `GLIBTOP_SYSDEPS_FEATURES' + and `GLIBTOP_SYSDEPS_POINTER_SIZE' constants and let numbering + start at zero for `GLIBTOP_SYSDEPS_CPU'. + 1999-05-28 Martin Baulig * glibtop.h (GLIBTOP_MOUNTENTRY_LEN): Move this diff --git a/include/glibtop/sysdeps.h b/include/glibtop/sysdeps.h index b3222aba..32a7e376 100644 --- a/include/glibtop/sysdeps.h +++ b/include/glibtop/sysdeps.h @@ -30,30 +30,28 @@ BEGIN_LIBGTOP_DECLS -#define GLIBTOP_SYSDEPS_FEATURES 0 -#define GLIBTOP_SYSDEPS_POINTER_SIZE 1 -#define GLIBTOP_SYSDEPS_CPU 2 -#define GLIBTOP_SYSDEPS_MEM 3 -#define GLIBTOP_SYSDEPS_SWAP 4 -#define GLIBTOP_SYSDEPS_UPTIME 5 -#define GLIBTOP_SYSDEPS_LOADAVG 6 -#define GLIBTOP_SYSDEPS_SHM_LIMITS 7 -#define GLIBTOP_SYSDEPS_MSG_LIMITS 8 -#define GLIBTOP_SYSDEPS_SEM_LIMITS 9 -#define GLIBTOP_SYSDEPS_PROCLIST 10 -#define GLIBTOP_SYSDEPS_PROC_STATE 11 -#define GLIBTOP_SYSDEPS_PROC_UID 12 -#define GLIBTOP_SYSDEPS_PROC_MEM 13 -#define GLIBTOP_SYSDEPS_PROC_TIME 14 -#define GLIBTOP_SYSDEPS_PROC_SIGNAL 15 -#define GLIBTOP_SYSDEPS_PROC_KERNEL 16 -#define GLIBTOP_SYSDEPS_PROC_SEGMENT 17 -#define GLIBTOP_SYSDEPS_PROC_ARGS 18 -#define GLIBTOP_SYSDEPS_PROC_MAP 19 -#define GLIBTOP_SYSDEPS_MOUNTLIST 20 -#define GLIBTOP_SYSDEPS_FSUSAGE 21 -#define GLIBTOP_SYSDEPS_NETLOAD 22 -#define GLIBTOP_SYSDEPS_PPP 23 +#define GLIBTOP_SYSDEPS_CPU 0 +#define GLIBTOP_SYSDEPS_MEM 1 +#define GLIBTOP_SYSDEPS_SWAP 2 +#define GLIBTOP_SYSDEPS_UPTIME 3 +#define GLIBTOP_SYSDEPS_LOADAVG 4 +#define GLIBTOP_SYSDEPS_SHM_LIMITS 5 +#define GLIBTOP_SYSDEPS_MSG_LIMITS 6 +#define GLIBTOP_SYSDEPS_SEM_LIMITS 7 +#define GLIBTOP_SYSDEPS_PROCLIST 8 +#define GLIBTOP_SYSDEPS_PROC_STATE 9 +#define GLIBTOP_SYSDEPS_PROC_UID 10 +#define GLIBTOP_SYSDEPS_PROC_MEM 11 +#define GLIBTOP_SYSDEPS_PROC_TIME 12 +#define GLIBTOP_SYSDEPS_PROC_SIGNAL 13 +#define GLIBTOP_SYSDEPS_PROC_KERNEL 14 +#define GLIBTOP_SYSDEPS_PROC_SEGMENT 15 +#define GLIBTOP_SYSDEPS_PROC_ARGS 16 +#define GLIBTOP_SYSDEPS_PROC_MAP 17 +#define GLIBTOP_SYSDEPS_MOUNTLIST 18 +#define GLIBTOP_SYSDEPS_FSUSAGE 19 +#define GLIBTOP_SYSDEPS_NETLOAD 20 +#define GLIBTOP_SYSDEPS_PPP 21 #define GLIBTOP_MAX_SYSDEPS 24 diff --git a/src/daemon/slave.c b/src/daemon/slave.c index e5aabcd1..1658596f 100644 --- a/src/daemon/slave.c +++ b/src/daemon/slave.c @@ -128,8 +128,7 @@ handle_slave_command (glibtop_command *cmnd, glibtop_response *resp, sizeof (glibtop_sysdeps)); resp->u.sysdeps.features = glibtop_server_features; resp->u.sysdeps.pointer_size = sizeof (void*)*8; - resp->u.sysdeps.flags = glibtop_server_features | - (1L << GLIBTOP_SYSDEPS_FEATURES); + resp->u.sysdeps.flags = glibtop_server_features; resp->offset = _offset_union (sysdeps); break; #if GLIBTOP_SUID_CPU