Changed struct's definitions to be one type-one member. To avoid problems

2006-04-18  German Poo-Caaman~o  <gpoo@ubiobio.cl>

	* /include/glibtop/cpu.h:
	* /include/glibtop/fsusage.h:
	* /include/glibtop/loadavg.h:
	* /include/glibtop/mem.h:
	* /include/glibtop/mountlist.h:
	* /include/glibtop/msg_limits.h:
	* /include/glibtop/netload.h:
	* /include/glibtop/ppp.h:
	* /include/glibtop/procargs.h:
	* /include/glibtop/prockernel.h:
	* /include/glibtop/proclist.h:
	* /include/glibtop/procmap.h:
	* /include/glibtop/procmem.h:
	* /include/glibtop/procopenfiles.h:
	* /include/glibtop/procsegment.h:
	* /include/glibtop/procsignal.h:
	* /include/glibtop/procstate.h:
	* /include/glibtop/proctime.h:
	* /include/glibtop/procuid.h:
	* /include/glibtop/sem_limits.h:
	* /include/glibtop/shm_limits.h:
	* /include/glibtop/swap.h:
	* /include/glibtop/sysdeps.h:
	* /include/glibtop/uptime.h:

	Changed struct's definitions to be one type-one member.  To
	avoid problems with any further gtk-doc's implementation.
This commit is contained in:
German Poo-Caaman~o
2006-04-18 20:17:25 +00:00
committed by Germán Poó Caamaño
parent 956527cb57
commit 05b94bd263
25 changed files with 242 additions and 204 deletions

View File

@@ -62,25 +62,25 @@ typedef struct _glibtop_cpu glibtop_cpu;
struct _glibtop_cpu
{
guint64 flags,
total, /* GLIBTOP_CPU_TOTAL */
user, /* GLIBTOP_CPU_USER */
nice, /* GLIBTOP_CPU_NICE */
sys, /* GLIBTOP_CPU_SYS */
idle, /* GLIBTOP_CPU_IDLE */
iowait, /* GLIBTOP_CPU_IOWAIT */
irq, /* GLIBTOP_CPU_IRQ */
softirq, /* GLIBTOP_CPU_SOFTIRQ */
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_iowait [GLIBTOP_NCPU], /* GLIBTOP_XCPU_IOWAIT */
xcpu_irq [GLIBTOP_NCPU], /* GLIBTOP_XCPU_IRQ */
xcpu_softirq [GLIBTOP_NCPU], /* GLIBTOP_XCPU_SOFTIRQ */
xcpu_flags; /* GLIBTOP_XCPU_IDLE */
guint64 flags;
guint64 total; /* GLIBTOP_CPU_TOTAL */
guint64 user; /* GLIBTOP_CPU_USER */
guint64 nice; /* GLIBTOP_CPU_NICE */
guint64 sys; /* GLIBTOP_CPU_SYS */
guint64 idle; /* GLIBTOP_CPU_IDLE */
guint64 iowait; /* GLIBTOP_CPU_IOWAIT */
guint64 irq; /* GLIBTOP_CPU_IRQ */
guint64 softirq; /* GLIBTOP_CPU_SOFTIRQ */
guint64 frequency; /* GLIBTOP_CPU_FREQUENCY */
guint64 xcpu_total [GLIBTOP_NCPU]; /* GLIBTOP_XCPU_TOTAL */
guint64 xcpu_user [GLIBTOP_NCPU]; /* GLIBTOP_XCPU_USER */
guint64 xcpu_nice [GLIBTOP_NCPU]; /* GLIBTOP_XCPU_NICE */
guint64 xcpu_sys [GLIBTOP_NCPU]; /* GLIBTOP_XCPU_SYS */
guint64 xcpu_idle [GLIBTOP_NCPU]; /* GLIBTOP_XCPU_IDLE */
guint64 xcpu_iowait [GLIBTOP_NCPU]; /* GLIBTOP_XCPU_IOWAIT */
guint64 xcpu_irq [GLIBTOP_NCPU]; /* GLIBTOP_XCPU_IRQ */
guint64 xcpu_softirq [GLIBTOP_NCPU]; /* GLIBTOP_XCPU_SOFTIRQ */
guint64 xcpu_flags; /* GLIBTOP_XCPU_IDLE */
};
void glibtop_get_cpu(glibtop_cpu *buf);

