diff options
author | Benoît Dejean <bdejean@gmail.com> | 2015-08-08 14:36:47 +0200 |
---|---|---|
committer | Benoît Dejean <bdejean@gmail.com> | 2015-08-08 14:36:47 +0200 |
commit | b74d6abf198854b95ad294a601700713d26166d9 (patch) | |
tree | 51e2ca60c62ba79a3e942fb30e1b62d271e157a0 /sysdeps/aix | |
parent | ca42f1f3af153374f3b0a66f7f470776981e3f9d (diff) | |
download | libgtop-b74d6abf198854b95ad294a601700713d26166d9.tar.gz |
server->machine is now a pointer, so propagate the change from . to ->.
Diffstat (limited to 'sysdeps/aix')
-rw-r--r-- | sysdeps/aix/cpu.c | 20 | ||||
-rw-r--r-- | sysdeps/aix/glibtop_suid.h | 4 | ||||
-rw-r--r-- | sysdeps/aix/loadavg.c | 4 | ||||
-rw-r--r-- | sysdeps/aix/msg_limits.c | 4 | ||||
-rw-r--r-- | sysdeps/aix/netload.c | 4 | ||||
-rw-r--r-- | sysdeps/aix/open.c | 16 | ||||
-rw-r--r-- | sysdeps/aix/sem_limits.c | 4 | ||||
-rw-r--r-- | sysdeps/aix/shm_limits.c | 4 | ||||
-rw-r--r-- | sysdeps/aix/utils.c | 14 |
9 files changed, 37 insertions, 37 deletions
diff --git a/sysdeps/aix/cpu.c b/sysdeps/aix/cpu.c index c3a7ce0d..58434968 100644 --- a/sysdeps/aix/cpu.c +++ b/sysdeps/aix/cpu.c @@ -56,7 +56,7 @@ _glibtop_init_cpu_p (glibtop *server) { return; } - server->machine.sysinfo_offset = result; + server->machine->sysinfo_offset = result; result = _glibtop_get_kmem_offset(server, "cpuinfo"); if (result == -1) @@ -65,9 +65,9 @@ _glibtop_init_cpu_p (glibtop *server) return; } - server->machine.cpuinfo_offset = result; + server->machine->cpuinfo_offset = result; - server->machine.cpuinfo = (struct cpuinfo*)calloc(_system_configuration.ncpus, sizeof(struct cpuinfo)); + server->machine->cpuinfo = (struct cpuinfo*)calloc(_system_configuration.ncpus, sizeof(struct cpuinfo)); server->sysdeps.cpu = _glibtop_sysdeps_cpu; } @@ -85,7 +85,7 @@ glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf) memset (buf, 0, sizeof (glibtop_cpu)); - result = _glibtop_get_kmem_info(server, server->machine.sysinfo_offset, + result = _glibtop_get_kmem_info(server, server->machine->sysinfo_offset, &sysinfo, sizeof(struct sysinfo)); if (result <= 0) { @@ -100,8 +100,8 @@ glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf) buf->total = buf->idle + buf->user + buf->sys + buf->nice ; - result = _glibtop_get_kmem_info(server, server->machine.cpuinfo_offset, - server->machine.cpuinfo, + result = _glibtop_get_kmem_info(server, server->machine->cpuinfo_offset, + server->machine->cpuinfo, _system_configuration.ncpus * sizeof(struct cpuinfo)); @@ -115,13 +115,13 @@ glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf) for (cpu = 0; cpu < MIN(GLIBTOP_NCPU, _system_configuration.ncpus); cpu++) { buf->xcpu_idle[cpu] = - server->machine.cpuinfo[cpu].cpu[CPU_IDLE]; + server->machine->cpuinfo[cpu].cpu[CPU_IDLE]; buf->xcpu_user[cpu] = - server->machine.cpuinfo[cpu].cpu[CPU_USER]; + server->machine->cpuinfo[cpu].cpu[CPU_USER]; buf->xcpu_sys[cpu] = - server->machine.cpuinfo[cpu].cpu[CPU_KERNEL]; + server->machine->cpuinfo[cpu].cpu[CPU_KERNEL]; buf->xcpu_nice[cpu] = - server->machine.cpuinfo[cpu].cpu[CPU_WAIT]; + server->machine->cpuinfo[cpu].cpu[CPU_WAIT]; buf->xcpu_total[cpu] = buf->xcpu_idle[cpu] + buf->xcpu_user[cpu] + diff --git a/sysdeps/aix/glibtop_suid.h b/sysdeps/aix/glibtop_suid.h index c87d1269..580225fd 100644 --- a/sysdeps/aix/glibtop_suid.h +++ b/sysdeps/aix/glibtop_suid.h @@ -29,11 +29,11 @@ G_BEGIN_DECLS #endif static inline void glibtop_suid_enter (glibtop *server) { - setegid (server->machine.egid); + setegid (server->machine->egid); } static inline void glibtop_suid_leave (glibtop *server) { - if (setegid (server->machine.gid)) + if (setegid (server->machine->gid)) _exit (1); } diff --git a/sysdeps/aix/loadavg.c b/sysdeps/aix/loadavg.c index cfcad2d5..2f2c2a5e 100644 --- a/sysdeps/aix/loadavg.c +++ b/sysdeps/aix/loadavg.c @@ -44,7 +44,7 @@ _glibtop_init_loadavg_p (glibtop *server) return; } - server->machine.loadavg_offset = result; + server->machine->loadavg_offset = result; server->sysdeps.loadavg = _glibtop_sysdeps_loadavg; } @@ -61,7 +61,7 @@ glibtop_get_loadavg_p (glibtop *server, glibtop_loadavg *buf) memset (buf, 0, sizeof (glibtop_loadavg)); - result = _glibtop_get_kmem_info(server, server->machine.loadavg_offset, + result = _glibtop_get_kmem_info(server, server->machine->loadavg_offset, loadavg, sizeof(loadavg)); if (result <= 0) { diff --git a/sysdeps/aix/msg_limits.c b/sysdeps/aix/msg_limits.c index 4ed066f2..6eb4d568 100644 --- a/sysdeps/aix/msg_limits.c +++ b/sysdeps/aix/msg_limits.c @@ -44,7 +44,7 @@ _glibtop_init_msg_limits_p (glibtop *server) return; } - server->machine.msginfo_offset = result; + server->machine->msginfo_offset = result; server->sysdeps.msg_limits = _glibtop_sysdeps_msg_limits; } @@ -61,7 +61,7 @@ glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf) memset (buf, 0, sizeof (glibtop_msg_limits)); - result = _glibtop_get_kmem_info(server, server->machine.msginfo_offset, + result = _glibtop_get_kmem_info(server, server->machine->msginfo_offset, &msginfo, sizeof(msginfo)); if (result <= 0) diff --git a/sysdeps/aix/netload.c b/sysdeps/aix/netload.c index ede1ebc4..e677e6c7 100644 --- a/sysdeps/aix/netload.c +++ b/sysdeps/aix/netload.c @@ -100,7 +100,7 @@ _glibtop_init_netload_p (glibtop *server) return; } - server->machine.ifnet_offset = addr; + server->machine->ifnet_offset = addr; server->sysdeps.netload = _glibtop_sysdeps_netload; } @@ -122,7 +122,7 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf, memset (buf, 0, sizeof (glibtop_netload)); - for ( offset = server->machine.ifnet_offset; + for ( offset = server->machine->ifnet_offset; offset != 0; offset = (off_t)ifnet.if_next ) diff --git a/sysdeps/aix/open.c b/sysdeps/aix/open.c index b74354c1..d0ecbe59 100644 --- a/sysdeps/aix/open.c +++ b/sysdeps/aix/open.c @@ -56,23 +56,23 @@ glibtop_open_p (glibtop *server, const char *program_name, { /* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */ - server->machine.uid = getuid (); - server->machine.euid = geteuid (); - server->machine.gid = getgid (); - server->machine.egid = getegid (); + server->machine->uid = getuid (); + server->machine->euid = geteuid (); + server->machine->gid = getgid (); + server->machine->egid = getegid (); /* open kmem */ - server->machine.kmem_fd = open("/dev/kmem", O_RDONLY); - if (server->machine.kmem_fd == -1) + server->machine->kmem_fd = open("/dev/kmem", O_RDONLY); + if (server->machine->kmem_fd == -1) glibtop_error_io_r (server, "Cannot open /dev/kmem"); /* Drop priviledges. */ - if (seteuid (server->machine.uid)) + if (seteuid (server->machine->uid)) _exit (1); - if (setegid (server->machine.gid)) + if (setegid (server->machine->gid)) _exit (1); /* !!! END OF SUID ROOT PART !!! */ diff --git a/sysdeps/aix/sem_limits.c b/sysdeps/aix/sem_limits.c index 754ce1f3..0cc8e6a6 100644 --- a/sysdeps/aix/sem_limits.c +++ b/sysdeps/aix/sem_limits.c @@ -46,7 +46,7 @@ _glibtop_init_sem_limits_p (glibtop *server) return; } - server->machine.seminfo_offset = result; + server->machine->seminfo_offset = result; server->sysdeps.sem_limits = _glibtop_sysdeps_sem_limits; } @@ -63,7 +63,7 @@ glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf) memset (buf, 0, sizeof (glibtop_sem_limits)); - result = _glibtop_get_kmem_info(server, server->machine.seminfo_offset, + result = _glibtop_get_kmem_info(server, server->machine->seminfo_offset, &seminfo, sizeof(seminfo)); if (result <= 0) diff --git a/sysdeps/aix/shm_limits.c b/sysdeps/aix/shm_limits.c index 46a0160c..860819e5 100644 --- a/sysdeps/aix/shm_limits.c +++ b/sysdeps/aix/shm_limits.c @@ -44,7 +44,7 @@ _glibtop_init_shm_limits_p (glibtop *server) return; } - server->machine.shminfo_offset = result; + server->machine->shminfo_offset = result; server->sysdeps.shm_limits = _glibtop_sysdeps_shm_limits; } @@ -62,7 +62,7 @@ glibtop_get_shm_limits_p (glibtop *server, glibtop_shm_limits *buf) memset (buf, 0, sizeof (glibtop_shm_limits)); - result = _glibtop_get_kmem_info(server, server->machine.shminfo_offset, + result = _glibtop_get_kmem_info(server, server->machine->shminfo_offset, &shminfo, sizeof(struct shminfo)); if (result <= 0) { diff --git a/sysdeps/aix/utils.c b/sysdeps/aix/utils.c index 174d5ab7..10ca7e3b 100644 --- a/sysdeps/aix/utils.c +++ b/sysdeps/aix/utils.c @@ -68,9 +68,9 @@ _glibtop_get_kmem_info(glibtop* server, off_t offset, void* buf, size_t len) glibtop_suid_enter(server); - lseek(server->machine.kmem_fd, offset, SEEK_SET); + lseek(server->machine->kmem_fd, offset, SEEK_SET); - result = read(server->machine.kmem_fd, buf, len); + result = read(server->machine->kmem_fd, buf, len); glibtop_suid_leave(server); @@ -86,23 +86,23 @@ _glibtop_get_procinfo (glibtop *server, pid_t pid) /* test if procsinfo already found */ - if ((server->machine.last_pinfo.pi_pid == pid) && (!first_time)) + if ((server->machine->last_pinfo.pi_pid == pid) && (!first_time)) { - return &server->machine.last_pinfo; + return &server->machine->last_pinfo; } /* seek procsinfo if given pid */ first_time = 0; current = 0; - while ((result = getprocs( &server->machine.last_pinfo + while ((result = getprocs( &server->machine->last_pinfo , sizeof(struct procsinfo) , NULL, 0, ¤t, 1)) == 1) { - if (pid == server->machine.last_pinfo.pi_pid) + if (pid == server->machine->last_pinfo.pi_pid) { - return &server->machine.last_pinfo; + return &server->machine->last_pinfo; } } return NULL; |