From be7dabf75d9b1949427cacdc645e95373d754574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Dejean?= Date: Tue, 7 Jun 2005 09:54:44 +0000 Subject: [PATCH] Added a lot of new functions to replace dirty macros. Every macro * configure.in: * glibtop.h: * include/glibtop/close.h: * 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/netlist.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/sysinfo.h: * include/glibtop/uptime.h: * sysdeps/common/Makefile.am: * sysdeps/common/default.c: (glibtop_close), (glibtop_init), (glibtop_get_cpu), (glibtop_get_fsusage), (glibtop_get_uptime), (glibtop_get_sysinfo), (glibtop_get_swap), (glibtop_get_proc_uid), (glibtop_get_proc_time), (glibtop_get_proc_state), (glibtop_get_proc_signal), (glibtop_get_proc_segment), (glibtop_get_proc_open_files), (glibtop_get_proc_mem), (glibtop_get_proc_map), (glibtop_get_proc_args), (glibtop_get_proc_argv), (glibtop_get_proclist), (glibtop_get_proc_kernel), (glibtop_get_ppp), (glibtop_get_netlist), (glibtop_get_netload), (glibtop_get_mountlist), (glibtop_get_mem), (glibtop_get_loadavg), (glibtop_get_msg_limits), (glibtop_get_sem_limits), (glibtop_get_shm_limits), (glibtop_get_sysdeps): Added a lot of new functions to replace dirty macros. Every macro glibtop_get_*(buf[, args]) has been turned to a function. --- ChangeLog | 49 ++++++++ configure.in | 4 +- glibtop.h | 5 +- include/glibtop/close.h | 2 + include/glibtop/cpu.h | 2 +- include/glibtop/fsusage.h | 2 +- include/glibtop/loadavg.h | 2 +- include/glibtop/mem.h | 2 +- include/glibtop/mountlist.h | 3 +- include/glibtop/msg_limits.h | 2 +- include/glibtop/netlist.h | 2 +- include/glibtop/netload.h | 2 +- include/glibtop/ppp.h | 2 +- include/glibtop/procargs.h | 9 +- include/glibtop/prockernel.h | 2 +- include/glibtop/proclist.h | 3 +- include/glibtop/procmap.h | 3 +- include/glibtop/procmem.h | 2 +- include/glibtop/procopenfiles.h | 3 +- include/glibtop/procsegment.h | 2 +- include/glibtop/procsignal.h | 2 +- include/glibtop/procstate.h | 2 +- include/glibtop/proctime.h | 3 +- include/glibtop/procuid.h | 2 +- include/glibtop/sem_limits.h | 2 +- include/glibtop/shm_limits.h | 2 +- include/glibtop/swap.h | 3 +- include/glibtop/sysdeps.h | 3 +- include/glibtop/sysinfo.h | 3 +- include/glibtop/uptime.h | 2 +- sysdeps/common/Makefile.am | 1 + sysdeps/common/default.c | 212 ++++++++++++++++++++++++++++++++ 32 files changed, 303 insertions(+), 37 deletions(-) create mode 100644 sysdeps/common/default.c diff --git a/ChangeLog b/ChangeLog index 9d3921f5..6cb89f9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,52 @@ +2005-06-07 Benoît Dejean + + * configure.in: + * glibtop.h: + * include/glibtop/close.h: + * 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/netlist.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/sysinfo.h: + * include/glibtop/uptime.h: + * sysdeps/common/Makefile.am: + * sysdeps/common/default.c: (glibtop_close), (glibtop_init), + (glibtop_get_cpu), (glibtop_get_fsusage), (glibtop_get_uptime), + (glibtop_get_sysinfo), (glibtop_get_swap), (glibtop_get_proc_uid), + (glibtop_get_proc_time), (glibtop_get_proc_state), + (glibtop_get_proc_signal), (glibtop_get_proc_segment), + (glibtop_get_proc_open_files), (glibtop_get_proc_mem), + (glibtop_get_proc_map), (glibtop_get_proc_args), + (glibtop_get_proc_argv), (glibtop_get_proclist), + (glibtop_get_proc_kernel), (glibtop_get_ppp), + (glibtop_get_netlist), (glibtop_get_netload), + (glibtop_get_mountlist), (glibtop_get_mem), (glibtop_get_loadavg), + (glibtop_get_msg_limits), (glibtop_get_sem_limits), + (glibtop_get_shm_limits), (glibtop_get_sysdeps): + + Added a lot of new functions to replace dirty macros. + Every macro glibtop_get_*(buf[, args]) has been turned to a function. + 2005-06-06 Benoît Dejean * dtd/: Bye bye. diff --git a/configure.in b/configure.in index ce5e94a8..e9771b2d 100644 --- a/configure.in +++ b/configure.in @@ -13,7 +13,7 @@ LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VER AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION) dnl increment if the interface has additions, changes, removals. -LIBGTOP_CURRENT=5 +LIBGTOP_CURRENT=6 dnl increment any time the source changes; set to dnl 0 if you increment CURRENT @@ -22,7 +22,7 @@ LIBGTOP_REVISION=0 dnl increment if any interfaces have been added; set to 0 dnl if any interfaces have been removed. removal has dnl precedence over adding, so set to 0 if both happened. -LIBGTOP_AGE=0 +LIBGTOP_AGE=1 # you can set this to `-snap' for instance to create # a `libgtop-1.x.y-snap.tar.gz' tarball. diff --git a/glibtop.h b/glibtop.h index 4b4da1aa..dced6d77 100644 --- a/glibtop.h +++ b/glibtop.h @@ -94,9 +94,8 @@ extern glibtop *glibtop_global_server; extern const unsigned long glibtop_server_features; -#define glibtop_init() glibtop_init_r(&glibtop_global_server, 0, 0); - -#define glibtop_close() glibtop_close_r(glibtop_global_server); +glibtop * +glibtop_init (void); glibtop * glibtop_init_r (glibtop **server_ptr, diff --git a/include/glibtop/close.h b/include/glibtop/close.h index 2408aec8..42b01496 100644 --- a/include/glibtop/close.h +++ b/include/glibtop/close.h @@ -28,6 +28,8 @@ G_BEGIN_DECLS +void glibtop_close (void); + void glibtop_close_r (glibtop *server); void glibtop_close_s (glibtop *server); diff --git a/include/glibtop/cpu.h b/include/glibtop/cpu.h index 3de3a4c4..3b2d5537 100644 --- a/include/glibtop/cpu.h +++ b/include/glibtop/cpu.h @@ -80,7 +80,7 @@ struct _glibtop_cpu xcpu_flags; /* GLIBTOP_XCPU_IDLE */ }; -#define glibtop_get_cpu(cpu) glibtop_get_cpu_l(glibtop_global_server, cpu) +void glibtop_get_cpu(glibtop_cpu *buf); #if GLIBTOP_SUID_CPU #define glibtop_get_cpu_r glibtop_get_cpu_p diff --git a/include/glibtop/fsusage.h b/include/glibtop/fsusage.h index d52a025e..545addee 100644 --- a/include/glibtop/fsusage.h +++ b/include/glibtop/fsusage.h @@ -53,7 +53,7 @@ struct _glibtop_fsusage guint64 read, write; /* Total blocks read and written */ }; -#define glibtop_get_fsusage(fsusage,disk) glibtop_get_fsusage_l(glibtop_global_server, fsusage, disk) +void glibtop_get_fsusage(glibtop_fsusage *buf, const char *mount_dir); #define glibtop_get_fsusage_r glibtop_get_fsusage_s diff --git a/include/glibtop/loadavg.h b/include/glibtop/loadavg.h index 855c3e5b..72c8eb32 100644 --- a/include/glibtop/loadavg.h +++ b/include/glibtop/loadavg.h @@ -47,7 +47,7 @@ struct _glibtop_loadavg last_pid; /* GLIBTOP_LOADAVG_LAST_PID */ }; -#define glibtop_get_loadavg(loadavg) glibtop_get_loadavg_l(glibtop_global_server, loadavg) +void glibtop_get_loadavg(glibtop_loadavg *buf); #if GLIBTOP_SUID_LOADAVG #define glibtop_get_loadavg_r glibtop_get_loadavg_p diff --git a/include/glibtop/mem.h b/include/glibtop/mem.h index b23480b6..0a871dbc 100644 --- a/include/glibtop/mem.h +++ b/include/glibtop/mem.h @@ -55,7 +55,7 @@ struct _glibtop_mem locked; /* GLIBTOP_MEM_LOCKED */ }; -#define glibtop_get_mem(mem) glibtop_get_mem_l(glibtop_global_server, mem) +void glibtop_get_mem(glibtop_mem *buf); #if GLIBTOP_SUID_MEM #define glibtop_get_mem_r glibtop_get_mem_p diff --git a/include/glibtop/mountlist.h b/include/glibtop/mountlist.h index cd92e186..ee0e1ea8 100644 --- a/include/glibtop/mountlist.h +++ b/include/glibtop/mountlist.h @@ -55,7 +55,8 @@ struct _glibtop_mountlist size; /* GLIBTOP_MOUNTLIST_SIZE */ }; -#define glibtop_get_mountlist(mountlist,all_fs) glibtop_get_mountlist_l(glibtop_global_server, mountlist, all_fs) +glibtop_mountentry * +glibtop_get_mountlist(glibtop_mountlist *buf, int all_fs); #define glibtop_get_mountlist_r glibtop_get_mountlist_s diff --git a/include/glibtop/msg_limits.h b/include/glibtop/msg_limits.h index 966020d2..8f76e51a 100644 --- a/include/glibtop/msg_limits.h +++ b/include/glibtop/msg_limits.h @@ -53,7 +53,7 @@ struct _glibtop_msg_limits msgtql; /* GLIBTOP_IPC_MSGTQL */ }; -#define glibtop_get_msg_limits(msg) glibtop_get_msg_limits_l(glibtop_global_server, msg) +void glibtop_get_msg_limits(glibtop_msg_limits *buf); #if GLIBTOP_SUID_MSG_LIMITS #define glibtop_get_msg_limits_r glibtop_get_msg_limits_p diff --git a/include/glibtop/netlist.h b/include/glibtop/netlist.h index 39c72a1b..6f174d0e 100644 --- a/include/glibtop/netlist.h +++ b/include/glibtop/netlist.h @@ -37,7 +37,7 @@ struct _glibtop_netlist guint32 number; }; -#define glibtop_get_netlist(netlist) glibtop_get_netlist_l(glibtop_global_server, netlist) +char** glibtop_get_netlist(glibtop_netlist *buf); #if GLIBTOP_SUID_NETLIST #define glibtop_get_netlist_r glibtop_get_netlist_p diff --git a/include/glibtop/netload.h b/include/glibtop/netload.h index 57cdcf7e..66aec8f7 100644 --- a/include/glibtop/netload.h +++ b/include/glibtop/netload.h @@ -107,7 +107,7 @@ struct _glibtop_netload guint8 hwaddress[8]; /* GLIBTOP_NETLOAD_HWADDRESS */ }; -#define glibtop_get_netload(netload,interface) glibtop_get_netload_l(glibtop_global_server, netload, interface) +void glibtop_get_netload(glibtop_netload *buf, const char *interface); #if GLIBTOP_SUID_NETLOAD #define glibtop_get_netload_r glibtop_get_netload_p diff --git a/include/glibtop/ppp.h b/include/glibtop/ppp.h index 6c200acc..852e6d9d 100644 --- a/include/glibtop/ppp.h +++ b/include/glibtop/ppp.h @@ -51,7 +51,7 @@ struct _glibtop_ppp bytes_out; /* GLIBTOP_PPP_BYTES_OUT */ }; -#define glibtop_get_ppp(ppp,device) glibtop_get_ppp_l(glibtop_global_server, ppp, device) +void glibtop_get_ppp(glibtop_ppp *buf, unsigned short device); #if GLIBTOP_SUID_PPP #define glibtop_get_ppp_r glibtop_get_ppp_p diff --git a/include/glibtop/procargs.h b/include/glibtop/procargs.h index 87935915..b930836c 100644 --- a/include/glibtop/procargs.h +++ b/include/glibtop/procargs.h @@ -46,9 +46,8 @@ char * glibtop_get_proc_args_l (glibtop *server, glibtop_proc_args *buf, pid_t pid, unsigned max_len); -#define glibtop_get_proc_args(proc_args,pid,max_len) glibtop_get_proc_args_l(glibtop_global_server, proc_args, pid, max_len) - - +char * +glibtop_get_proc_args (glibtop_proc_args *buf, pid_t pid, unsigned max_len); #if GLIBTOP_SUID_PROC_ARGS @@ -82,8 +81,8 @@ char ** glibtop_get_proc_argv_l (glibtop *server, glibtop_proc_args *buf, pid_t pid, unsigned max_len); -#define glibtop_get_proc_argv(proc_args,pid,max_len) glibtop_get_proc_argv_l(glibtop_global_server, proc_args, pid, max_len) - +char ** +glibtop_get_proc_argv (glibtop_proc_args *buf, pid_t pid, unsigned max_len); G_END_DECLS diff --git a/include/glibtop/prockernel.h b/include/glibtop/prockernel.h index 18506726..53d95eda 100644 --- a/include/glibtop/prockernel.h +++ b/include/glibtop/prockernel.h @@ -64,7 +64,7 @@ struct _glibtop_proc_kernel char wchan [40]; }; -#define glibtop_get_proc_kernel(p1, p2) glibtop_get_proc_kernel_l(glibtop_global_server, p1, p2) +void glibtop_get_proc_kernel(glibtop_proc_kernel *buf, pid_t pid); #if GLIBTOP_SUID_PROC_KERNEL #define glibtop_get_proc_kernel_r glibtop_get_proc_kernel_p diff --git a/include/glibtop/proclist.h b/include/glibtop/proclist.h index 7bf2bbda..0db22a62 100644 --- a/include/glibtop/proclist.h +++ b/include/glibtop/proclist.h @@ -62,7 +62,8 @@ struct _glibtop_proclist size; /* GLIBTOP_PROCLIST_SIZE */ }; -#define glibtop_get_proclist(proclist,which,arg) glibtop_get_proclist_l(glibtop_global_server, proclist, which, arg) +unsigned * +glibtop_get_proclist(glibtop_proclist *buf, gint64 which, gint64 arg); #if GLIBTOP_SUID_PROCLIST #define glibtop_get_proclist_r glibtop_get_proclist_p diff --git a/include/glibtop/procmap.h b/include/glibtop/procmap.h index 882651b3..4a3e3083 100644 --- a/include/glibtop/procmap.h +++ b/include/glibtop/procmap.h @@ -70,8 +70,9 @@ struct _glibtop_proc_map total, /* GLIBTOP_PROC_MAP_TOTAL */ size; /* GLIBTOP_PROC_MAP_SIZE */ }; +glibtop_map_entry * +glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid); -#define glibtop_get_proc_map(proc_map,pid) glibtop_get_proc_map_l(glibtop_global_server, proc_map, pid) #if GLIBTOP_SUID_PROC_MAP #define glibtop_get_proc_map_r glibtop_get_proc_map_p diff --git a/include/glibtop/procmem.h b/include/glibtop/procmem.h index cec552c0..3932103d 100644 --- a/include/glibtop/procmem.h +++ b/include/glibtop/procmem.h @@ -55,7 +55,7 @@ struct _glibtop_proc_mem * of the process; usually 2,147,483,647 */ }; -#define glibtop_get_proc_mem(p1, p2) glibtop_get_proc_mem_l(glibtop_global_server, p1, p2) +void glibtop_get_proc_mem(glibtop_proc_mem *buf, pid_t pid); #if GLIBTOP_SUID_PROC_MEM #define glibtop_get_proc_mem_r glibtop_get_proc_mem_p diff --git a/include/glibtop/procopenfiles.h b/include/glibtop/procopenfiles.h index 6e47ba1a..fd5c7360 100644 --- a/include/glibtop/procopenfiles.h +++ b/include/glibtop/procopenfiles.h @@ -94,7 +94,8 @@ struct _glibtop_proc_open_files size; /* GLIBTOP_PROC_OPEN_FILES_SIZE */ }; -#define glibtop_get_proc_open_files(proc_open_files,pid) glibtop_get_proc_open_files_l(glibtop_global_server, proc_open_files, pid) +glibtop_open_files_entry * +glibtop_get_proc_open_files(glibtop_proc_open_files *buf, pid_t pid); #if GLIBTOP_SUID_PROC_FILE #define glibtop_get_proc_open_files_r glibtop_get_proc_open_files_p diff --git a/include/glibtop/procsegment.h b/include/glibtop/procsegment.h index d4382a39..f932d331 100644 --- a/include/glibtop/procsegment.h +++ b/include/glibtop/procsegment.h @@ -58,7 +58,7 @@ struct _glibtop_proc_segment start_stack; /* address of the bottom of stack segment */ }; -#define glibtop_get_proc_segment(p1, p2) glibtop_get_proc_segment_l(glibtop_global_server, p1, p2) +void glibtop_get_proc_segment(glibtop_proc_segment *buf, pid_t pid); #if GLIBTOP_SUID_PROC_SEGMENT #define glibtop_get_proc_segment_r glibtop_get_proc_segment_p diff --git a/include/glibtop/procsignal.h b/include/glibtop/procsignal.h index 070efb5e..650eb8cf 100644 --- a/include/glibtop/procsignal.h +++ b/include/glibtop/procsignal.h @@ -49,7 +49,7 @@ struct _glibtop_proc_signal sigcatch [2]; /* mask of caught signals */ }; -#define glibtop_get_proc_signal(p1, p2) glibtop_get_proc_signal_l(glibtop_global_server, p1, p2) +void glibtop_get_proc_signal(glibtop_proc_signal *buf, pid_t pid); #if GLIBTOP_SUID_PROC_SIGNAL #define glibtop_get_proc_signal_r glibtop_get_proc_signal_p diff --git a/include/glibtop/procstate.h b/include/glibtop/procstate.h index 89e7b165..4009244c 100644 --- a/include/glibtop/procstate.h +++ b/include/glibtop/procstate.h @@ -74,7 +74,7 @@ struct _glibtop_proc_state last_processor; }; -#define glibtop_get_proc_state(p1, p2) glibtop_get_proc_state_l(glibtop_global_server, p1, p2) +void glibtop_get_proc_state(glibtop_proc_state *buf, pid_t pid); #if GLIBTOP_SUID_PROC_STATE #define glibtop_get_proc_state_r glibtop_get_proc_state_p diff --git a/include/glibtop/proctime.h b/include/glibtop/proctime.h index 66d6d978..9bde2b11 100644 --- a/include/glibtop/proctime.h +++ b/include/glibtop/proctime.h @@ -70,7 +70,8 @@ struct _glibtop_proc_time xcpu_stime [GLIBTOP_NCPU]; /* SMP machines. */ }; -#define glibtop_get_proc_time(p1, p2) glibtop_get_proc_time_l(glibtop_global_server, p1, p2) + +void glibtop_get_proc_time(glibtop_proc_time *buf, pid_t pid); #if GLIBTOP_SUID_PROC_TIME #define glibtop_get_proc_time_r glibtop_get_proc_time_p diff --git a/include/glibtop/procuid.h b/include/glibtop/procuid.h index 414b0f59..36e87ec0 100644 --- a/include/glibtop/procuid.h +++ b/include/glibtop/procuid.h @@ -80,7 +80,7 @@ struct _glibtop_proc_uid }; -#define glibtop_get_proc_uid(p1, p2) glibtop_get_proc_uid_l(glibtop_global_server, p1, p2) +void glibtop_get_proc_uid(glibtop_proc_uid *buf, pid_t pid); #if GLIBTOP_SUID_PROC_UID #define glibtop_get_proc_uid_r glibtop_get_proc_uid_p diff --git a/include/glibtop/sem_limits.h b/include/glibtop/sem_limits.h index 5fae4a25..6906dc1f 100644 --- a/include/glibtop/sem_limits.h +++ b/include/glibtop/sem_limits.h @@ -59,7 +59,7 @@ struct _glibtop_sem_limits semaem; /* GLIBTOP_IPC_SEMAEM */ }; -#define glibtop_get_sem_limits(sem) glibtop_get_sem_limits_l(glibtop_global_server, sem) +void glibtop_get_sem_limits(glibtop_sem_limits *buf); #if GLIBTOP_SUID_SEM_LIMITS #define glibtop_get_sem_limits_r glibtop_get_sem_limits_p diff --git a/include/glibtop/shm_limits.h b/include/glibtop/shm_limits.h index 0935d2c8..8d00e254 100644 --- a/include/glibtop/shm_limits.h +++ b/include/glibtop/shm_limits.h @@ -49,7 +49,7 @@ struct _glibtop_shm_limits shmall; /* GLIBTOP_IPC_SHMALL */ }; -#define glibtop_get_shm_limits(shm) glibtop_get_shm_limits_l(glibtop_global_server, shm) +void glibtop_get_shm_limits(glibtop_shm_limits *buf); #if GLIBTOP_SUID_SHM_LIMITS #define glibtop_get_shm_limits_r glibtop_get_shm_limits_p diff --git a/include/glibtop/swap.h b/include/glibtop/swap.h index 68990a41..12933f5d 100644 --- a/include/glibtop/swap.h +++ b/include/glibtop/swap.h @@ -49,7 +49,8 @@ struct _glibtop_swap pageout; /* GLIBTOP_SWAP_PAGEOUT */ }; -#define glibtop_get_swap(swap) glibtop_get_swap_l(glibtop_global_server, swap) +void +glibtop_get_swap(glibtop_swap *buf); #if GLIBTOP_SUID_SWAP #define glibtop_get_swap_r glibtop_get_swap_p diff --git a/include/glibtop/sysdeps.h b/include/glibtop/sysdeps.h index 5547ccfd..545e796c 100644 --- a/include/glibtop/sysdeps.h +++ b/include/glibtop/sysdeps.h @@ -94,8 +94,7 @@ struct _glibtop_sysdeps ppp; /* glibtop_ppp */ }; -#define glibtop_get_sysdeps(sysdeps) glibtop_get_sysdeps_r(glibtop_global_server,sysdeps) - +void glibtop_get_sysdeps (glibtop_sysdeps *buf); void glibtop_get_sysdeps_r (glibtop *server, glibtop_sysdeps *buf); diff --git a/include/glibtop/sysinfo.h b/include/glibtop/sysinfo.h index 28f3fad3..1c61e2bb 100644 --- a/include/glibtop/sysinfo.h +++ b/include/glibtop/sysinfo.h @@ -54,11 +54,10 @@ struct _glibtop_sysinfo glibtop_entry cpuinfo [GLIBTOP_NCPU]; }; -#define glibtop_get_sysinfo() glibtop_get_sysinfo_s(glibtop_global_server) - #define glibtop_get_sysinfo_r glibtop_get_sysinfo_s const glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server); +const glibtop_sysinfo *glibtop_get_sysinfo (void); G_END_DECLS diff --git a/include/glibtop/uptime.h b/include/glibtop/uptime.h index 8a0c3ee5..0c5f1739 100644 --- a/include/glibtop/uptime.h +++ b/include/glibtop/uptime.h @@ -45,7 +45,7 @@ struct _glibtop_uptime guint64 boot_time; }; -#define glibtop_get_uptime(uptime) glibtop_get_uptime_l(glibtop_global_server, uptime) +void glibtop_get_uptime (glibtop_uptime *buf); #if GLIBTOP_SUID_UPTIME #define glibtop_get_uptime_r glibtop_get_uptime_p diff --git a/sysdeps/common/Makefile.am b/sysdeps/common/Makefile.am index 9de6ac8b..71b117e4 100644 --- a/sysdeps/common/Makefile.am +++ b/sysdeps/common/Makefile.am @@ -17,6 +17,7 @@ libgtop_common_2_0_la_SOURCES = error.c gnuslib.c \ fsusage.c \ mountlist.c \ procargs.c \ + default.c \ $(inodedb_SRCLIST) libgtop_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO) diff --git a/sysdeps/common/default.c b/sysdeps/common/default.c new file mode 100644 index 00000000..d8867405 --- /dev/null +++ b/sysdeps/common/default.c @@ -0,0 +1,212 @@ +#include + +#include +#include +#include + + +void +glibtop_close(void) +{ + glibtop_close_r(glibtop_global_server); +} + + +glibtop* +glibtop_init(void) +{ + return glibtop_init_r(&glibtop_global_server, 0, 0); +} + + +void +glibtop_get_cpu(glibtop_cpu *buf) +{ + glibtop_get_cpu_l(glibtop_global_server, buf); +} + + +void +glibtop_get_fsusage(glibtop_fsusage *buf, const char *mount_dir) +{ + glibtop_get_fsusage_l(glibtop_global_server, buf, mount_dir); +} + + +void +glibtop_get_uptime(glibtop_uptime *buf) +{ + glibtop_get_uptime_l(glibtop_global_server, buf); +} + + +const glibtop_sysinfo * +glibtop_get_sysinfo(void) +{ + return glibtop_get_sysinfo_s(glibtop_global_server); +} + + +void +glibtop_get_swap(glibtop_swap *buf) +{ + glibtop_get_swap_l(glibtop_global_server, buf); +} + + +void +glibtop_get_proc_uid(glibtop_proc_uid *buf, pid_t pid) +{ + glibtop_get_proc_uid_l(glibtop_global_server, buf, pid); +} + + +void +glibtop_get_proc_time(glibtop_proc_time *buf, pid_t pid) +{ + glibtop_get_proc_time_l(glibtop_global_server, buf, pid); +} + + +void +glibtop_get_proc_state(glibtop_proc_state *buf, pid_t pid) +{ + glibtop_get_proc_state_l(glibtop_global_server, buf, pid); +} + + +void +glibtop_get_proc_signal(glibtop_proc_signal *buf, pid_t pid) +{ + glibtop_get_proc_signal_l(glibtop_global_server, buf, pid); +} + + +void +glibtop_get_proc_segment(glibtop_proc_segment *buf, pid_t pid) +{ + glibtop_get_proc_segment_l(glibtop_global_server, buf, pid); +} + + +glibtop_open_files_entry * +glibtop_get_proc_open_files(glibtop_proc_open_files *buf, pid_t pid) +{ + return glibtop_get_proc_open_files_l(glibtop_global_server, buf, pid); +} + + +void +glibtop_get_proc_mem(glibtop_proc_mem *buf, pid_t pid) +{ + glibtop_get_proc_mem_l(glibtop_global_server, buf, pid); +} + + +glibtop_map_entry * +glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid) +{ + return glibtop_get_proc_map_l(glibtop_global_server, buf, pid); +} + + +char * +glibtop_get_proc_args(glibtop_proc_args *buf, pid_t pid, unsigned max_len) +{ + return glibtop_get_proc_args_l(glibtop_global_server, buf, pid, max_len); +} + + +char ** +glibtop_get_proc_argv(glibtop_proc_args *buf, pid_t pid, unsigned max_len) +{ + return glibtop_get_proc_argv_l(glibtop_global_server, buf, pid, max_len); +} + + +unsigned * +glibtop_get_proclist(glibtop_proclist *buf, gint64 which, gint64 arg) +{ + return glibtop_get_proclist_l(glibtop_global_server, buf, which, arg); +} + + +void +glibtop_get_proc_kernel(glibtop_proc_kernel *buf, pid_t pid) +{ + glibtop_get_proc_kernel_l(glibtop_global_server, buf, pid); +} + + +void +glibtop_get_ppp(glibtop_ppp *buf, unsigned short device) +{ + glibtop_get_ppp_l(glibtop_global_server, buf, device); +} + + +char** +glibtop_get_netlist(glibtop_netlist *buf) +{ + return glibtop_get_netlist_l(glibtop_global_server, buf); +} + + +void +glibtop_get_netload(glibtop_netload *buf, const char *interface) +{ + glibtop_get_netload_l(glibtop_global_server, buf, interface); +} + + +glibtop_mountentry * +glibtop_get_mountlist(glibtop_mountlist *buf, int all_fs) +{ + return glibtop_get_mountlist_l(glibtop_global_server, buf, all_fs); +} + + +void +glibtop_get_mem(glibtop_mem *buf) +{ + glibtop_get_mem_l(glibtop_global_server, buf); +} + + +void +glibtop_get_loadavg(glibtop_loadavg *buf) +{ + glibtop_get_loadavg_l(glibtop_global_server, buf); +} + + +void +glibtop_get_msg_limits(glibtop_msg_limits *buf) +{ + glibtop_get_msg_limits_l(glibtop_global_server, buf); +} + + +void +glibtop_get_sem_limits(glibtop_sem_limits *buf) +{ + glibtop_get_sem_limits_l(glibtop_global_server, buf); +} + + +void +glibtop_get_shm_limits(glibtop_shm_limits *buf) +{ + glibtop_get_shm_limits_l(glibtop_global_server, buf); +} + + +void +glibtop_get_sysdeps(glibtop_sysdeps *buf) +{ + glibtop_get_sysdeps_r(glibtop_global_server, buf); +} + + + +