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

Glibify a bit more. Closes #147618.

Browse Source 
* doc/reference.texi:
	* include/glibtop/command.h:
	* include/glibtop/glib-arrays.h:
	* include/glibtop/proclist.h:
	* lib/glib-arrays.c: (glibtop_get_proclist_as_array_l):
	* lib/lib.pl:
	* scripts/c_types.pl:
	* src/daemon/main.c: (handle_parent_connection):
	* src/daemon/slave.c: (handle_slave_connection):
	* support/mkstemp.c:
	* sysdeps/aix/proclist.c: (glibtop_get_proclist_s):
	* sysdeps/freebsd/cpu.c: (glibtop_get_cpu_p):
	* sysdeps/freebsd/prockernel.c: (glibtop_get_proc_kernel_p):
	* sysdeps/freebsd/proclist.c: (glibtop_get_proclist_p):
	* sysdeps/freebsd/procmem.c: (glibtop_get_proc_mem_p):
	* sysdeps/kernel/proclist.c: (glibtop_get_proclist_s):
	* sysdeps/linux/proclist.c: (glibtop_get_proclist_s):
	* sysdeps/osf1/proclist.c: (glibtop_get_proclist_p):
	* sysdeps/solaris/proclist.c: (glibtop_get_proclist_s):
	* sysdeps/stub/proclist.c: (glibtop_get_proclist_s):
	* sysdeps/stub_suid/proclist.c: (glibtop_get_proclist_p):
	* sysdeps/sun4/proclist.c: (glibtop_get_proclist_p): Glibify a bit more.
	Closes #147618.
This commit is contained in:
Benoît Dejean
2004-07-18 20:33:56 +00:00
parent 92c18d4e8a
commit ff4fe5e846
22 changed files with 67 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ChangeLog
View File

@@ -1,3 +1,29 @@
2004-07-18 Benoît Dejean <tazforever@dlfp.org>
* doc/reference.texi:
* include/glibtop/command.h:
* include/glibtop/glib-arrays.h:
* include/glibtop/proclist.h:
* lib/glib-arrays.c: (glibtop_get_proclist_as_array_l):
* lib/lib.pl:
* scripts/c_types.pl:
* src/daemon/main.c: (handle_parent_connection):
* src/daemon/slave.c: (handle_slave_connection):
* support/mkstemp.c:
* sysdeps/aix/proclist.c: (glibtop_get_proclist_s):
* sysdeps/freebsd/cpu.c: (glibtop_get_cpu_p):
* sysdeps/freebsd/prockernel.c: (glibtop_get_proc_kernel_p):
* sysdeps/freebsd/proclist.c: (glibtop_get_proclist_p):
* sysdeps/freebsd/procmem.c: (glibtop_get_proc_mem_p):
* sysdeps/kernel/proclist.c: (glibtop_get_proclist_s):
* sysdeps/linux/proclist.c: (glibtop_get_proclist_s):
* sysdeps/osf1/proclist.c: (glibtop_get_proclist_p):
* sysdeps/solaris/proclist.c: (glibtop_get_proclist_s):
* sysdeps/stub/proclist.c: (glibtop_get_proclist_s):
* sysdeps/stub_suid/proclist.c: (glibtop_get_proclist_p):
* sysdeps/sun4/proclist.c: (glibtop_get_proclist_p): Glibify a bit more.
Closes #147618.
2004-07-17 Benoît Dejean <tazforever@dlfp.org> 2004-07-17 Benoît Dejean <tazforever@dlfp.org>
* include/glibtop/fsusage.h: Added read, write. This members provides * include/glibtop/fsusage.h: Added read, write. This members provides

4
doc/reference.texi
View File

@@ -359,11 +359,11 @@ Library function @code{glibtop_get_proclist}:
@cartouche @cartouche
unsigned * unsigned *
glibtop_get_proclist (glibtop_proclist *buf, glibtop_get_proclist (glibtop_proclist *buf,
int64_t which, int64_t arg); gint64 which, gint64 arg);
unsigned * unsigned *
glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf, glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf,
int64_t which, int64_t arg); gint64 which, gint64 arg);
@end cartouche @end cartouche
@end example @end example

2
include/glibtop/command.h
View File

@@ -82,7 +82,7 @@ union _glibtop_response_union
struct _glibtop_response struct _glibtop_response
{ {
int64_t offset; gint64 offset;
guint64 size, data_size; guint64 size, data_size;
glibtop_response_union u; glibtop_response_union u;
}; };

