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

perl -pni -e 's,server->machine,server->_priv->machine,g' *.c

Browse Source 
perl -pni -e 's,server->machine,server->_priv->machine,g' *.h
This commit is contained in:
Martin Baulig
1999-12-25 18:30:26 +00:00
parent 595553ae0b
commit 42cbc7cf0c
13 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sysdeps/solaris/cpu.c
View File

@@ -50,7 +50,7 @@ glibtop_init_cpu_s (glibtop *server)
int
glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
{
kstat_ctl_t *kc = server->machine.kc;
kstat_ctl_t *kc = server->_priv->machine.kc;
cpu_stat_t cpu_stat;
processorid_t cpu;
int ncpu, found;
@@ -72,7 +72,7 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
for (cpu = 0, found = 0; cpu < GLIBTOP_NCPU && found != ncpu; cpu++)
{
kstat_t *ksp = server->machine.cpu_stat_kstat [cpu];
kstat_t *ksp = server->_priv->machine.cpu_stat_kstat [cpu];
if (!ksp) continue;
++found;
@@ -100,7 +100,7 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
}
buf->total = buf->idle + buf->user + buf->sys;
buf->frequency = server->machine.ticks;
buf->frequency = server->_priv->machine.ticks;
buf->flags = _glibtop_sysdeps_cpu;
}

4
sysdeps/solaris/glibtop_suid.h
View File

@@ -27,11 +27,11 @@
BEGIN_LIBGTOP_DECLS
static inline void glibtop_suid_enter (glibtop *server) {
setreuid (server->machine.uid, server->machine.euid);
setreuid (server->_priv->machine.uid, server->_priv->machine.euid);
};
static inline void glibtop_suid_leave (glibtop *server) {
if (setreuid (server->machine.euid, server->machine.uid))
if (setreuid (server->_priv->machine.euid, server->_priv->machine.uid))
_exit (1);
};

4
sysdeps/solaris/loadavg.c
View File

@@ -62,7 +62,7 @@ glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf)
if (getloadavg (buf->loadavg, 3))
return;
#else
if(!(kc = server->machine.kc))
if(!(kc = server->_priv->machine.kc))
return;
switch(kstat_chain_update(kc))
{
@@ -70,7 +70,7 @@ glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf)
case 0: break;
default: glibtop_get_kstats(server);
}
if(!(ksp = server->machine.system))
if(!(ksp = server->_priv->machine.system))
return;
if(kstat_read(kc, ksp, NULL) < 0)
return;

8
sysdeps/solaris/mem.c
View File

