changed call of 'glibtop_init__r', it now takes two additional arguments.
* sysdeps/linux/*.c: changed call of 'glibtop_init__r', it now takes two additional arguments.
This commit is contained in:
@@ -13,3 +13,5 @@ libgtop_sysdeps_la_SOURCES = init.c open.c close.c cpu.c mem.c swap.c \
|
|||||||
sem_limits.c proclist.c procstate.c procuid.c \
|
sem_limits.c proclist.c procstate.c procuid.c \
|
||||||
proctime.c procmem.c procsignal.c prockernel.c \
|
proctime.c procmem.c procsignal.c prockernel.c \
|
||||||
procsegment.c
|
procsegment.c
|
||||||
|
|
||||||
|
include_HEADERS = glibtop_server.h
|
||||||
|
@@ -34,7 +34,7 @@ glibtop_get_cpu__s (glibtop *server, glibtop_cpu *buf)
|
|||||||
{
|
{
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
|
||||||
glibtop_init__r (&server);
|
glibtop_init__r (&server, 0, 0);
|
||||||
|
|
||||||
memset (buf, 0, sizeof (glibtop_cpu));
|
memset (buf, 0, sizeof (glibtop_cpu));
|
||||||
|
|
||||||
|
@@ -26,14 +26,16 @@ static glibtop _glibtop_global_server;
|
|||||||
glibtop *glibtop_global_server = NULL;
|
glibtop *glibtop_global_server = NULL;
|
||||||
|
|
||||||
glibtop *
|
glibtop *
|
||||||
glibtop_init__r (glibtop **server)
|
glibtop_init__r (glibtop **server, const unsigned long features,
|
||||||
|
const unsigned flags)
|
||||||
{
|
{
|
||||||
if (*server != NULL)
|
if (*server != NULL)
|
||||||
return *server;
|
return *server;
|
||||||
|
|
||||||
if (glibtop_global_server == NULL) {
|
if (glibtop_global_server == NULL) {
|
||||||
glibtop_global_server = &_glibtop_global_server;
|
glibtop_global_server = &_glibtop_global_server;
|
||||||
glibtop_open (glibtop_global_server, "glibtop");
|
glibtop_open (glibtop_global_server, "glibtop",
|
||||||
|
features, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
return *server = glibtop_global_server;
|
return *server = glibtop_global_server;
|
||||||
|
@@ -32,7 +32,7 @@ glibtop_get_loadavg__s (glibtop *server, glibtop_loadavg *buf)
|
|||||||
{
|
{
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
|
||||||
glibtop_init__r (&server);
|
glibtop_init__r (&server, 0, 0);
|
||||||
|
|
||||||
memset (buf, 0, sizeof (glibtop_loadavg));
|
memset (buf, 0, sizeof (glibtop_loadavg));
|
||||||
|
|
||||||
|
@@ -35,7 +35,7 @@ glibtop_get_mem__s (glibtop *server, glibtop_mem *buf)
|
|||||||
{
|
{
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
|
||||||
glibtop_init__r (&server);
|
glibtop_init__r (&server, 0, 0);
|
||||||
|
|
||||||
memset (buf, 0, sizeof (glibtop_mem));
|
memset (buf, 0, sizeof (glibtop_mem));
|
||||||
|
|
||||||
|
@@ -37,7 +37,7 @@ glibtop_get_msg_limits__s (glibtop *server, glibtop_msg_limits *buf)
|
|||||||
{
|
{
|
||||||
struct msginfo msginfo;
|
struct msginfo msginfo;
|
||||||
|
|
||||||
glibtop_init__r (&server);
|
glibtop_init__r (&server, 0, 0);
|
||||||
|
|
||||||
memset (buf, 0, sizeof (glibtop_msg_limits));
|
memset (buf, 0, sizeof (glibtop_msg_limits));
|
||||||
|
|
||||||
|
@@ -51,7 +51,8 @@ static void set_linux_version(void) {
|
|||||||
/* Opens pipe to gtop server. Returns 0 on success and -1 on error. */
|
/* Opens pipe to gtop server. Returns 0 on success and -1 on error. */
|
||||||
|
|
||||||
void
|
void
|
||||||
glibtop_open (glibtop *server, const char *program_name)
|
glibtop_open (glibtop *server, const char *program_name,
|
||||||
|
const unsigned long features, const unsigned flags)
|
||||||
{
|
{
|
||||||
memset (server, 0, sizeof (glibtop));
|
memset (server, 0, sizeof (glibtop));
|
||||||
server->name = program_name;
|
server->name = program_name;
|
||||||
|
@@ -85,7 +85,7 @@ glibtop_get_procdata__s (glibtop *server, glibtop_procdata *buf, pid_t pid)
|
|||||||
int nread;
|
int nread;
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
|
||||||
glibtop_init__r (&server);
|
glibtop_init__r (&server, 0, 0);
|
||||||
|
|
||||||
memset (buf, 0, sizeof (glibtop_procdata));
|
memset (buf, 0, sizeof (glibtop_procdata));
|
||||||
|
|
||||||
|
@@ -37,7 +37,7 @@ glibtop_get_proc_kernel__s (glibtop *server, glibtop_proc_kernel *buf, pid_t pid
|
|||||||
int nread;
|
int nread;
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
|
||||||
glibtop_init__r (&server);
|
glibtop_init__r (&server, 0, 0);
|
||||||
|
|
||||||
memset (buf, 0, sizeof (glibtop_proc_kernel));
|
memset (buf, 0, sizeof (glibtop_proc_kernel));
|
||||||
|
|
||||||
|
@@ -60,7 +60,7 @@ glibtop_get_proclist__s (glibtop *server, glibtop_proclist *buf)
|
|||||||
struct stat statb;
|
struct stat statb;
|
||||||
int len, i, ok;
|
int len, i, ok;
|
||||||
|
|
||||||
glibtop_init__r (&server);
|
glibtop_init__r (&server, 0, 0);
|
||||||
|
|
||||||
memset (buf, 0, sizeof (glibtop_proclist));
|
memset (buf, 0, sizeof (glibtop_proclist));
|
||||||
|
|
||||||
|
@@ -36,7 +36,7 @@ glibtop_get_proc_mem__s (glibtop *server, glibtop_proc_mem *buf, pid_t pid)
|
|||||||
int nread;
|
int nread;
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
|
||||||
glibtop_init__r (&server);
|
glibtop_init__r (&server, 0, 0);
|
||||||
|
|
||||||
memset (buf, 0, sizeof (glibtop_proc_mem));
|
memset (buf, 0, sizeof (glibtop_proc_mem));
|
||||||
|
|
||||||
|
@@ -38,7 +38,7 @@ glibtop_get_proc_segment__s (glibtop *server, glibtop_proc_segment *buf,
|
|||||||
int nread;
|
int nread;
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
|
||||||
glibtop_init__r (&server);
|
glibtop_init__r (&server, 0, 0);
|
||||||
|
|
||||||
memset (buf, 0, sizeof (glibtop_proc_segment));
|
memset (buf, 0, sizeof (glibtop_proc_segment));
|
||||||
|
|
||||||
|
@@ -35,7 +35,7 @@ glibtop_get_proc_signal__s (glibtop *server, glibtop_proc_signal *buf, pid_t pid
|
|||||||
int nread;
|
int nread;
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
|
||||||
glibtop_init__r (&server);
|
glibtop_init__r (&server, 0, 0);
|
||||||
|
|
||||||
memset (buf, 0, sizeof (glibtop_proc_signal));
|
memset (buf, 0, sizeof (glibtop_proc_signal));
|
||||||
|
|
||||||
|
@@ -38,7 +38,7 @@ glibtop_get_proc_state__s (glibtop *server, glibtop_proc_state *buf, pid_t pid)
|
|||||||
int nread;
|
int nread;
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
|
||||||
glibtop_init__r (&server);
|
glibtop_init__r (&server, 0, 0);
|
||||||
|
|
||||||
memset (buf, 0, sizeof (glibtop_proc_state));
|
memset (buf, 0, sizeof (glibtop_proc_state));
|
||||||
|
|
||||||
|
@@ -37,7 +37,7 @@ glibtop_get_proc_time__s (glibtop *server, glibtop_proc_time *buf, pid_t pid)
|
|||||||
int nread;
|
int nread;
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
|
||||||
glibtop_init__r (&server);
|
glibtop_init__r (&server, 0, 0);
|
||||||
|
|
||||||
memset (buf, 0, sizeof (glibtop_proc_time));
|
memset (buf, 0, sizeof (glibtop_proc_time));
|
||||||
|
|
||||||
|
@@ -41,7 +41,7 @@ glibtop_get_proc_uid__s (glibtop *server, glibtop_proc_uid *buf, pid_t pid)
|
|||||||
int nread;
|
int nread;
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
|
||||||
glibtop_init__r (&server);
|
glibtop_init__r (&server, 0, 0);
|
||||||
|
|
||||||
memset (buf, 0, sizeof (glibtop_proc_uid));
|
memset (buf, 0, sizeof (glibtop_proc_uid));
|
||||||
|
|
||||||
|
@@ -39,7 +39,7 @@ glibtop_get_sem_limits__s (glibtop *server, glibtop_sem_limits *buf)
|
|||||||
struct seminfo seminfo;
|
struct seminfo seminfo;
|
||||||
union semun arg;
|
union semun arg;
|
||||||
|
|
||||||
glibtop_init__r (&server);
|
glibtop_init__r (&server, 0, 0);
|
||||||
|
|
||||||
memset (buf, 0, sizeof (glibtop_sem_limits));
|
memset (buf, 0, sizeof (glibtop_sem_limits));
|
||||||
|
|
||||||
|
@@ -36,7 +36,7 @@ glibtop_get_shm_limits__s (glibtop *server, glibtop_shm_limits *buf)
|
|||||||
{
|
{
|
||||||
struct shminfo shminfo;
|
struct shminfo shminfo;
|
||||||
|
|
||||||
glibtop_init__r (&server);
|
glibtop_init__r (&server, 0, 0);
|
||||||
|
|
||||||
memset (buf, 0, sizeof (glibtop_shm_limits));
|
memset (buf, 0, sizeof (glibtop_shm_limits));
|
||||||
|
|
||||||
|
@@ -33,7 +33,7 @@ glibtop_get_swap__s (glibtop *server, glibtop_swap *buf)
|
|||||||
{
|
{
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
|
||||||
glibtop_init__r (&server);
|
glibtop_init__r (&server, 0, 0);
|
||||||
|
|
||||||
memset (buf, 0, sizeof (glibtop_swap));
|
memset (buf, 0, sizeof (glibtop_swap));
|
||||||
|
|
||||||
|
@@ -32,7 +32,7 @@ glibtop_get_uptime__s (glibtop *server, glibtop_uptime *buf)
|
|||||||
{
|
{
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
|
||||||
glibtop_init__r (&server);
|
glibtop_init__r (&server, 0, 0);
|
||||||
|
|
||||||
memset (buf, 0, sizeof (glibtop_uptime));
|
memset (buf, 0, sizeof (glibtop_uptime));
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user