2
include/glibtop/glib-arrays.h
View File

@@ -38,7 +38,7 @@ GPtrArray *
glibtop_get_proc_args_as_array_l (glibtop_client *client, pid_t pid); glibtop_get_proc_args_as_array_l (glibtop_client *client, pid_t pid);
GArray * GArray *
glibtop_get_proclist_as_array_l (glibtop_client *client, int64_t which, int64_t arg); glibtop_get_proclist_as_array_l (glibtop_client *client, gint64 which, gint64 arg);
GPtrArray * GPtrArray *
glibtop_get_proc_map_as_array_l (glibtop_client *client, pid_t pid); glibtop_get_proc_map_as_array_l (glibtop_client *client, pid_t pid);

6
include/glibtop/proclist.h
View File

@@ -72,20 +72,20 @@ struct _glibtop_proclist
unsigned * unsigned *
glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf, glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf,
int64_t which, int64_t arg); gint64 which, gint64 arg);
#if GLIBTOP_SUID_PROCLIST #if GLIBTOP_SUID_PROCLIST
void glibtop_init_proclist_p (glibtop *server); void glibtop_init_proclist_p (glibtop *server);
unsigned * unsigned *
glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf, glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
int64_t which, int64_t arg); gint64 which, gint64 arg);
#else #else
void glibtop_init_proclist_s (glibtop *server); void glibtop_init_proclist_s (glibtop *server);
unsigned * unsigned *
glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf, glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
int64_t which, int64_t arg); gint64 which, gint64 arg);
#endif #endif
#ifdef GLIBTOP_NAMES #ifdef GLIBTOP_NAMES

4
lib/glib-arrays.c
View File