View File

@@ -43,12 +43,12 @@ typedef struct _glibtop_fsusage glibtop_fsusage;
struct _glibtop_fsusage
{
guint64 flags,
blocks, /* Total number of blocks. */
bfree, /* Free blocks available to superuser. */
bavail, /* Free blocks available to non-superuser. */
files, /* Total file nodes. */
ffree; /* Free file nodes. */
guint64 flags;
guint64 blocks; /* Total number of blocks. */
guint64 bfree; /* Free blocks available to superuser. */
guint64 bavail; /* Free blocks available to non-superuser. */
guint64 files; /* Total file nodes. */
guint64 ffree; /* Free file nodes. */
guint32 block_size; /* Size of a block in bytes. */
guint64 read, write; /* Total blocks read and written */
};

View File

@@ -42,9 +42,9 @@ struct _glibtop_loadavg
{
guint64 flags;
double loadavg [3]; /* GLIBTOP_LOADAVG_LOADAVG */
guint64 nr_running, /* GLIBTOP_LOADAVG_NR_RUNNING */
nr_tasks, /* GLIBTOP_LOADAVG_NR_TASKS */
last_pid; /* GLIBTOP_LOADAVG_LAST_PID */
guint64 nr_running; /* GLIBTOP_LOADAVG_NR_RUNNING */
guint64 nr_tasks; /* GLIBTOP_LOADAVG_NR_TASKS */
guint64 last_pid; /* GLIBTOP_LOADAVG_LAST_PID */
};
void glibtop_get_loadavg(glibtop_loadavg *buf);

View File

@@ -44,15 +44,15 @@ typedef struct _glibtop_mem glibtop_mem;
struct _glibtop_mem
{
guint64 flags,
total, /* GLIBTOP_MEM_TOTAL */
used, /* GLIBTOP_MEM_USED */
free, /* GLIBTOP_MEM_FREE */
shared, /* GLIBTOP_MEM_SHARED */
buffer, /* GLIBTOP_MEM_BUFFER */
cached, /* GLIBTOP_MEM_CACHED */
user, /* GLIBTOP_MEM_USER */
locked; /* GLIBTOP_MEM_LOCKED */
guint64 flags;
guint64 total; /* GLIBTOP_MEM_TOTAL */
guint64 used; /* GLIBTOP_MEM_USED */
guint64 free; /* GLIBTOP_MEM_FREE */
guint64 shared; /* GLIBTOP_MEM_SHARED */
guint64 buffer; /* GLIBTOP_MEM_BUFFER */
guint64 cached; /* GLIBTOP_MEM_CACHED */
guint64 user; /* GLIBTOP_MEM_USER */
guint64 locked; /* GLIBTOP_MEM_LOCKED */
};
void glibtop_get_mem(glibtop_mem *buf);

View File

@@ -49,10 +49,10 @@ struct _glibtop_mountentry
struct _glibtop_mountlist
{
guint64 flags,
number, /* GLIBTOP_MOUNTLIST_NUMBER */
total, /* GLIBTOP_MOUNTLIST_TOTAL */
size; /* GLIBTOP_MOUNTLIST_SIZE */
guint64 flags;
guint64 number; /* GLIBTOP_MOUNTLIST_NUMBER */
guint64 total; /* GLIBTOP_MOUNTLIST_TOTAL */
guint64 size; /* GLIBTOP_MOUNTLIST_SIZE */
};
glibtop_mountentry *

View File

