From 18af9297eae8bbb9823851673cfc83285425f40d Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Sat, 11 Dec 1999 14:33:18 +0000 Subject: [PATCH] This is a larger source-incompatible commit, but it'll make it easier to 1999-12-11 Martin Baulig This is a larger source-incompatible commit, but it'll make it easier to write automatically generated code (for instance for scripting languages). Renamed all constants for the flags field to match the field names from the features.def and structures.def where this was not already the case. * include/glibtop/cpu.h: s/GLIBTOP_XCPU_/GLIBTOP_CPU_XCPU_/g. * include/glibtop/shm_limits.h: s/GLIBTOP_IPC_/GLIBTOP_SHM_LIMITS_/g. * include/glibtop/sem_limits.h: s/GLIBTOP_IPC_/GLIBTOP_SEM_LIMITS_/g. * include/glibtop/msg_limits.h: s/GLIBTOP_IPC_/GLIBTOP_MSG_LIMITS_/g. --- ChangeLog | 15 +++++++++++++ include/glibtop/cpu.h | 24 ++++++++++----------- include/glibtop/msg_limits.h | 30 +++++++++++++------------- include/glibtop/sem_limits.h | 42 ++++++++++++++++++------------------ include/glibtop/shm_limits.h | 22 +++++++++---------- sysdeps/freebsd/msg_limits.c | 6 +++--- sysdeps/freebsd/sem_limits.c | 10 ++++----- sysdeps/freebsd/shm_limits.c | 6 +++--- sysdeps/kernel/cpu.c | 6 +++--- sysdeps/kernel/msg_limits.c | 8 +++---- sysdeps/kernel/sem_limits.c | 10 ++++----- sysdeps/kernel/shm_limits.c | 6 +++--- sysdeps/linux/cpu.c | 6 +++--- sysdeps/linux/msg_limits.c | 8 +++---- sysdeps/linux/sem_limits.c | 10 ++++----- sysdeps/linux/shm_limits.c | 6 +++--- sysdeps/osf1/msg_limits.c | 14 ++++++------ sysdeps/osf1/sem_limits.c | 18 ++++++++-------- sysdeps/osf1/shm_limits.c | 12 +++++------ sysdeps/solaris/cpu.c | 6 +++--- sysdeps/solaris/msg_limits.c | 8 +++---- sysdeps/solaris/sem_limits.c | 10 ++++----- sysdeps/solaris/shm_limits.c | 4 ++-- sysdeps/sun4/msg_limits.c | 6 +++--- sysdeps/sun4/sem_limits.c | 10 ++++----- sysdeps/sun4/shm_limits.c | 6 +++--- 26 files changed, 162 insertions(+), 147 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09a184e9..471b5ae4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +1999-12-11 Martin Baulig + + This is a larger source-incompatible commit, but it'll make it + easier to write automatically generated code (for instance for + scripting languages). + + Renamed all constants for the flags field to match the field names + from the features.def and structures.def where this was not already + the case. + + * include/glibtop/cpu.h: s/GLIBTOP_XCPU_/GLIBTOP_CPU_XCPU_/g. + * include/glibtop/shm_limits.h: s/GLIBTOP_IPC_/GLIBTOP_SHM_LIMITS_/g. + * include/glibtop/sem_limits.h: s/GLIBTOP_IPC_/GLIBTOP_SEM_LIMITS_/g. + * include/glibtop/msg_limits.h: s/GLIBTOP_IPC_/GLIBTOP_MSG_LIMITS_/g. + 1999-12-11 Martin Baulig * features.def: Use `string' instead of `str' as type name. diff --git a/include/glibtop/cpu.h b/include/glibtop/cpu.h index a7e3a15f..3876e9d2 100644 --- a/include/glibtop/cpu.h +++ b/include/glibtop/cpu.h @@ -38,12 +38,12 @@ BEGIN_LIBGTOP_DECLS #define GLIBTOP_CPU_IDLE 4 #define GLIBTOP_CPU_FREQUENCY 5 -#define GLIBTOP_XCPU_TOTAL 6 -#define GLIBTOP_XCPU_USER 7 -#define GLIBTOP_XCPU_NICE 8 -#define GLIBTOP_XCPU_SYS 9 -#define GLIBTOP_XCPU_IDLE 10 -#define GLIBTOP_XCPU_FLAGS 11 +#define GLIBTOP_CPU_XCPU_TOTAL 6 +#define GLIBTOP_CPU_XCPU_USER 7 +#define GLIBTOP_CPU_XCPU_NICE 8 +#define GLIBTOP_CPU_XCPU_SYS 9 +#define GLIBTOP_CPU_XCPU_IDLE 10 +#define GLIBTOP_CPU_XCPU_FLAGS 11 #define GLIBTOP_MAX_CPU 12 @@ -58,12 +58,12 @@ struct _glibtop_cpu sys, /* GLIBTOP_CPU_SYS */ idle, /* GLIBTOP_CPU_IDLE */ frequency, /* GLIBTOP_CPU_FREQUENCY */ - xcpu_total [GLIBTOP_NCPU], /* GLIBTOP_XCPU_TOTAL */ - xcpu_user [GLIBTOP_NCPU], /* GLIBTOP_XCPU_USER */ - xcpu_nice [GLIBTOP_NCPU], /* GLIBTOP_XCPU_NICE */ - xcpu_sys [GLIBTOP_NCPU], /* GLIBTOP_XCPU_SYS */ - xcpu_idle [GLIBTOP_NCPU], /* GLIBTOP_XCPU_IDLE */ - xcpu_flags; /* GLIBTOP_XCPU_FLAGS */ + xcpu_total [GLIBTOP_NCPU], /* GLIBTOP_CPU_XCPU_TOTAL */ + xcpu_user [GLIBTOP_NCPU], /* GLIBTOP_CPU_XCPU_USER */ + xcpu_nice [GLIBTOP_NCPU], /* GLIBTOP_CPU_XCPU_NICE */ + xcpu_sys [GLIBTOP_NCPU], /* GLIBTOP_CPU_XCPU_SYS */ + xcpu_idle [GLIBTOP_NCPU], /* GLIBTOP_CPU_XCPU_IDLE */ + xcpu_flags; /* GLIBTOP_CPU_XCPU_FLAGS */ }; #define glibtop_get_cpu(cpu) glibtop_get_cpu_l(glibtop_global_server, cpu) diff --git a/include/glibtop/msg_limits.h b/include/glibtop/msg_limits.h index 5c566275..2295ce8e 100644 --- a/include/glibtop/msg_limits.h +++ b/include/glibtop/msg_limits.h @@ -31,28 +31,28 @@ BEGIN_LIBGTOP_DECLS -#define GLIBTOP_IPC_MSGPOOL 0 -#define GLIBTOP_IPC_MSGMAP 1 -#define GLIBTOP_IPC_MSGMAX 2 -#define GLIBTOP_IPC_MSGMNB 3 -#define GLIBTOP_IPC_MSGMNI 4 -#define GLIBTOP_IPC_MSGSSZ 5 -#define GLIBTOP_IPC_MSGTQL 6 +#define GLIBTOP_MSG_LIMITS_MSGPOOL 0 +#define GLIBTOP_MSG_LIMITS_MSGMAP 1 +#define GLIBTOP_MSG_LIMITS_MSGMAX 2 +#define GLIBTOP_MSG_LIMITS_MSGMNB 3 +#define GLIBTOP_MSG_LIMITS_MSGMNI 4 +#define GLIBTOP_MSG_LIMITS_MSGSSZ 5 +#define GLIBTOP_MSG_LIMITS_MSGTQL 6 -#define GLIBTOP_MAX_MSG_LIMITS 7 +#define GLIBTOP_MAX_MSG_LIMITS 7 typedef struct _glibtop_msg_limits glibtop_msg_limits; struct _glibtop_msg_limits { u_int64_t flags, - msgpool, /* GLIBTOP_IPC_MSGPOOL */ - msgmap, /* GLIBTOP_IPC_MSGMAP */ - msgmax, /* GLIBTOP_IPC_MSGMAX */ - msgmnb, /* GLIBTOP_IPC_MSGMNB */ - msgmni, /* GLIBTOP_IPC_MSGMNI */ - msgssz, /* GLIBTOP_IPC_MSGSSZ */ - msgtql; /* GLIBTOP_IPC_MSGTQL */ + msgpool, /* GLIBTOP_MSG_LIMITS_MSGPOOL */ + msgmap, /* GLIBTOP_MSG_LIMITS_MSGMAP */ + msgmax, /* GLIBTOP_MSG_LIMITS_MSGMAX */ + msgmnb, /* GLIBTOP_MSG_LIMITS_MSGMNB */ + msgmni, /* GLIBTOP_MSG_LIMITS_MSGMNI */ + msgssz, /* GLIBTOP_MSG_LIMITS_MSGSSZ */ + msgtql; /* GLIBTOP_MSG_LIMITS_MSGTQL */ }; #define glibtop_get_msg_limits(msg) glibtop_get_msg_limits_l(glibtop_global_server, msg) diff --git a/include/glibtop/sem_limits.h b/include/glibtop/sem_limits.h index 176781c2..60c3338f 100644 --- a/include/glibtop/sem_limits.h +++ b/include/glibtop/sem_limits.h @@ -31,34 +31,34 @@ BEGIN_LIBGTOP_DECLS -#define GLIBTOP_IPC_SEMMAP 0 -#define GLIBTOP_IPC_SEMMNI 1 -#define GLIBTOP_IPC_SEMMNS 2 -#define GLIBTOP_IPC_SEMMNU 3 -#define GLIBTOP_IPC_SEMMSL 4 -#define GLIBTOP_IPC_SEMOPM 5 -#define GLIBTOP_IPC_SEMUME 6 -#define GLIBTOP_IPC_SEMUSZ 7 -#define GLIBTOP_IPC_SEMVMX 8 -#define GLIBTOP_IPC_SEMAEM 9 +#define GLIBTOP_SEM_LIMITS_SEMMAP 0 +#define GLIBTOP_SEM_LIMITS_SEMMNI 1 +#define GLIBTOP_SEM_LIMITS_SEMMNS 2 +#define GLIBTOP_SEM_LIMITS_SEMMNU 3 +#define GLIBTOP_SEM_LIMITS_SEMMSL 4 +#define GLIBTOP_SEM_LIMITS_SEMOPM 5 +#define GLIBTOP_SEM_LIMITS_SEMUME 6 +#define GLIBTOP_SEM_LIMITS_SEMUSZ 7 +#define GLIBTOP_SEM_LIMITS_SEMVMX 8 +#define GLIBTOP_SEM_LIMITS_SEMAEM 9 -#define GLIBTOP_MAX_SEM_LIMITS 10 +#define GLIBTOP_MAX_SEM_LIMITS 10 typedef struct _glibtop_sem_limits glibtop_sem_limits; struct _glibtop_sem_limits { u_int64_t flags, - semmap, /* GLIBTOP_IPC_SEMMAP */ - semmni, /* GLIBTOP_IPC_SEMMNI */ - semmns, /* GLIBTOP_IPC_SEMMNS */ - semmnu, /* GLIBTOP_IPC_SEMMNU */ - semmsl, /* GLIBTOP_IPC_SEMMSL */ - semopm, /* GLIBTOP_IPC_SEMOPM */ - semume, /* GLIBTOP_IPC_SEMUME */ - semusz, /* GLIBTOP_IPC_SEMUSZ */ - semvmx, /* GLIBTOP_IPC_SEMVMX */ - semaem; /* GLIBTOP_IPC_SEMAEM */ + semmap, /* GLIBTOP_SEM_LIMITS_SEMMAP */ + semmni, /* GLIBTOP_SEM_LIMITS_SEMMNI */ + semmns, /* GLIBTOP_SEM_LIMITS_SEMMNS */ + semmnu, /* GLIBTOP_SEM_LIMITS_SEMMNU */ + semmsl, /* GLIBTOP_SEM_LIMITS_SEMMSL */ + semopm, /* GLIBTOP_SEM_LIMITS_SEMOPM */ + semume, /* GLIBTOP_SEM_LIMITS_SEMUME */ + semusz, /* GLIBTOP_SEM_LIMITS_SEMUSZ */ + semvmx, /* GLIBTOP_SEM_LIMITS_SEMVMX */ + semaem; /* GLIBTOP_SEM_LIMITS_SEMAEM */ }; #define glibtop_get_sem_limits(sem) glibtop_get_sem_limits_l(glibtop_global_server, sem) diff --git a/include/glibtop/shm_limits.h b/include/glibtop/shm_limits.h index 35405177..93f6e79b 100644 --- a/include/glibtop/shm_limits.h +++ b/include/glibtop/shm_limits.h @@ -31,24 +31,24 @@ BEGIN_LIBGTOP_DECLS -#define GLIBTOP_IPC_SHMMAX 0 -#define GLIBTOP_IPC_SHMMIN 1 -#define GLIBTOP_IPC_SHMMNI 2 -#define GLIBTOP_IPC_SHMSEG 3 -#define GLIBTOP_IPC_SHMALL 4 +#define GLIBTOP_SHM_LIMITS_SHMMAX 0 +#define GLIBTOP_SHM_LIMITS_SHMMIN 1 +#define GLIBTOP_SHM_LIMITS_SHMMNI 2 +#define GLIBTOP_SHM_LIMITS_SHMSEG 3 +#define GLIBTOP_SHM_LIMITS_SHMALL 4 -#define GLIBTOP_MAX_SHM_LIMITS 5 +#define GLIBTOP_MAX_SHM_LIMITS 5 typedef struct _glibtop_shm_limits glibtop_shm_limits; struct _glibtop_shm_limits { u_int64_t flags, - shmmax, /* GLIBTOP_IPC_SHMMAX */ - shmmin, /* GLIBTOP_IPC_SHMMIN */ - shmmni, /* GLIBTOP_IPC_SHMMNI */ - shmseg, /* GLIBTOP_IPC_SHMSEG */ - shmall; /* GLIBTOP_IPC_SHMALL */ + shmmax, /* GLIBTOP_SHM_LIMITS_SHMMAX */ + shmmin, /* GLIBTOP_SHM_LIMITS_SHMMIN */ + shmmni, /* GLIBTOP_SHM_LIMITS_SHMMNI */ + shmseg, /* GLIBTOP_SHM_LIMITS_SHMSEG */ + shmall; /* GLIBTOP_SHM_LIMITS_SHMALL */ }; #define glibtop_get_shm_limits(shm) glibtop_get_shm_limits_l(glibtop_global_server, shm) diff --git a/sysdeps/freebsd/msg_limits.c b/sysdeps/freebsd/msg_limits.c index f838ce04..1f16ecc6 100644 --- a/sysdeps/freebsd/msg_limits.c +++ b/sysdeps/freebsd/msg_limits.c @@ -60,9 +60,9 @@ glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf) #include static const unsigned long _glibtop_sysdeps_msg_limits = -(1L << GLIBTOP_IPC_MSGMAX) + (1L << GLIBTOP_IPC_MSGMNI) + -(1L << GLIBTOP_IPC_MSGMNB) + (1L << GLIBTOP_IPC_MSGTQL) + -(1L << GLIBTOP_IPC_MSGSSZ); +(1L << GLIBTOP_MSG_LIMITS_MSGMAX) + (1L << GLIBTOP_MSG_LIMITS_MSGMNI) + +(1L << GLIBTOP_MSG_LIMITS_MSGMNB) + (1L << GLIBTOP_MSG_LIMITS_MSGTQL) + +(1L << GLIBTOP_MSG_LIMITS_MSGSSZ); /* The values in this structure never change at runtime, so we only * read it once during initialization. We have to use the name `_msginfo' diff --git a/sysdeps/freebsd/sem_limits.c b/sysdeps/freebsd/sem_limits.c index b44e5892..3fae625d 100644 --- a/sysdeps/freebsd/sem_limits.c +++ b/sysdeps/freebsd/sem_limits.c @@ -61,11 +61,11 @@ glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf) #include static unsigned long _glibtop_sysdeps_sem_limits = -(1L << GLIBTOP_IPC_SEMMAP) + (1L << GLIBTOP_IPC_SEMMNI) + -(1L << GLIBTOP_IPC_SEMMNS) + (1L << GLIBTOP_IPC_SEMMNU) + -(1L << GLIBTOP_IPC_SEMMSL) + (1L << GLIBTOP_IPC_SEMOPM) + -(1L << GLIBTOP_IPC_SEMUME) + (1L << GLIBTOP_IPC_SEMUSZ) + -(1L << GLIBTOP_IPC_SEMVMX) + (1L << GLIBTOP_IPC_SEMAEM); +(1L << GLIBTOP_SEM_LIMITS_SEMMAP) + (1L << GLIBTOP_SEM_LIMITS_SEMMNI) + +(1L << GLIBTOP_SEM_LIMITS_SEMMNS) + (1L << GLIBTOP_SEM_LIMITS_SEMMNU) + +(1L << GLIBTOP_SEM_LIMITS_SEMMSL) + (1L << GLIBTOP_SEM_LIMITS_SEMOPM) + +(1L << GLIBTOP_SEM_LIMITS_SEMUME) + (1L << GLIBTOP_SEM_LIMITS_SEMUSZ) + +(1L << GLIBTOP_SEM_LIMITS_SEMVMX) + (1L << GLIBTOP_SEM_LIMITS_SEMAEM); /* The values in this structure never change at runtime, so we only * read it once during initialization. We have to use the name `_seminfo' diff --git a/sysdeps/freebsd/shm_limits.c b/sysdeps/freebsd/shm_limits.c index f59316eb..33968f8d 100644 --- a/sysdeps/freebsd/shm_limits.c +++ b/sysdeps/freebsd/shm_limits.c @@ -61,9 +61,9 @@ glibtop_get_shm_limits_p (glibtop *server, glibtop_shm_limits *buf) #include static unsigned long _glibtop_sysdeps_shm_limits = -(1L << GLIBTOP_IPC_SHMMAX) + (1L << GLIBTOP_IPC_SHMMIN) + -(1L << GLIBTOP_IPC_SHMMNI) + (1L << GLIBTOP_IPC_SHMSEG) + -(1L << GLIBTOP_IPC_SHMALL); +(1L << GLIBTOP_SHM_LIMITS_SHMMAX) + (1L << GLIBTOP_SHM_LIMITS_SHMMIN) + +(1L << GLIBTOP_SHM_LIMITS_SHMMNI) + (1L << GLIBTOP_SHM_LIMITS_SHMSEG) + +(1L << GLIBTOP_SHM_LIMITS_SHMALL); /* The values in this structure never change at runtime, so we only * read it once during initialization. We have to use the name `_shminfo' diff --git a/sysdeps/kernel/cpu.c b/sysdeps/kernel/cpu.c index c67dae80..dce6fbb6 100644 --- a/sysdeps/kernel/cpu.c +++ b/sysdeps/kernel/cpu.c @@ -32,9 +32,9 @@ static const unsigned long _glibtop_sysdeps_cpu = (1L << GLIBTOP_CPU_IDLE) + (1L << GLIBTOP_CPU_FREQUENCY); static const unsigned long _glibtop_sysdeps_cpu_smp = -(1L << GLIBTOP_XCPU_TOTAL) + (1L << GLIBTOP_XCPU_USER) + -(1L << GLIBTOP_XCPU_NICE) + (1L << GLIBTOP_XCPU_SYS) + -(1L << GLIBTOP_XCPU_IDLE); +(1L << GLIBTOP_CPU_XCPU_TOTAL) + (1L << GLIBTOP_CPU_XCPU_USER) + +(1L << GLIBTOP_CPU_XCPU_NICE) + (1L << GLIBTOP_CPU_XCPU_SYS) + +(1L << GLIBTOP_CPU_XCPU_IDLE); /* Init function. */ diff --git a/sysdeps/kernel/msg_limits.c b/sysdeps/kernel/msg_limits.c index f9931b7c..5ed5fdad 100644 --- a/sysdeps/kernel/msg_limits.c +++ b/sysdeps/kernel/msg_limits.c @@ -27,10 +27,10 @@ #include static const unsigned long _glibtop_sysdeps_msg_limits = -(1L << GLIBTOP_IPC_MSGPOOL) + (1L << GLIBTOP_IPC_MSGMAP) + -(1L << GLIBTOP_IPC_MSGMAX) + (1L << GLIBTOP_IPC_MSGMNB) + -(1L << GLIBTOP_IPC_MSGMNI) + (1L << GLIBTOP_IPC_MSGSSZ) + -(1L << GLIBTOP_IPC_MSGTQL); +(1L << GLIBTOP_MSG_LIMITS_MSGPOOL) + (1L << GLIBTOP_MSG_LIMITS_MSGMAP) + +(1L << GLIBTOP_MSG_LIMITS_MSGMAX) + (1L << GLIBTOP_MSG_LIMITS_MSGMNB) + +(1L << GLIBTOP_MSG_LIMITS_MSGMNI) + (1L << GLIBTOP_MSG_LIMITS_MSGSSZ) + +(1L << GLIBTOP_MSG_LIMITS_MSGTQL); /* Init function. */ diff --git a/sysdeps/kernel/sem_limits.c b/sysdeps/kernel/sem_limits.c index d636fec7..b895c28b 100644 --- a/sysdeps/kernel/sem_limits.c +++ b/sysdeps/kernel/sem_limits.c @@ -42,11 +42,11 @@ union semun #endif static unsigned long _glibtop_sysdeps_sem_limits = -(1L << GLIBTOP_IPC_SEMMAP) + (1L << GLIBTOP_IPC_SEMMNI) + -(1L << GLIBTOP_IPC_SEMMNS) + (1L << GLIBTOP_IPC_SEMMNU) + -(1L << GLIBTOP_IPC_SEMMSL) + (1L << GLIBTOP_IPC_SEMOPM) + -(1L << GLIBTOP_IPC_SEMUME) + (1L << GLIBTOP_IPC_SEMUSZ) + -(1L << GLIBTOP_IPC_SEMVMX) + (1L << GLIBTOP_IPC_SEMAEM); +(1L << GLIBTOP_SEM_LIMITS_SEMMAP) + (1L << GLIBTOP_SEM_LIMITS_SEMMNI) + +(1L << GLIBTOP_SEM_LIMITS_SEMMNS) + (1L << GLIBTOP_SEM_LIMITS_SEMMNU) + +(1L << GLIBTOP_SEM_LIMITS_SEMMSL) + (1L << GLIBTOP_SEM_LIMITS_SEMOPM) + +(1L << GLIBTOP_SEM_LIMITS_SEMUME) + (1L << GLIBTOP_SEM_LIMITS_SEMUSZ) + +(1L << GLIBTOP_SEM_LIMITS_SEMVMX) + (1L << GLIBTOP_SEM_LIMITS_SEMAEM); /* Init function. */ diff --git a/sysdeps/kernel/shm_limits.c b/sysdeps/kernel/shm_limits.c index 4892abaf..061722c4 100644 --- a/sysdeps/kernel/shm_limits.c +++ b/sysdeps/kernel/shm_limits.c @@ -27,9 +27,9 @@ #include static unsigned long _glibtop_sysdeps_shm_limits = -(1L << GLIBTOP_IPC_SHMMAX) + (1L << GLIBTOP_IPC_SHMMIN) + -(1L << GLIBTOP_IPC_SHMMNI) + (1L << GLIBTOP_IPC_SHMSEG) + -(1L << GLIBTOP_IPC_SHMALL); +(1L << GLIBTOP_SHM_LIMITS_SHMMAX) + (1L << GLIBTOP_SHM_LIMITS_SHMMIN) + +(1L << GLIBTOP_SHM_LIMITS_SHMMNI) + (1L << GLIBTOP_SHM_LIMITS_SHMSEG) + +(1L << GLIBTOP_SHM_LIMITS_SHMALL); /* Init function. */ diff --git a/sysdeps/linux/cpu.c b/sysdeps/linux/cpu.c index de28f28d..63320456 100644 --- a/sysdeps/linux/cpu.c +++ b/sysdeps/linux/cpu.c @@ -31,9 +31,9 @@ static const unsigned long _glibtop_sysdeps_cpu = (1L << GLIBTOP_CPU_IDLE) + (1L << GLIBTOP_CPU_FREQUENCY); static const unsigned long _glibtop_sysdeps_cpu_smp = -(1L << GLIBTOP_XCPU_TOTAL) + (1L << GLIBTOP_XCPU_USER) + -(1L << GLIBTOP_XCPU_NICE) + (1L << GLIBTOP_XCPU_SYS) + -(1L << GLIBTOP_XCPU_IDLE); +(1L << GLIBTOP_CPU_XCPU_TOTAL) + (1L << GLIBTOP_CPU_XCPU_USER) + +(1L << GLIBTOP_CPU_XCPU_NICE) + (1L << GLIBTOP_CPU_XCPU_SYS) + +(1L << GLIBTOP_CPU_XCPU_IDLE); /* Init function. */ diff --git a/sysdeps/linux/msg_limits.c b/sysdeps/linux/msg_limits.c index 150b6f55..46d15b37 100644 --- a/sysdeps/linux/msg_limits.c +++ b/sysdeps/linux/msg_limits.c @@ -27,10 +27,10 @@ #include static const unsigned long _glibtop_sysdeps_msg_limits = -(1L << GLIBTOP_IPC_MSGPOOL) + (1L << GLIBTOP_IPC_MSGMAP) + -(1L << GLIBTOP_IPC_MSGMAX) + (1L << GLIBTOP_IPC_MSGMNB) + -(1L << GLIBTOP_IPC_MSGMNI) + (1L << GLIBTOP_IPC_MSGSSZ) + -(1L << GLIBTOP_IPC_MSGTQL); +(1L << GLIBTOP_MSG_LIMITS_MSGPOOL) + (1L << GLIBTOP_MSG_LIMITS_MSGMAP) + +(1L << GLIBTOP_MSG_LIMITS_MSGMAX) + (1L << GLIBTOP_MSG_LIMITS_MSGMNB) + +(1L << GLIBTOP_MSG_LIMITS_MSGMNI) + (1L << GLIBTOP_MSG_LIMITS_MSGSSZ) + +(1L << GLIBTOP_MSG_LIMITS_MSGTQL); /* Init function. */ diff --git a/sysdeps/linux/sem_limits.c b/sysdeps/linux/sem_limits.c index 7dbfd132..ef093a23 100644 --- a/sysdeps/linux/sem_limits.c +++ b/sysdeps/linux/sem_limits.c @@ -42,11 +42,11 @@ union semun #endif static unsigned long _glibtop_sysdeps_sem_limits = -(1L << GLIBTOP_IPC_SEMMAP) + (1L << GLIBTOP_IPC_SEMMNI) + -(1L << GLIBTOP_IPC_SEMMNS) + (1L << GLIBTOP_IPC_SEMMNU) + -(1L << GLIBTOP_IPC_SEMMSL) + (1L << GLIBTOP_IPC_SEMOPM) + -(1L << GLIBTOP_IPC_SEMUME) + (1L << GLIBTOP_IPC_SEMUSZ) + -(1L << GLIBTOP_IPC_SEMVMX) + (1L << GLIBTOP_IPC_SEMAEM); +(1L << GLIBTOP_SEM_LIMITS_SEMMAP) + (1L << GLIBTOP_SEM_LIMITS_SEMMNI) + +(1L << GLIBTOP_SEM_LIMITS_SEMMNS) + (1L << GLIBTOP_SEM_LIMITS_SEMMNU) + +(1L << GLIBTOP_SEM_LIMITS_SEMMSL) + (1L << GLIBTOP_SEM_LIMITS_SEMOPM) + +(1L << GLIBTOP_SEM_LIMITS_SEMUME) + (1L << GLIBTOP_SEM_LIMITS_SEMUSZ) + +(1L << GLIBTOP_SEM_LIMITS_SEMVMX) + (1L << GLIBTOP_SEM_LIMITS_SEMAEM); /* Init function. */ diff --git a/sysdeps/linux/shm_limits.c b/sysdeps/linux/shm_limits.c index 2845fc16..a59eadef 100644 --- a/sysdeps/linux/shm_limits.c +++ b/sysdeps/linux/shm_limits.c @@ -27,9 +27,9 @@ #include static unsigned long _glibtop_sysdeps_shm_limits = -(1L << GLIBTOP_IPC_SHMMAX) + (1L << GLIBTOP_IPC_SHMMIN) + -(1L << GLIBTOP_IPC_SHMMNI) + (1L << GLIBTOP_IPC_SHMSEG) + -(1L << GLIBTOP_IPC_SHMALL); +(1L << GLIBTOP_SHM_LIMITS_SHMMAX) + (1L << GLIBTOP_SHM_LIMITS_SHMMIN) + +(1L << GLIBTOP_SHM_LIMITS_SHMMNI) + (1L << GLIBTOP_SHM_LIMITS_SHMSEG) + +(1L << GLIBTOP_SHM_LIMITS_SHMALL); /* Init function. */ diff --git a/sysdeps/osf1/msg_limits.c b/sysdeps/osf1/msg_limits.c index a38b2721..12dc9498 100644 --- a/sysdeps/osf1/msg_limits.c +++ b/sysdeps/osf1/msg_limits.c @@ -26,9 +26,9 @@ #include static const unsigned long _glibtop_sysdeps_msg_limits = -(1L << GLIBTOP_IPC_MSGMAP) + (1L << GLIBTOP_IPC_MSGMAX) + -(1L << GLIBTOP_IPC_MSGMNB) + (1L << GLIBTOP_IPC_MSGMNI) + -(1L << GLIBTOP_IPC_MSGTQL); +(1L << GLIBTOP_MSG_LIMITS_MSGMAP) + (1L << GLIBTOP_MSG_LIMITS_MSGMAX) + +(1L << GLIBTOP_MSG_LIMITS_MSGMNB) + (1L << GLIBTOP_MSG_LIMITS_MSGMNI) + +(1L << GLIBTOP_MSG_LIMITS_MSGTQL); /* Init function. */ @@ -54,7 +54,7 @@ glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf) if (ret != 1) return; - buf->flags += (1L << GLIBTOP_IPC_MSGMAX); + buf->flags += (1L << GLIBTOP_MSG_LIMITS_MSGMAX); buf->msgmax = value; @@ -63,7 +63,7 @@ glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf) if (ret != 1) return; - buf->flags += (1L << GLIBTOP_IPC_MSGMNB); + buf->flags += (1L << GLIBTOP_MSG_LIMITS_MSGMNB); buf->msgmnb = value; @@ -72,7 +72,7 @@ glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf) if (ret != 1) return; - buf->flags += (1L << GLIBTOP_IPC_MSGMNI); + buf->flags += (1L << GLIBTOP_MSG_LIMITS_MSGMNI); buf->msgmni = value; @@ -81,7 +81,7 @@ glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf) if (ret != 1) return; - buf->flags += (1L << GLIBTOP_IPC_MSGTQL); + buf->flags += (1L << GLIBTOP_MSG_LIMITS_MSGTQL); buf->msgtql = value; } diff --git a/sysdeps/osf1/sem_limits.c b/sysdeps/osf1/sem_limits.c index 4b1827da..c870e0a5 100644 --- a/sysdeps/osf1/sem_limits.c +++ b/sysdeps/osf1/sem_limits.c @@ -26,9 +26,9 @@ #include static unsigned long _glibtop_sysdeps_sem_limits = -(1L << GLIBTOP_IPC_SEMMNI) + (1L << GLIBTOP_IPC_SEMMSL) + -(1L << GLIBTOP_IPC_SEMOPM) + (1L << GLIBTOP_IPC_SEMVMX) + -(1L << GLIBTOP_IPC_SEMAEM); +(1L << GLIBTOP_SEM_LIMITS_SEMMNI) + (1L << GLIBTOP_SEM_LIMITS_SEMMSL) + +(1L << GLIBTOP_SEM_LIMITS_SEMOPM) + (1L << GLIBTOP_SEM_LIMITS_SEMVMX) + +(1L << GLIBTOP_SEM_LIMITS_SEMAEM); /* Init function. */ @@ -54,7 +54,7 @@ glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf) if (ret != 1) return; - buf->flags += (1L << GLIBTOP_IPC_SEMMNI); + buf->flags += (1L << GLIBTOP_SEM_LIMITS_SEMMNI); buf->semmni = value; @@ -64,7 +64,7 @@ glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf) if (ret != 1) return; - buf->flags += (1L << GLIBTOP_IPC_SEMMSL); + buf->flags += (1L << GLIBTOP_SEM_LIMITS_SEMMSL); buf->semmsl = value; @@ -74,7 +74,7 @@ glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf) if (ret != 1) return; - buf->flags += (1L << GLIBTOP_IPC_SEMOPM); + buf->flags += (1L << GLIBTOP_SEM_LIMITS_SEMOPM); buf->semopm = value; @@ -84,7 +84,7 @@ glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf) if (ret != 1) return; - buf->flags += (1L << GLIBTOP_IPC_SEMUME); + buf->flags += (1L << GLIBTOP_SEM_LIMITS_SEMUME); buf->semume = value; @@ -94,7 +94,7 @@ glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf) if (ret != 1) return; - buf->flags += (1L << GLIBTOP_IPC_SEMVMX); + buf->flags += (1L << GLIBTOP_SEM_LIMITS_SEMVMX); buf->semvmx = value; @@ -104,7 +104,7 @@ glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf) if (ret != 1) return; - buf->flags += (1L << GLIBTOP_IPC_SEMAEM); + buf->flags += (1L << GLIBTOP_SEM_LIMITS_SEMAEM); buf->semaem = value; } diff --git a/sysdeps/osf1/shm_limits.c b/sysdeps/osf1/shm_limits.c index ae2182ad..af429da1 100644 --- a/sysdeps/osf1/shm_limits.c +++ b/sysdeps/osf1/shm_limits.c @@ -26,8 +26,8 @@ #include static unsigned long _glibtop_sysdeps_shm_limits = -(1L << GLIBTOP_IPC_SHMMAX) + (1L << GLIBTOP_IPC_SHMMIN) + -(1L << GLIBTOP_IPC_SHMMNI) + (1L << GLIBTOP_IPC_SHMSEG); +(1L << GLIBTOP_SHM_LIMITS_SHMMAX) + (1L << GLIBTOP_SHM_LIMITS_SHMMIN) + +(1L << GLIBTOP_SHM_LIMITS_SHMMNI) + (1L << GLIBTOP_SHM_LIMITS_SHMSEG); /* Init function. */ @@ -53,7 +53,7 @@ glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf) if (ret != 1) return; - buf->flags += (1L << GLIBTOP_IPC_SHMMAX); + buf->flags += (1L << GLIBTOP_SHM_LIMITS_SHMMAX); buf->shmmax = value; @@ -63,7 +63,7 @@ glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf) if (ret != 1) return; - buf->flags += (1L << GLIBTOP_IPC_SHMMIN); + buf->flags += (1L << GLIBTOP_SHM_LIMITS_SHMMIN); buf->shmmin = value; @@ -73,7 +73,7 @@ glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf) if (ret != 1) return; - buf->flags += (1L << GLIBTOP_IPC_SHMMNI); + buf->flags += (1L << GLIBTOP_SHM_LIMITS_SHMMNI); buf->shmmni = value; @@ -83,7 +83,7 @@ glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf) if (ret != 1) return; - buf->flags += (1L << GLIBTOP_IPC_SHMSEG); + buf->flags += (1L << GLIBTOP_SHM_LIMITS_SHMSEG); buf->shmseg = value; } diff --git a/sysdeps/solaris/cpu.c b/sysdeps/solaris/cpu.c index ea55ab95..5e6bc117 100644 --- a/sysdeps/solaris/cpu.c +++ b/sysdeps/solaris/cpu.c @@ -33,9 +33,9 @@ static const unsigned long _glibtop_sysdeps_cpu = (1L << GLIBTOP_CPU_TOTAL) + (1L << GLIBTOP_CPU_USER) + (1L << GLIBTOP_CPU_SYS) + (1L << GLIBTOP_CPU_IDLE) + -(1L << GLIBTOP_XCPU_TOTAL) + (1L << GLIBTOP_XCPU_USER) + -(1L << GLIBTOP_XCPU_SYS) + (1L << GLIBTOP_XCPU_IDLE) + -(1L << GLIBTOP_CPU_FREQUENCY) + (1L << GLIBTOP_XCPU_FLAGS); +(1L << GLIBTOP_CPU_XCPU_TOTAL) + (1L << GLIBTOP_CPU_XCPU_USER) + +(1L << GLIBTOP_CPU_XCPU_SYS) + (1L << GLIBTOP_CPU_XCPU_IDLE) + +(1L << GLIBTOP_CPU_FREQUENCY) + (1L << GLIBTOP_CPU_XCPU_FLAGS); /* Init function. */ diff --git a/sysdeps/solaris/msg_limits.c b/sysdeps/solaris/msg_limits.c index aca82113..ca7f819e 100644 --- a/sysdeps/solaris/msg_limits.c +++ b/sysdeps/solaris/msg_limits.c @@ -29,10 +29,10 @@ static struct nlist nlst[] = { {"msginfo"}, {NULL} }; static const unsigned long _glibtop_sysdeps_msg_limits = -(1L << GLIBTOP_IPC_MSGPOOL) + (1L << GLIBTOP_IPC_MSGMAP) + -(1L << GLIBTOP_IPC_MSGMAX) + (1L << GLIBTOP_IPC_MSGMNB) + -(1L << GLIBTOP_IPC_MSGMNI) + (1L << GLIBTOP_IPC_MSGSSZ) + -(1L << GLIBTOP_IPC_MSGTQL); +(1L << GLIBTOP_MSG_LIMITS_MSGPOOL) + (1L << GLIBTOP_MSG_LIMITS_MSGMAP) + +(1L << GLIBTOP_MSG_LIMITS_MSGMAX) + (1L << GLIBTOP_MSG_LIMITS_MSGMNB) + +(1L << GLIBTOP_MSG_LIMITS_MSGMNI) + (1L << GLIBTOP_MSG_LIMITS_MSGSSZ) + +(1L << GLIBTOP_MSG_LIMITS_MSGTQL); /* Init function. */ diff --git a/sysdeps/solaris/sem_limits.c b/sysdeps/solaris/sem_limits.c index 2b156452..1763bb34 100644 --- a/sysdeps/solaris/sem_limits.c +++ b/sysdeps/solaris/sem_limits.c @@ -29,11 +29,11 @@ static struct nlist nlst[] = { {"seminfo"}, {NULL} }; static const unsigned long _glibtop_sysdeps_sem_limits = -(1L << GLIBTOP_IPC_SEMMAP) + (1L << GLIBTOP_IPC_SEMMNI) + -(1L << GLIBTOP_IPC_SEMMNS) + (1L << GLIBTOP_IPC_SEMMNU) + -(1L << GLIBTOP_IPC_SEMMSL) + (1L << GLIBTOP_IPC_SEMOPM) + -(1L << GLIBTOP_IPC_SEMUME) + (1L << GLIBTOP_IPC_SEMUSZ) + -(1L << GLIBTOP_IPC_SEMVMX) + (1L << GLIBTOP_IPC_SEMAEM); +(1L << GLIBTOP_SEM_LIMITS_SEMMAP) + (1L << GLIBTOP_SEM_LIMITS_SEMMNI) + +(1L << GLIBTOP_SEM_LIMITS_SEMMNS) + (1L << GLIBTOP_SEM_LIMITS_SEMMNU) + +(1L << GLIBTOP_SEM_LIMITS_SEMMSL) + (1L << GLIBTOP_SEM_LIMITS_SEMOPM) + +(1L << GLIBTOP_SEM_LIMITS_SEMUME) + (1L << GLIBTOP_SEM_LIMITS_SEMUSZ) + +(1L << GLIBTOP_SEM_LIMITS_SEMVMX) + (1L << GLIBTOP_SEM_LIMITS_SEMAEM); /* Init function. */ diff --git a/sysdeps/solaris/shm_limits.c b/sysdeps/solaris/shm_limits.c index 3fd8dd1c..c0210f1f 100644 --- a/sysdeps/solaris/shm_limits.c +++ b/sysdeps/solaris/shm_limits.c @@ -29,8 +29,8 @@ static struct nlist nlst[] = { {"shminfo"}, {NULL} }; static const unsigned long _glibtop_sysdeps_shm_limits = -(1L << GLIBTOP_IPC_SHMMAX) + (1L << GLIBTOP_IPC_SHMMIN) + -(1L << GLIBTOP_IPC_SHMMNI) + (1L << GLIBTOP_IPC_SHMSEG); +(1L << GLIBTOP_SHM_LIMITS_SHMMAX) + (1L << GLIBTOP_SHM_LIMITS_SHMMIN) + +(1L << GLIBTOP_SHM_LIMITS_SHMMNI) + (1L << GLIBTOP_SHM_LIMITS_SHMSEG); /* Init function. */ diff --git a/sysdeps/sun4/msg_limits.c b/sysdeps/sun4/msg_limits.c index a2e4b87e..6e11f917 100644 --- a/sysdeps/sun4/msg_limits.c +++ b/sysdeps/sun4/msg_limits.c @@ -34,9 +34,9 @@ #include static const unsigned long _glibtop_sysdeps_msg_limits = -(1L << GLIBTOP_IPC_MSGMAP) + (1L << GLIBTOP_IPC_MSGMAX) + -(1L << GLIBTOP_IPC_MSGMNB) + (1L << GLIBTOP_IPC_MSGMNI) + -(1L << GLIBTOP_IPC_MSGSSZ) + (1L << GLIBTOP_IPC_MSGTQL); +(1L << GLIBTOP_MSG_LIMITS_MSGMAP) + (1L << GLIBTOP_MSG_LIMITS_MSGMAX) + +(1L << GLIBTOP_MSG_LIMITS_MSGMNB) + (1L << GLIBTOP_MSG_LIMITS_MSGMNI) + +(1L << GLIBTOP_MSG_LIMITS_MSGSSZ) + (1L << GLIBTOP_MSG_LIMITS_MSGTQL); /* Provides information about sysv ipc limits. */ diff --git a/sysdeps/sun4/sem_limits.c b/sysdeps/sun4/sem_limits.c index d956b0f0..359c2aa1 100644 --- a/sysdeps/sun4/sem_limits.c +++ b/sysdeps/sun4/sem_limits.c @@ -34,11 +34,11 @@ #include static unsigned long _glibtop_sysdeps_sem_limits = -(1L << GLIBTOP_IPC_SEMMAP) + (1L << GLIBTOP_IPC_SEMMNI) + -(1L << GLIBTOP_IPC_SEMMNS) + (1L << GLIBTOP_IPC_SEMMNU) + -(1L << GLIBTOP_IPC_SEMMSL) + (1L << GLIBTOP_IPC_SEMOPM) + -(1L << GLIBTOP_IPC_SEMUME) + (1L << GLIBTOP_IPC_SEMUSZ) + -(1L << GLIBTOP_IPC_SEMVMX) + (1L << GLIBTOP_IPC_SEMAEM); +(1L << GLIBTOP_SEM_LIMITS_SEMMAP) + (1L << GLIBTOP_SEM_LIMITS_SEMMNI) + +(1L << GLIBTOP_SEM_LIMITS_SEMMNS) + (1L << GLIBTOP_SEM_LIMITS_SEMMNU) + +(1L << GLIBTOP_SEM_LIMITS_SEMMSL) + (1L << GLIBTOP_SEM_LIMITS_SEMOPM) + +(1L << GLIBTOP_SEM_LIMITS_SEMUME) + (1L << GLIBTOP_SEM_LIMITS_SEMUSZ) + +(1L << GLIBTOP_SEM_LIMITS_SEMVMX) + (1L << GLIBTOP_SEM_LIMITS_SEMAEM); /* Provides information about sysv sem limits. */ diff --git a/sysdeps/sun4/shm_limits.c b/sysdeps/sun4/shm_limits.c index 249dd414..56c40042 100644 --- a/sysdeps/sun4/shm_limits.c +++ b/sysdeps/sun4/shm_limits.c @@ -34,9 +34,9 @@ #include static unsigned long _glibtop_sysdeps_shm_limits = -(1L << GLIBTOP_IPC_SHMMAX) + (1L << GLIBTOP_IPC_SHMMIN) + -(1L << GLIBTOP_IPC_SHMMNI) + (1L << GLIBTOP_IPC_SHMSEG) + -(1L << GLIBTOP_IPC_SHMALL); +(1L << GLIBTOP_SHM_LIMITS_SHMMAX) + (1L << GLIBTOP_SHM_LIMITS_SHMMIN) + +(1L << GLIBTOP_SHM_LIMITS_SHMMNI) + (1L << GLIBTOP_SHM_LIMITS_SHMSEG) + +(1L << GLIBTOP_SHM_LIMITS_SHMALL); /* Provides information about sysv ipc limits. */