@@ -29,8 +29,8 @@
#include <glibtop/glib-arrays.h> #include <glibtop/glib-arrays.h>
GArray * GArray *
glibtop_get_proclist_as_array_l (glibtop_client *client, int64_t which, glibtop_get_proclist_as_array_l (glibtop_client *client, gint64 which,
int64_t arg) gint64 arg)
{ {
glibtop_array array; glibtop_array array;
GArray *retval; GArray *retval;

2
lib/lib.pl
View File

@@ -67,7 +67,7 @@ print '';
print '/* Library functions. */'; print '/* Library functions. */';
print ''; print '';
$convert{'long'} = 'int64_t'; $convert{'long'} = 'gint64';
$convert{'ulong'} = 'guint64'; $convert{'ulong'} = 'guint64';
$convert{'pid_t'} = 'pid_t'; $convert{'pid_t'} = 'pid_t';
$convert{'int'} = 'int'; $convert{'int'} = 'int';

2
scripts/c_types.pl
View File

@@ -49,7 +49,7 @@ my $c_demarshal_func = sub {
# * Flag specifying whether we need to copy the parameter into temp storage # * Flag specifying whether we need to copy the parameter into temp storage
# #
$typeinfo = {'long' => ['int64_t', 0], $typeinfo = {'long' => ['gint64', 0],
'ulong' => ['guint64', 0], 'ulong' => ['guint64', 0],
'pid_t' => ['pid_t', 0], 'pid_t' => ['pid_t', 0],
'int' => ['int', 0], 'int' => ['int', 0],

4
src/daemon/main.c
View File

@@ -41,7 +41,7 @@ handle_parent_connection (int s)
glibtop_mountentry *mount_list; glibtop_mountentry *mount_list;
char parameter [BUFSIZ]; char parameter [BUFSIZ];
unsigned short device; unsigned short device;
int64_t *param_ptr; gint64 *param_ptr;
int all_fs; int all_fs;
pid_t pid; pid_t pid;
void *ptr; void *ptr;
@@ -133,7 +133,7 @@ handle_parent_connection (int s)
do_output (s, resp, _offset_data (sem_limits), 0, NULL); do_output (s, resp, _offset_data (sem_limits), 0, NULL);
break; break;
case GLIBTOP_CMND_PROCLIST: case GLIBTOP_CMND_PROCLIST:
param_ptr = (int64_t *) parameter; param_ptr = (gint64 *) parameter;
ptr = glibtop_get_proclist_l (server, ptr = glibtop_get_proclist_l (server,
&resp->u.data.proclist, &resp->u.data.proclist,
param_ptr [0], param_ptr [0],

4
src/daemon/slave.c
View File

@@ -27,7 +27,7 @@ void
handle_slave_connection (int input, int output) handle_slave_connection (int input, int output)
{ {
glibtop *server G_GNUC_UNUSED = glibtop_global_server; glibtop *server G_GNUC_UNUSED = glibtop_global_server;
int64_t *param_ptr G_GNUC_UNUSED; gint64 *param_ptr G_GNUC_UNUSED;
const void *ptr G_GNUC_UNUSED; const void *ptr G_GNUC_UNUSED;
unsigned short max_len G_GNUC_UNUSED; unsigned short max_len G_GNUC_UNUSED;
@@ -72,7 +72,7 @@ handle_slave_connection (int input, int output)
return; return;
#if GLIBTOP_SUID_PROCLIST #if GLIBTOP_SUID_PROCLIST
case GLIBTOP_CMND_PROCLIST: case GLIBTOP_CMND_PROCLIST:
param_ptr = (int64_t *) parameter; param_ptr = (gint64 *) parameter;
ptr = glibtop_get_proclist_p ptr = glibtop_get_proclist_p
(server, &resp->u.data.proclist, (server, &resp->u.data.proclist,
param_ptr [0], param_ptr [1]); param_ptr [0], param_ptr [1]);

2
sysdeps/aix/proclist.c
View File

@@ -50,7 +50,7 @@ glibtop_init_proclist_s (glibtop *server)
unsigned * unsigned *
glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf, glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
int64_t which, int64_t arg) gint64 which, gint64 arg)
{ {
struct procsinfo pinfo; struct procsinfo pinfo;
int count, total; int count, total;

2
sysdeps/freebsd/cpu.c
View File

@@ -77,7 +77,7 @@ void
glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf) glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
{ {
#ifdef KERN_CP_TIME #ifdef KERN_CP_TIME
u_int64_t cpts [CPUSTATES]; guint64 cpts [CPUSTATES];
#else #else
long cpts [CPUSTATES]; long cpts [CPUSTATES];
#endif #endif

28
sysdeps/freebsd/prockernel.c
View File

@@ -225,27 +225,27 @@ glibtop_get_proc_kernel_p (glibtop *server,
#else #else
#if defined(__NetBSD__) #if defined(__NetBSD__)
#if defined(__m68k__) #if defined(__m68k__)
buf->kstk_esp = (u_int64_t) pcb.pcb_usp; buf->kstk_esp = (guint64) pcb.pcb_usp;
buf->kstk_eip = (u_int64_t) 0; buf->kstk_eip = (guint64) 0;
#elif defined(__x86_64__) #elif defined(__x86_64__)
buf->kstk_esp = (u_int64_t) pcb.pcb_usersp; buf->kstk_esp = (guint64) pcb.pcb_usersp;
buf->kstk_eip = (u_int64_t) 0; buf->kstk_eip = (guint64) 0;
#elif (defined(__arm32__) || defined(__powerpc__)) #elif (defined(__arm32__) || defined(__powerpc__))
buf->kstk_esp = (u_int64_t) pcb.pcb_sp; buf->kstk_esp = (guint64) pcb.pcb_sp;
buf->kstk_eip = (u_int64_t) 0; buf->kstk_eip = (guint64) 0;
#elif defined(__mipsel__) #elif defined(__mipsel__)
buf->kstk_esp = (u_int64_t) pcb.pcb_context[8]; buf->kstk_esp = (guint64) pcb.pcb_context[8];
buf->kstk_eip = (u_int64_t) 0; buf->kstk_eip = (guint64) 0;
#elif defined(__sparc__) #elif defined(__sparc__)
buf->kstk_esp = (u_int64_t) pcb.pcb_sp; buf->kstk_esp = (guint64) pcb.pcb_sp;
buf->kstk_eip = (u_int64_t) pcb.pcb_pc; buf->kstk_eip = (guint64) pcb.pcb_pc;
#elif defined(__alpha__) #elif defined(__alpha__)
buf->kstk_esp = (u_int64_t) pcb.pcb_context[9]; buf->kstk_esp = (guint64) pcb.pcb_context[9];
buf->kstk_eip = (u_int64_t) pcb.pcb_context[8]; buf->kstk_eip = (guint64) pcb.pcb_context[8];
#else #else
/* provide some defaults for other platforms */ /* provide some defaults for other platforms */
buf->kstk_esp = (u_int64_t) 0; buf->kstk_esp = (guint64) 0;
buf->kstk_eip = (u_int64_t) 0; buf->kstk_eip = (guint64) 0;
#endif /* ${MACHINE_ARCH} */ #endif /* ${MACHINE_ARCH} */
#endif /* __NetBSD__ */ #endif /* __NetBSD__ */
buf->flags |= _glibtop_sysdeps_proc_kernel_pcb; buf->flags |= _glibtop_sysdeps_proc_kernel_pcb;

2
sysdeps/freebsd/proclist.c
View File

@@ -59,7 +59,7 @@ glibtop_init_proclist_p (glibtop *server)
unsigned * unsigned *
glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf, glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
int64_t real_which, int64_t arg) gint64 real_which, gint64 arg)
{ {
struct kinfo_proc *pinfo; struct kinfo_proc *pinfo;
unsigned *pids = NULL; unsigned *pids = NULL;

4
sysdeps/freebsd/procmem.c
View File

@@ -150,10 +150,10 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
buf->rss_rlim = pinfo [0].ki_rssize; buf->rss_rlim = pinfo [0].ki_rssize;
buf->vsize = buf->size = (u_int64_t) pagetok buf->vsize = buf->size = (guint64) pagetok
(pinfo [0].ki_tsize + pinfo [0].ki_dsize + pinfo[0].ki_ssize) (pinfo [0].ki_tsize + pinfo [0].ki_dsize + pinfo[0].ki_ssize)
<< LOG1024; << LOG1024;
buf->resident = buf->rss = (u_int64_t) pagetok buf->resident = buf->rss = (guint64) pagetok
(pinfo [0].ki_rssize) << LOG1024; (pinfo [0].ki_rssize) << LOG1024;
#else #else

2
sysdeps/kernel/proclist.c
View File

@@ -56,7 +56,7 @@ glibtop_init_proclist_s (glibtop *server)
unsigned * unsigned *
glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf, glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
int64_t which, int64_t arg) gint64 which, gint64 arg)
{ {
union table tbl; union table tbl;
unsigned *pids_chain; unsigned *pids_chain;

2
sysdeps/linux/proclist.c
View File

@@ -62,7 +62,7 @@ glibtop_init_proclist_s (glibtop *server)
unsigned * unsigned *
glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf, glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
int64_t which, int64_t arg) gint64 which, gint64 arg)
{ {
DIR *proc; DIR *proc;
struct dirent *entry; struct dirent *entry;

2
sysdeps/osf1/proclist.c
View File

@@ -66,7 +66,7 @@ glibtop_init_proclist_p (glibtop *server)
unsigned * unsigned *
glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf, glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
int64_t which, int64_t arg) gint64 which, gint64 arg)
{ {
unsigned count = 0, total = 0; unsigned count = 0, total = 0;
unsigned pids [BLOCK_COUNT], *pids_chain = NULL; unsigned pids [BLOCK_COUNT], *pids_chain = NULL;

2
sysdeps/solaris/proclist.c
View File

@@ -55,7 +55,7 @@ glibtop_init_proclist_s (glibtop *server)
unsigned * unsigned *
glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf, glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
int64_t which, int64_t arg) gint64 which, gint64 arg)
{ {
DIR *proc; DIR *proc;
struct dirent *entry; struct dirent *entry;

2
sysdeps/stub/proclist.c
View File

@@ -45,7 +45,7 @@ glibtop_init_proclist_s (glibtop *server)
unsigned * unsigned *
glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf, glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
int64_t which, int64_t arg) gint64 which, gint64 arg)
{ {
memset (buf, 0, sizeof (glibtop_proclist)); memset (buf, 0, sizeof (glibtop_proclist));
return NULL; return NULL;

2
sysdeps/stub_suid/proclist.c
View File

@@ -39,7 +39,7 @@ glibtop_init_proclist_p (glibtop *server)
unsigned * unsigned *
glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf, glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
int64_t which, int64_t arg) gint64 which, gint64 arg)
{ {
glibtop_init_p (server, GLIBTOP_SYSDEPS_PROCLIST, 0); glibtop_init_p (server, GLIBTOP_SYSDEPS_PROCLIST, 0);

2
sysdeps/sun4/proclist.c
View File

@@ -39,7 +39,7 @@ static const unsigned long _glibtop_sysdeps_proclist =
unsigned * unsigned *
glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf, glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
int64_t which, int64_t arg) gint64 which, gint64 arg)
{ {
register struct proc *pp; register struct proc *pp;
register int i, nproc = 0; register int i, nproc = 0;