@@ -43,14 +43,14 @@ typedef struct _glibtop_msg_limits glibtop_msg_limits;
struct _glibtop_msg_limits
{
guint64 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 */
guint64 flags;
guint64 msgpool; /* GLIBTOP_IPC_MSGPOOL */
guint64 msgmap; /* GLIBTOP_IPC_MSGMAP */
guint64 msgmax; /* GLIBTOP_IPC_MSGMAX */
guint64 msgmnb; /* GLIBTOP_IPC_MSGMNB */
guint64 msgmni; /* GLIBTOP_IPC_MSGMNI */
guint64 msgssz; /* GLIBTOP_IPC_MSGSSZ */
guint64 msgtql; /* GLIBTOP_IPC_MSGTQL */
};
void glibtop_get_msg_limits(glibtop_msg_limits *buf);

View File

@@ -82,23 +82,23 @@ enum GLIBTOP_IF_IN6_SCOPE
struct _glibtop_netload
{
guint64 flags,
if_flags; /* GLIBTOP_NETLOAD_IF_FLAGS */
guint64 flags;
guint64 if_flags; /* GLIBTOP_NETLOAD_IF_FLAGS */
guint32 mtu, /* GLIBTOP_NETLOAD_MTU */
subnet, /* GLIBTOP_NETLOAD_SUBNET */
address; /* GLIBTOP_NETLOAD_ADDRESS */
guint32 mtu; /* GLIBTOP_NETLOAD_MTU */
guint32 subnet; /* GLIBTOP_NETLOAD_SUBNET */
guint32 address; /* GLIBTOP_NETLOAD_ADDRESS */
guint64 packets_in, /* GLIBTOP_NETLOAD_PACKETS_IN */
packets_out, /* GLIBTOP_NETLOAD_PACKETS_OUT */
packets_total, /* GLIBTOP_NETLOAD_PACKETS_TOTAL*/
bytes_in, /* GLIBTOP_NETLOAD_BYTES_IN */
bytes_out, /* GLIBTOP_NETLOAD_BYTES_OUT */
bytes_total, /* GLIBTOP_NETLOAD_BYTES_TOTAL */
errors_in, /* GLIBTOP_NETLOAD_ERRORS_IN */
errors_out, /* GLIBTOP_NETLOAD_ERRORS_OUT */
errors_total, /* GLIBTOP_NETLOAD_ERRORS_TOTAL */
collisions; /* GLIBTOP_NETLOAD_COLLISIONS */
guint64 packets_in; /* GLIBTOP_NETLOAD_PACKETS_IN */
guint64 packets_out; /* GLIBTOP_NETLOAD_PACKETS_OUT */
guint64 packets_total; /* GLIBTOP_NETLOAD_PACKETS_TOTAL*/
guint64 bytes_in; /* GLIBTOP_NETLOAD_BYTES_IN */
guint64 bytes_out; /* GLIBTOP_NETLOAD_BYTES_OUT */
guint64 bytes_total; /* GLIBTOP_NETLOAD_BYTES_TOTAL */
guint64 errors_in; /* GLIBTOP_NETLOAD_ERRORS_IN */
guint64 errors_out; /* GLIBTOP_NETLOAD_ERRORS_OUT */
guint64 errors_total; /* GLIBTOP_NETLOAD_ERRORS_TOTAL */
guint64 collisions; /* GLIBTOP_NETLOAD_COLLISIONS */
guint8 address6[16]; /* GLIBTOP_NETLOAD_ADDRESS6 */
guint8 prefix6[16]; /* GLIBTOP_NETLOAD_PREXIF6 */

View File

@@ -45,10 +45,10 @@ enum {
struct _glibtop_ppp
{
guint64 flags,
state, /* GLIBTOP_PPP_STATE */
bytes_in, /* GLIBTOP_PPP_BYTES_IN */
bytes_out; /* GLIBTOP_PPP_BYTES_OUT */
guint64 flags;
guint64 state; /* GLIBTOP_PPP_STATE */
guint64 bytes_in; /* GLIBTOP_PPP_BYTES_IN */
guint64 bytes_out; /* GLIBTOP_PPP_BYTES_OUT */
};
void glibtop_get_ppp(glibtop_ppp *buf, unsigned short device);

View File

@@ -37,8 +37,8 @@ typedef struct _glibtop_proc_args glibtop_proc_args;
struct _glibtop_proc_args
{
guint64 flags,
size; /* GLIBTOP_PROC_ARGS_SIZE */
guint64 flags;
guint64 size; /* GLIBTOP_PROC_ARGS_SIZE */
};

View File

@@ -48,18 +48,18 @@ typedef struct _glibtop_proc_kernel glibtop_proc_kernel;
struct _glibtop_proc_kernel
{
guint64 flags;
guint64 k_flags, /* kernel flags for the process */
min_flt, /* number of minor page faults since
guint64 k_flags; /* kernel flags for the process */
guint64 min_flt; /* number of minor page faults since
* process start */
maj_flt, /* number of major page faults since
guint64 maj_flt; /* number of major page faults since
* process start */
cmin_flt, /* cumulative min_flt of process and
guint64 cmin_flt; /* cumulative min_flt of process and
* child processes */
cmaj_flt, /* cumulative maj_flt of process and
guint64 cmaj_flt; /* cumulative maj_flt of process and
* child processes */
kstk_esp, /* kernel stack pointer */
kstk_eip, /* kernel stack pointer */
nwchan; /* address of kernel wait channel
guint64 kstk_esp; /* kernel stack pointer */
guint64 kstk_eip; /* kernel stack pointer */
guint64 nwchan; /* address of kernel wait channel
* proc is sleeping in */
char wchan [40];
};

View File

@@ -56,10 +56,10 @@ typedef struct _glibtop_proclist glibtop_proclist;
struct _glibtop_proclist
{
guint64 flags,
number, /* GLIBTOP_PROCLIST_NUMBER */
total, /* GLIBTOP_PROCLIST_TOTAL */
size; /* GLIBTOP_PROCLIST_SIZE */
guint64 flags;
guint64 number; /* GLIBTOP_PROCLIST_NUMBER */
guint64 total; /* GLIBTOP_PROCLIST_TOTAL */
guint64 size; /* GLIBTOP_PROCLIST_SIZE */
};
unsigned *

View File

@@ -67,20 +67,28 @@ typedef struct _glibtop_proc_map glibtop_proc_map;
struct _glibtop_map_entry
{
guint64 flags, start, end, offset, perm, inode, device;
guint64 size,
rss,
shared_clean, shared_dirty,
private_clean, private_dirty;
guint64 flags;
guint64 start;
guint64 end;
guint64 offset;
guint64 perm;
guint64 inode;
guint64 device;
guint64 size;
guint64 rss;
guint64 shared_clean;
guint64 shared_dirty;
guint64 private_clean;
guint64 private_dirty;
char filename [GLIBTOP_MAP_FILENAME_LEN+1];
};
struct _glibtop_proc_map
{
guint64 flags,
number, /* GLIBTOP_PROC_MAP_NUMBER */
total, /* GLIBTOP_PROC_MAP_TOTAL */
size; /* GLIBTOP_PROC_MAP_SIZE */
guint64 flags;
guint64 number; /* GLIBTOP_PROC_MAP_NUMBER */
guint64 total; /* GLIBTOP_PROC_MAP_TOTAL */
guint64 size; /* GLIBTOP_PROC_MAP_SIZE */
};
glibtop_map_entry *
glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid);

View File

@@ -44,14 +44,14 @@ typedef struct _glibtop_proc_mem glibtop_proc_mem;
struct _glibtop_proc_mem
{
guint64 flags,
size, /* total # of pages of memory */
vsize, /* number of pages of virtual memory ... */
resident, /* number of resident set
guint64 flags;
guint64 size; /* total # of pages of memory */
guint64 vsize; /* number of pages of virtual memory ... */
guint64 resident; /* number of resident set
* (non-swapped) pages (4k) */
share, /* number of pages of shared (mmap'd) memory */
rss, /* resident set size */
rss_rlim; /* current limit (in bytes) of the rss
guint64 share; /* number of pages of shared (mmap'd) memory */
guint64 rss; /* resident set size */
guint64 rss_rlim; /* current limit (in bytes) of the rss
* of the process; usually 2,147,483,647 */
};

View File

@@ -88,10 +88,10 @@ struct _glibtop_open_files_entry
struct _glibtop_proc_open_files
{
guint64 flags,
number, /* GLIBTOP_PROC_OPEN_FILES_NUMBER */
total, /* GLIBTOP_PROC_OPEN_FILES_TOTAL */
size; /* GLIBTOP_PROC_OPEN_FILES_SIZE */
guint64 flags;
guint64 number; /* GLIBTOP_PROC_OPEN_FILES_NUMBER */
guint64 total; /* GLIBTOP_PROC_OPEN_FILES_TOTAL */
guint64 size; /* GLIBTOP_PROC_OPEN_FILES_SIZE */
};
glibtop_open_files_entry *

View File

@@ -46,16 +46,16 @@ typedef struct _glibtop_proc_segment glibtop_proc_segment;
struct _glibtop_proc_segment
{
guint64 flags,
text_rss, /* text resident set size */
shlib_rss, /* shared-lib resident set size */
data_rss, /* data resident set size */
stack_rss, /* stack resident set size */
dirty_size, /* size of dirty pages */
start_code,
guint64 flags;
guint64 text_rss; /* text resident set size */
guint64 shlib_rss; /* shared-lib resident set size */
guint64 data_rss; /* data resident set size */
guint64 stack_rss; /* stack resident set size */
guint64 dirty_size; /* size of dirty pages */
guint64 start_code;
/* address of beginning of code segment */
end_code, /* address of end of code segment */
start_stack; /* address of the bottom of stack segment */
guint64 end_code; /* address of end of code segment */
guint64 start_stack; /* address of the bottom of stack segment */
};
void glibtop_get_proc_segment(glibtop_proc_segment *buf, pid_t pid);

View File

@@ -42,11 +42,11 @@ typedef struct _glibtop_proc_signal glibtop_proc_signal;
struct _glibtop_proc_signal
{
guint64 flags,
signal [2], /* mask of pending signals */
blocked [2], /* mask of blocked signals */
sigignore [2], /* mask of ignored signals */
sigcatch [2]; /* mask of caught signals */
guint64 flags;
guint64 signal [2]; /* mask of pending signals */
guint64 blocked [2]; /* mask of blocked signals */
guint64 sigignore [2]; /* mask of ignored signals */
guint64 sigcatch [2]; /* mask of caught signals */
};
void glibtop_get_proc_signal(glibtop_proc_signal *buf, pid_t pid);

View File

@@ -65,13 +65,13 @@ struct _glibtop_proc_state
/* IMPORTANT NOTICE: For security reasons, it is extremely important
* only to set the flags value for those two
* fields if their values are corrent ! */
int uid, /* UID of process */
gid, /* GID of process */
ruid,
rgid;
int has_cpu,
processor,
last_processor;
int uid; /* UID of process */
int gid; /* GID of process */
int ruid;
int rgid;
int has_cpu;
int processor;
int last_processor;
};
void glibtop_get_proc_state(glibtop_proc_state *buf, pid_t pid);