@@ -52,10 +52,10 @@ glibtop_init_mem_s (glibtop *server)
int
glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
{
kstat_ctl_t *kc = server->machine.kc;
kstat_ctl_t *kc = server->_priv->machine.kc;
kstat_t *ksp;
kstat_named_t *kn;
int pagesize = server->machine.pagesize;
int pagesize = server->_priv->machine.pagesize;
#ifndef KSTAT_DATA_UINT32
#define ui32 ul
@@ -75,7 +75,7 @@ glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
default: glibtop_get_kstats(server);
}
if((ksp = server->machine.syspages) && kstat_read(kc, ksp, NULL) >= 0)
if((ksp = server->_priv->machine.syspages) && kstat_read(kc, ksp, NULL) >= 0)
{
kn = (kstat_named_t *)kstat_data_lookup(ksp, "pagesfree");
if(kn)
@@ -99,7 +99,7 @@ glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
/* Bunyip module provides data in multiples of system page size */
if((ksp = server->machine.bunyip) && kstat_read(kc, ksp, NULL) >= 0)
if((ksp = server->_priv->machine.bunyip) && kstat_read(kc, ksp, NULL) >= 0)
{
kn = (kstat_named_t *)kstat_data_lookup(ksp, "pages_anon");
if(kn)

4
sysdeps/solaris/msg_limits.c
View File

@@ -39,7 +39,7 @@ static const unsigned long _glibtop_sysdeps_msg_limits =
int
glibtop_init_msg_limits_p (glibtop *server)
{
kvm_t *kd = server->machine.kd;
kvm_t *kd = server->_priv->machine.kd;
if(kd && !kvm_nlist(kd, nlst))
server->sysdeps.msg_limits = _glibtop_sysdeps_msg_limits;
@@ -52,7 +52,7 @@ glibtop_init_msg_limits_p (glibtop *server)
int
glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf)
{
kvm_t *kd = server->machine.kd;
kvm_t *kd = server->_priv->machine.kd;
struct msginfo minfo;
memset (buf, 0, sizeof (glibtop_msg_limits));

86
sysdeps/solaris/open.c
View File

@@ -39,7 +39,7 @@
void
glibtop_get_kstats(glibtop *server)
{
kstat_ctl_t *kc = server->machine.kc;
kstat_ctl_t *kc = server->_priv->machine.kc;
kstat_t *ksp;
int nproc_same, new_ncpu;
@@ -48,22 +48,22 @@ glibtop_get_kstats(glibtop *server)
if(!kc)
{
server->ncpu = new_ncpu;
server->machine.vminfo_kstat = NULL;
server->machine.system = NULL;
server->machine.syspages = NULL;
server->machine.bunyip = NULL;
server->_priv->machine.vminfo_kstat = NULL;
server->_priv->machine.system = NULL;
server->_priv->machine.syspages = NULL;
server->_priv->machine.bunyip = NULL;
return;
}
do {
ksp = kstat_lookup(kc, "unix", -1, "vminfo");
server->machine.vminfo_kstat = ksp;
server->_priv->machine.vminfo_kstat = ksp;
if(ksp)
{
kstat_read(kc, ksp, &server->machine.vminfo);
kstat_read(kc, ksp, &server->_priv->machine.vminfo);
/* Don't change snaptime if we only need to reinitialize kstats */
if(!(server->machine.vminfo_snaptime))
server->machine.vminfo_snaptime = ksp->ks_snaptime;
if(!(server->_priv->machine.vminfo_snaptime))
server->_priv->machine.vminfo_snaptime = ksp->ks_snaptime;
}
/* We don't know why was kstat chain invalidated. It could have
@@ -78,10 +78,10 @@ glibtop_get_kstats(glibtop *server)
char cpu[20];
for(i = 0, checked = 0; i < GLIBTOP_NCPU || checked == new_ncpu; ++i)
if(server->machine.cpu_stat_kstat[i])
if(server->_priv->machine.cpu_stat_kstat[i])
{
sprintf(cpu, "cpu_stat%d", i);
if(!(server->machine.cpu_stat_kstat[i] =
if(!(server->_priv->machine.cpu_stat_kstat[i] =
kstat_lookup(kc, "cpu_stat", -1, cpu)))
{
nproc_same = 0;
@@ -103,19 +103,19 @@ glibtop_get_kstats(glibtop *server)
{
if(p_online(p, P_STATUS) < 0)
{
server->machine.cpu_stat_kstat[p] = NULL;
server->_priv->machine.cpu_stat_kstat[p] = NULL;
continue;
}
sprintf(cpu, "cpu_stat%d", (int)p);
server->machine.cpu_stat_kstat[p] =
server->_priv->machine.cpu_stat_kstat[p] =
kstat_lookup(kc, "cpu_stat", -1, cpu);
++found;
}
}
server->machine.system = kstat_lookup(kc, "unix", -1, "system_misc");
server->machine.syspages = kstat_lookup(kc, "unix", -1, "system_pages");
server->machine.bunyip = kstat_lookup(kc, "bunyip", -1, "mempages");
server->_priv->machine.system = kstat_lookup(kc, "unix", -1, "system_misc");
server->_priv->machine.syspages = kstat_lookup(kc, "unix", -1, "system_pages");
server->_priv->machine.bunyip = kstat_lookup(kc, "bunyip", -1, "mempages");
} while(kstat_chain_update(kc) > 0 &&
(new_ncpu = sysconf(_SC_NPROCESSORS_CONF)));
@@ -138,16 +138,16 @@ glibtop_open_s (glibtop *server, const char *program_name,
page = sysconf(_SC_PAGESIZE) >> 10;
for(i = 0; page; ++i, page >>= 1);
server->machine.pagesize = i - 1;
server->machine.ticks = sysconf(_SC_CLK_TCK);
server->machine.kc = kc = kstat_open ();
server->_priv->machine.pagesize = i - 1;
server->_priv->machine.ticks = sysconf(_SC_CLK_TCK);
server->_priv->machine.kc = kc = kstat_open ();
#if 0
for (ksp = server->machine.kc->kc_chain; ksp != NULL; ksp = ksp->ks_next) {
for (ksp = server->_priv->machine.kc->kc_chain; ksp != NULL; ksp = ksp->ks_next) {
if (!strcmp (ksp->ks_class, "vm") && !strcmp (ksp->ks_name, "vminfo")) {
server->machine.vminfo_kstat = ksp;
kstat_read (server->machine.kc, ksp, &server->machine.vminfo);
server->machine.vminfo_snaptime = ksp->ks_snaptime;
server->_priv->machine.vminfo_kstat = ksp;
kstat_read (server->_priv->machine.kc, ksp, &server->_priv->machine.vminfo);
server->_priv->machine.vminfo_snaptime = ksp->ks_snaptime;
continue;
}
@@ -160,7 +160,7 @@ glibtop_open_s (glibtop *server, const char *program_name,
if (cpu >= server->ncpu)
server->ncpu = cpu+1;
server->machine.cpu_stat_kstat [cpu] = ksp;
server->_priv->machine.cpu_stat_kstat [cpu] = ksp;
continue;
}
}
@@ -171,33 +171,33 @@ glibtop_open_s (glibtop *server, const char *program_name,
glibtop_warn_io_r (server, "kstat_open ()");
server->ncpu = -1; /* Force processor detection */
server->machine.vminfo_snaptime = 0; /* Force snaptime read */
server->_priv->machine.vminfo_snaptime = 0; /* Force snaptime read */
glibtop_get_kstats(server);
server->machine.boot = 0;
if((ksp = server->machine.system) && kstat_read(kc, ksp, NULL) >= 0)
server->_priv->machine.boot = 0;
if((ksp = server->_priv->machine.system) && kstat_read(kc, ksp, NULL) >= 0)
{
kn = (kstat_named_t *)kstat_data_lookup(ksp, "boot_time");
if(kn)
switch(kn->data_type)
{
#ifdef KSTAT_DATA_INT32
case KSTAT_DATA_INT32: server->machine.boot = kn->value.i32;
case KSTAT_DATA_INT32: server->_priv->machine.boot = kn->value.i32;
break;
case KSTAT_DATA_UINT32: server->machine.boot = kn->value.ui32;
case KSTAT_DATA_UINT32: server->_priv->machine.boot = kn->value.ui32;
break;
case KSTAT_DATA_INT64: server->machine.boot = kn->value.i64;
case KSTAT_DATA_INT64: server->_priv->machine.boot = kn->value.i64;
break;
case KSTAT_DATA_UINT64: server->machine.boot = kn->value.ui64;
case KSTAT_DATA_UINT64: server->_priv->machine.boot = kn->value.ui64;
break;
#else
case KSTAT_DATA_LONG: server->machine.boot = kn->value.l;
case KSTAT_DATA_LONG: server->_priv->machine.boot = kn->value.l;
break;
case KSTAT_DATA_ULONG: server->machine.boot = kn->value.ul;
case KSTAT_DATA_ULONG: server->_priv->machine.boot = kn->value.ul;
break;
case KSTAT_DATA_LONGLONG: server->machine.boot = kn->value.ll;
case KSTAT_DATA_LONGLONG: server->_priv->machine.boot = kn->value.ll;
break;
case KSTAT_DATA_ULONGLONG: server->machine.boot = kn->value.ull;
case KSTAT_DATA_ULONGLONG: server->_priv->machine.boot = kn->value.ull;
break;
#endif
}
@@ -208,7 +208,7 @@ glibtop_open_s (glibtop *server, const char *program_name,
#if GLIBTOP_SOLARIS_RELEASE >= 560
dl = dlopen("/usr/lib/libproc.so", RTLD_LAZY);
server->machine.libproc = dl;
server->_priv->machine.libproc = dl;
if(dl)
{
void *func;
@@ -216,18 +216,18 @@ glibtop_open_s (glibtop *server, const char *program_name,
func = dlsym(dl, "Pobjname"); /* Solaris 8 */
if(!func)
func = dlsym(dl, "proc_objname"); /* Solaris 7 */
server->machine.objname = (void (*)
server->_priv->machine.objname = (void (*)
(void *, uintptr_t, const char *, size_t))func;
server->machine.pgrab = (struct ps_prochandle *(*)(pid_t, int, int *))
server->_priv->machine.pgrab = (struct ps_prochandle *(*)(pid_t, int, int *))
dlsym(dl, "Pgrab");
server->machine.pfree = (void (*)(void *))dlsym(dl, "Pfree");
server->_priv->machine.pfree = (void (*)(void *))dlsym(dl, "Pfree");
}
else
{
server->machine.objname = NULL;
server->machine.pgrab = NULL;
server->machine.pfree = NULL;
server->_priv->machine.objname = NULL;
server->_priv->machine.pgrab = NULL;
server->_priv->machine.pfree = NULL;
}
#endif
server->machine.me = getpid();
server->_priv->machine.me = getpid();
}

16
sysdeps/solaris/open_suid.c
View File

@@ -62,13 +62,13 @@ glibtop_open_p (glibtop *server, const char *program_name,
server->name = program_name;
server->machine.uid = getuid ();
server->machine.euid = geteuid ();
server->machine.gid = getgid ();
server->machine.egid = getegid ();
server->_priv->machine.uid = getuid ();
server->_priv->machine.euid = geteuid ();
server->_priv->machine.gid = getgid ();
server->_priv->machine.egid = getegid ();
server->machine.kd = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL);
if(!server->machine.kd)
server->_priv->machine.kd = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL);
if(!server->_priv->machine.kd)
glibtop_warn_io_r(server, "kvm_open()");
/* Drop priviledges; we only become root when necessary.
@@ -78,10 +78,10 @@ glibtop_open_p (glibtop *server, const char *program_name,
*/
if (setreuid (server->machine.euid, server->machine.uid))
if (setreuid (server->_priv->machine.euid, server->_priv->machine.uid))
_exit (1);
if (setregid (server->machine.egid, server->machine.gid))
if (setregid (server->_priv->machine.egid, server->_priv->machine.gid))
_exit (1);
/* !!! END OF SUID ROOT PART !!! */

10
sysdeps/solaris/procmap.c
View File

@@ -132,9 +132,9 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf, pid_t pid)
#if GLIBTOP_SOLARIS_RELEASE >= 560
if(server->machine.objname && server->machine.pgrab &&
server->machine.pfree)
Pr = (server->machine.pgrab)(pid, 1, &pr_err);
if(server->_priv->machine.objname && server->_priv->machine.pgrab &&
server->_priv->machine.pfree)
Pr = (server->_priv->machine.pgrab)(pid, 1, &pr_err);
#endif
for(heap = 0,i = 0; i < nmaps; ++i)
{
@@ -184,7 +184,7 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf, pid_t pid)
else
if(Pr)
{
server->machine.objname(Pr, maps[i].pr_vaddr, buffer,
server->_priv->machine.objname(Pr, maps[i].pr_vaddr, buffer,
BUFSIZ);
if((len = resolvepath(buffer, entry[i].filename,
GLIBTOP_MAP_FILENAME_LEN)) > 0)
@@ -199,7 +199,7 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf, pid_t pid)
#if GLIBTOP_SOLARIS_RELEASE >= 560
if(Pr)
server->machine.pfree(Pr);
server->_priv->machine.pfree(Pr);
#endif
buf->flags = _glibtop_sysdeps_proc_map;
s_close(fd);

2
sysdeps/solaris/procmem.c
View File

@@ -45,7 +45,7 @@ glibtop_get_proc_mem_s (glibtop *server, glibtop_proc_mem *buf, pid_t pid)
struct psinfo psinfo;
#else
struct prpsinfo psinfo;
int pagesize = server->machine.pagesize;
int pagesize = server->_priv->machine.pagesize;
#endif
memset (buf, 0, sizeof (glibtop_proc_mem));

4
sysdeps/solaris/sem_limits.c
View File

@@ -40,7 +40,7 @@ static const unsigned long _glibtop_sysdeps_sem_limits =
int
glibtop_init_sem_limits_p (glibtop *server)
{
kvm_t *kd = server->machine.kd;
kvm_t *kd = server->_priv->machine.kd;
if(kd && !kvm_nlist(kd, nlst))
server->sysdeps.sem_limits = _glibtop_sysdeps_sem_limits;
@@ -53,7 +53,7 @@ glibtop_init_sem_limits_p (glibtop *server)
int
glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf)
{
kvm_t *kd = server->machine.kd;
kvm_t *kd = server->_priv->machine.kd;
struct seminfo sinfo;
memset (buf, 0, sizeof (glibtop_sem_limits));

4
sysdeps/solaris/shm_limits.c
View File

@@ -37,7 +37,7 @@ static const unsigned long _glibtop_sysdeps_shm_limits =
int
glibtop_init_shm_limits_p (glibtop *server)
{
kvm_t *kd = server->machine.kd;
kvm_t *kd = server->_priv->machine.kd;
if(kd && !kvm_nlist(kd, nlst))
server->sysdeps.shm_limits = _glibtop_sysdeps_shm_limits;
@@ -50,7 +50,7 @@ glibtop_init_shm_limits_p (glibtop *server)
int
glibtop_get_shm_limits_p (glibtop *server, glibtop_shm_limits *buf)
{
kvm_t *kd = server->machine.kd;
kvm_t *kd = server->_priv->machine.kd;
struct shminfo sinfo;
memset (buf, 0, sizeof (glibtop_shm_limits));

18
sysdeps/solaris/swap.c
View File

@@ -47,8 +47,8 @@ glibtop_init_swap_s (glibtop *server)
int
glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
{
kstat_ctl_t *kc = server->machine.kc;
kstat_t *ksp = server->machine.vminfo_kstat;
kstat_ctl_t *kc = server->_priv->machine.kc;
kstat_t *ksp = server->_priv->machine.vminfo_kstat;
u_int64_t swap_resv, swap_alloc, swap_avail, swap_free;
vminfo_t vminfo;
double rate;
@@ -71,15 +71,15 @@ glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
return;
}
rate = (ksp->ks_snaptime - server->machine.vminfo_snaptime) / 1E+9;
rate = (ksp->ks_snaptime - server->_priv->machine.vminfo_snaptime) / 1E+9;
swap_resv = (vminfo.swap_resv - server->machine.vminfo.swap_resv) / rate;
swap_alloc = (vminfo.swap_alloc - server->machine.vminfo.swap_alloc) / rate;
swap_avail = (vminfo.swap_avail - server->machine.vminfo.swap_avail) / rate;
swap_free = (vminfo.swap_free - server->machine.vminfo.swap_free) / rate;
swap_resv = (vminfo.swap_resv - server->_priv->machine.vminfo.swap_resv) / rate;
swap_alloc = (vminfo.swap_alloc - server->_priv->machine.vminfo.swap_alloc) / rate;
swap_avail = (vminfo.swap_avail - server->_priv->machine.vminfo.swap_avail) / rate;
swap_free = (vminfo.swap_free - server->_priv->machine.vminfo.swap_free) / rate;
memcpy (&server->machine.vminfo, &vminfo, sizeof (vminfo_t));
server->machine.vminfo_snaptime = ksp->ks_snaptime;
memcpy (&server->_priv->machine.vminfo, &vminfo, sizeof (vminfo_t));
server->_priv->machine.vminfo_snaptime = ksp->ks_snaptime;
buf->total = swap_resv + swap_avail;
buf->used = swap_alloc;

6
sysdeps/solaris/uptime.c
View File

@@ -44,10 +44,10 @@ glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf)
{
memset (buf, 0, sizeof (glibtop_uptime));
if(!(server->machine.boot))
if(!(server->_priv->machine.boot))
return;
buf->boot_time = server->machine.boot;
buf->uptime = time(NULL) - server->machine.boot;
buf->boot_time = server->_priv->machine.boot;
buf->uptime = time(NULL) - server->_priv->machine.boot;
buf->flags = _glibtop_sysdeps_uptime;
}