View File

@@ -50,24 +50,24 @@ typedef struct _glibtop_proc_time glibtop_proc_time;
struct _glibtop_proc_time
{
guint64 flags,
start_time, /* start time of process --
guint64 flags;
guint64 start_time; /* start time of process --
* seconds since 1-1-70 */
rtime, /* real time accumulated by process */
utime, /* user-mode CPU time accumulated by process */
stime, /* kernel-mode CPU time accumulated by process */
cutime, /* cumulative utime of process and
guint64 rtime; /* real time accumulated by process */
guint64 utime; /* user-mode CPU time accumulated by process */
guint64 stime; /* kernel-mode CPU time accumulated by process */
guint64 cutime; /* cumulative utime of process and
* reaped children */
cstime, /* cumulative stime of process and
guint64 cstime; /* cumulative stime of process and
* reaped children */
timeout, /* The time (in jiffies) of the process's
guint64 timeout; /* The time (in jiffies) of the process's
* next timeout */
it_real_value, /* The time (in jiffies) before the
guint64 it_real_value; /* The time (in jiffies) before the
* next SIGALRM is sent to the process
* due to an interval timer. */
frequency, /* Tick frequency. */
xcpu_utime [GLIBTOP_NCPU], /* utime and stime for all CPUs on */
xcpu_stime [GLIBTOP_NCPU]; /* SMP machines. */
guint64 frequency; /* Tick frequency. */
guint64 xcpu_utime [GLIBTOP_NCPU]; /* utime and stime for all CPUs on */
guint64 xcpu_stime [GLIBTOP_NCPU]; /* SMP machines. */
};

View File

@@ -59,24 +59,24 @@ typedef struct _glibtop_proc_uid glibtop_proc_uid;
struct _glibtop_proc_uid
{
guint64 flags;
gint32 uid, /* user id */
euid, /* effective user id */
gid, /* group id */
egid, /* effective group id */
suid, /* set user id */
sgid, /* set group id */
fsuid, /* ??? user id */
fsgid, /* ??? group id */
pid, /* process id */
ppid, /* pid of parent process */
pgrp, /* process group id */
session, /* session id */
tty, /* full device number of controlling terminal */
tpgid, /* terminal process group id */
priority, /* kernel scheduling priority */
nice, /* standard unix nice level of process */
ngroups,
groups [GLIBTOP_MAX_GROUPS];
gint32 uid; /* user id */
gint32 euid; /* effective user id */
gint32 gid; /* group id */
gint32 egid; /* effective group id */
gint32 suid; /* set user id */
gint32 sgid; /* set group id */
gint32 fsuid; /* ??? user id */
gint32 fsgid; /* ??? group id */
gint32 pid; /* process id */
gint32 ppid; /* pid of parent process */
gint32 pgrp; /* process group id */
gint32 session; /* session id */
gint32 tty; /* full device number of controlling terminal */
gint32 tpgid; /* terminal process group id */
gint32 priority; /* kernel scheduling priority */
gint32 nice; /* standard unix nice level of process */
gint32 ngroups;
gint32 groups [GLIBTOP_MAX_GROUPS];
};

View File

@@ -46,17 +46,17 @@ typedef struct _glibtop_sem_limits glibtop_sem_limits;
struct _glibtop_sem_limits
{
guint64 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 */
guint64 flags;
guint64 semmap; /* GLIBTOP_IPC_SEMMAP */
guint64 semmni; /* GLIBTOP_IPC_SEMMNI */
guint64 semmns; /* GLIBTOP_IPC_SEMMNS */
guint64 semmnu; /* GLIBTOP_IPC_SEMMNU */
guint64 semmsl; /* GLIBTOP_IPC_SEMMSL */
guint64 semopm; /* GLIBTOP_IPC_SEMOPM */
guint64 semume; /* GLIBTOP_IPC_SEMUME */
guint64 semusz; /* GLIBTOP_IPC_SEMUSZ */
guint64 semvmx; /* GLIBTOP_IPC_SEMVMX */
guint64 semaem; /* GLIBTOP_IPC_SEMAEM */
};
void glibtop_get_sem_limits(glibtop_sem_limits *buf);

View File

@@ -41,12 +41,12 @@ typedef struct _glibtop_shm_limits glibtop_shm_limits;
struct _glibtop_shm_limits
{
guint64 flags,
shmmax, /* GLIBTOP_IPC_SHMMAX */
shmmin, /* GLIBTOP_IPC_SHMMIN */
shmmni, /* GLIBTOP_IPC_SHMMNI */
shmseg, /* GLIBTOP_IPC_SHMSEG */
shmall; /* GLIBTOP_IPC_SHMALL */
guint64 flags;
guint64 shmmax; /* GLIBTOP_IPC_SHMMAX */
guint64 shmmin; /* GLIBTOP_IPC_SHMMIN */
guint64 shmmni; /* GLIBTOP_IPC_SHMMNI */
guint64 shmseg; /* GLIBTOP_IPC_SHMSEG */
guint64 shmall; /* GLIBTOP_IPC_SHMALL */
};
void glibtop_get_shm_limits(glibtop_shm_limits *buf);

View File

@@ -41,12 +41,12 @@ typedef struct _glibtop_swap glibtop_swap;
struct _glibtop_swap
{
guint64 flags,
total, /* GLIBTOP_SWAP_TOTAL */
used, /* GLIBTOP_SWAP_USED */
free, /* GLIBTOP_SWAP_FREE */
pagein, /* GLIBTOP_SWAP_PAGEIN */
pageout; /* GLIBTOP_SWAP_PAGEOUT */
guint64 flags;
guint64 total; /* GLIBTOP_SWAP_TOTAL */
guint64 used; /* GLIBTOP_SWAP_USED */
guint64 free; /* GLIBTOP_SWAP_FREE */
guint64 pagein; /* GLIBTOP_SWAP_PAGEIN */
guint64 pageout; /* GLIBTOP_SWAP_PAGEOUT */
};
void

View File

@@ -62,32 +62,32 @@ typedef struct _glibtop_sysdeps glibtop_sysdeps;
struct _glibtop_sysdeps
{
guint64 flags,
features, /* server features */
cpu, /* glibtop_cpu */
mem, /* glibtop_mem */
swap, /* glibtop_swap */
uptime, /* glibtop_uptime */
loadavg, /* glibtop_loadavg */
shm_limits, /* glibtop_shm_limits */
msg_limits, /* glibtop_msg_limits */
sem_limits, /* glibtop_sem_limits */
proclist, /* glibtop_proclist */
proc_state, /* glibtop_proc_state */
proc_uid, /* glibtop_proc_uid */
proc_mem, /* glibtop_proc_mem */
proc_time, /* glibtop_proc_time */
proc_signal, /* glibtop_proc_signal */
proc_kernel, /* glibtop_proc_kernel */
proc_segment, /* glibtop_proc_segment */
proc_args, /* glibtop_proc_args */
proc_map, /* glibtop_proc_map */
proc_open_files, /* glibtop_proc_open_files */
mountlist, /* glibtop_mountlist */
fsusage, /* glibtop_fsusage */
netlist, /* glibtop_netlist */
netload, /* glibtop_netload */
ppp; /* glibtop_ppp */
guint64 flags;
guint64 features; /* server features */
guint64 cpu; /* glibtop_cpu */
guint64 mem; /* glibtop_mem */
guint64 swap; /* glibtop_swap */
guint64 uptime; /* glibtop_uptime */
guint64 loadavg; /* glibtop_loadavg */
guint64 shm_limits; /* glibtop_shm_limits */
guint64 msg_limits; /* glibtop_msg_limits */
guint64 sem_limits; /* glibtop_sem_limits */
guint64 proclist; /* glibtop_proclist */
guint64 proc_state; /* glibtop_proc_state */
guint64 proc_uid; /* glibtop_proc_uid */
guint64 proc_mem; /* glibtop_proc_mem */
guint64 proc_time; /* glibtop_proc_time */
guint64 proc_signal; /* glibtop_proc_signal */
guint64 proc_kernel; /* glibtop_proc_kernel */
guint64 proc_segment; /* glibtop_proc_segment */
guint64 proc_args; /* glibtop_proc_args */
guint64 proc_map; /* glibtop_proc_map */
guint64 proc_open_files; /* glibtop_proc_open_files */
guint64 mountlist; /* glibtop_mountlist */
guint64 fsusage; /* glibtop_fsusage */
guint64 netlist; /* glibtop_netlist */
guint64 netload; /* glibtop_netload */
guint64 ppp; /* glibtop_ppp */
};
void glibtop_get_sysdeps (glibtop_sysdeps *buf);

View File

@@ -40,8 +40,8 @@ typedef struct _glibtop_uptime glibtop_uptime;
struct _glibtop_uptime
{
guint64 flags;
double uptime, /* GLIBTOP_UPTIME_UPTIME */
idletime; /* GLIBTOP_UPTIME_IDLETIME */
double uptime; /* GLIBTOP_UPTIME_UPTIME */
double idletime; /* GLIBTOP_UPTIME_IDLETIME */
guint64 boot_time;
};