From bbb539ef56c1d80944f32b95a4777cae3a1493f9 Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Sat, 25 Dec 1999 19:01:13 +0000 Subject: [PATCH] Indent everything to 4 spaces to make it consistant with the other LibGTop code. --- sysdeps/solaris/loadavg.c | 62 +++++++++++++++++------------------- sysdeps/solaris/msg_limits.c | 46 +++++++++++++------------- sysdeps/solaris/safeio.c | 54 +++++++++++++++---------------- sysdeps/solaris/sem_limits.c | 52 +++++++++++++++--------------- sysdeps/solaris/shm_limits.c | 40 +++++++++++------------ sysdeps/solaris/uptime.c | 18 +++++------ 6 files changed, 135 insertions(+), 137 deletions(-) diff --git a/sysdeps/solaris/loadavg.c b/sysdeps/solaris/loadavg.c index fc38415b..aadd5744 100644 --- a/sysdeps/solaris/loadavg.c +++ b/sysdeps/solaris/loadavg.c @@ -40,9 +40,9 @@ static const unsigned long _glibtop_sysdeps_loadavg = int glibtop_init_loadavg_s (glibtop *server) { - server->sysdeps.loadavg = _glibtop_sysdeps_loadavg; + server->sysdeps.loadavg = _glibtop_sysdeps_loadavg; - return 0; + return 0; } /* Provides load average. */ @@ -51,41 +51,39 @@ int glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf) { #ifndef HAVE_GETLOADAVG - kstat_ctl_t *kc; - kstat_t *ksp; - int i; - static char *avestrings[] = { "avenrun_1min", - "avenrun_5min", - "avenrun_15min" }; + kstat_ctl_t *kc; + kstat_t *ksp; + int i; + static char *avestrings[] = { "avenrun_1min", + "avenrun_5min", + "avenrun_15min" }; #endif - memset (buf, 0, sizeof (glibtop_loadavg)); + memset (buf, 0, sizeof (glibtop_loadavg)); #ifdef HAVE_GETLOADAVG - if (getloadavg (buf->loadavg, 3) < 0) - return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; + if (getloadavg (buf->loadavg, 3) < 0) + return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; #else - if(!(kc = server->_priv->machine.kc)) - return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; - switch(kstat_chain_update(kc)) - { - case -1: assert(0); /* Debugging, shouldn't happen */ - case 0: break; - default: glibtop_get_kstats(server); - } - if(!(ksp = server->_priv->machine.system)) - return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; - if(kstat_read(kc, ksp, NULL) < 0) - return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; - for(i = 0; i < 3; ++i) /* Do we have a countof macro? */ - { - kstat_named_t *kn; + if(!(kc = server->_priv->machine.kc)) + return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; + switch(kstat_chain_update(kc)) { + case -1: assert(0); /* Debugging, shouldn't happen */ + case 0: break; + default: glibtop_get_kstats(server); + } + if(!(ksp = server->_priv->machine.system)) + return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; + if(kstat_read(kc, ksp, NULL) < 0) + return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; + for(i = 0; i < 3; ++i) { /* Do we have a countof macro? */ + kstat_named_t *kn; - kn = (kstat_named_t *)kstat_data_lookup(ksp, avestrings[i]); - if(kn) - buf->loadavg[i] = (double)kn->value.ul / FSCALE; - } + kn = (kstat_named_t *)kstat_data_lookup(ksp, avestrings[i]); + if(kn) + buf->loadavg[i] = (double)kn->value.ul / FSCALE; + } #endif - buf->flags = _glibtop_sysdeps_loadavg; + buf->flags = _glibtop_sysdeps_loadavg; - return 0; + return 0; } diff --git a/sysdeps/solaris/msg_limits.c b/sysdeps/solaris/msg_limits.c index c4cc986e..0f008dcc 100644 --- a/sysdeps/solaris/msg_limits.c +++ b/sysdeps/solaris/msg_limits.c @@ -39,14 +39,14 @@ static const unsigned long _glibtop_sysdeps_msg_limits = int glibtop_init_msg_limits_p (glibtop *server) { - kvm_t *kd = server->_priv->machine.kd; + kvm_t *kd = server->_priv->machine.kd; - if(kd && !kvm_nlist(kd, nlst)) - server->sysdeps.msg_limits = _glibtop_sysdeps_msg_limits; - else - server->sysdeps.msg_limits = 0; + if(kd && !kvm_nlist(kd, nlst)) + server->sysdeps.msg_limits = _glibtop_sysdeps_msg_limits; + else + server->sysdeps.msg_limits = 0; - return 0; + return 0; } /* Provides information about sysv ipc limits. */ @@ -54,25 +54,25 @@ glibtop_init_msg_limits_p (glibtop *server) int glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf) { - kvm_t *kd = server->_priv->machine.kd; - struct msginfo minfo; + kvm_t *kd = server->_priv->machine.kd; + struct msginfo minfo; - memset (buf, 0, sizeof (glibtop_msg_limits)); + memset (buf, 0, sizeof (glibtop_msg_limits)); - if(!(server->sysdeps.msg_limits)) - return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; - if(kvm_read(kd, nlst[0].n_value, (void *)&minfo, - sizeof(struct msginfo)) != sizeof(struct msginfo)) - return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; + if(!(server->sysdeps.msg_limits)) + return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; + if(kvm_read(kd, nlst[0].n_value, (void *)&minfo, + sizeof(struct msginfo)) != sizeof(struct msginfo)) + return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; - buf->msgmap = minfo.msgmap; - buf->msgmax = minfo.msgmax; - buf->msgmnb = minfo.msgmnb; - buf->msgmni = minfo.msgmni; - buf->msgssz = minfo.msgssz; - buf->msgtql = minfo.msgtql; - buf->msgpool = minfo.msgmni * minfo.msgmnb >> 10; - buf->flags = _glibtop_sysdeps_msg_limits; + buf->msgmap = minfo.msgmap; + buf->msgmax = minfo.msgmax; + buf->msgmnb = minfo.msgmnb; + buf->msgmni = minfo.msgmni; + buf->msgssz = minfo.msgssz; + buf->msgtql = minfo.msgtql; + buf->msgpool = minfo.msgmni * minfo.msgmnb >> 10; + buf->flags = _glibtop_sysdeps_msg_limits; - return 0; + return 0; } diff --git a/sysdeps/solaris/safeio.c b/sysdeps/solaris/safeio.c index c04914d6..d109731a 100644 --- a/sysdeps/solaris/safeio.c +++ b/sysdeps/solaris/safeio.c @@ -31,56 +31,56 @@ int s_open(const char *file, int mode) { - int fd; + int fd; - do { - fd = open(file, mode); - } while(fd < 0 && errno == EINTR); - return fd; + do { + fd = open(file, mode); + } while(fd < 0 && errno == EINTR); + return fd; } int s_stat(const char *path, struct stat *buf) { - int status; + int status; - do { - status = stat(path, buf); - } while(status < 0 && errno == EINTR); - return status; + do { + status = stat(path, buf); + } while(status < 0 && errno == EINTR); + return status; } int s_close(int fd) { - int status; + int status; - do { - status = close(fd); - } while(status < 0 && errno == EINTR); - return status; + do { + status = close(fd); + } while(status < 0 && errno == EINTR); + return status; } ssize_t s_pread(int fd, void *buf, size_t nbytes, off_t offset) { - ssize_t len; + ssize_t len; - /* Now, why doesn't the pread(2) man page say anything about pread() - return values? Can it read less bytes than requested? */ + /* Now, why doesn't the pread(2) man page say anything about pread() + return values? Can it read less bytes than requested? */ - do { - len = pread(fd, buf, nbytes, offset); - } while(len < 0 && errno == EINTR); - return len; + do { + len = pread(fd, buf, nbytes, offset); + } while(len < 0 && errno == EINTR); + return len; } int s_closedir(DIR *dirp) { - int status; + int status; - do { - status = closedir(dirp); - } while(status < 0 && errno == EINTR); - return status; + do { + status = closedir(dirp); + } while(status < 0 && errno == EINTR); + return status; } diff --git a/sysdeps/solaris/sem_limits.c b/sysdeps/solaris/sem_limits.c index 2572343a..292f456e 100644 --- a/sysdeps/solaris/sem_limits.c +++ b/sysdeps/solaris/sem_limits.c @@ -40,14 +40,14 @@ static const unsigned long _glibtop_sysdeps_sem_limits = int glibtop_init_sem_limits_p (glibtop *server) { - kvm_t *kd = server->_priv->machine.kd; + kvm_t *kd = server->_priv->machine.kd; - if(kd && !kvm_nlist(kd, nlst)) - server->sysdeps.sem_limits = _glibtop_sysdeps_sem_limits; - else - server->sysdeps.sem_limits = 0; + if(kd && !kvm_nlist(kd, nlst)) + server->sysdeps.sem_limits = _glibtop_sysdeps_sem_limits; + else + server->sysdeps.sem_limits = 0; - return 0; + return 0; } /* Provides information about sysv sem limits. */ @@ -55,27 +55,27 @@ glibtop_init_sem_limits_p (glibtop *server) int glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf) { - kvm_t *kd = server->_priv->machine.kd; - struct seminfo sinfo; + kvm_t *kd = server->_priv->machine.kd; + struct seminfo sinfo; - memset (buf, 0, sizeof (glibtop_sem_limits)); + memset (buf, 0, sizeof (glibtop_sem_limits)); - if(!(server->sysdeps.sem_limits)) - return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; - if(kvm_read(kd, nlst[0].n_value, (void *)&sinfo, - sizeof(struct seminfo)) != sizeof(struct seminfo)) - return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; - buf->semmap = sinfo.semmap; - buf->semmni = sinfo.semmni; - buf->semmns = sinfo.semmns; - buf->semmnu = sinfo.semmnu; - buf->semmsl = sinfo.semmsl; - buf->semopm = sinfo.semopm; - buf->semume = sinfo.semume; - buf->semusz = sinfo.semusz; - buf->semvmx = sinfo.semvmx; - buf->semaem = sinfo.semaem; - buf->flags = _glibtop_sysdeps_sem_limits; + if(!(server->sysdeps.sem_limits)) + return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; + if(kvm_read(kd, nlst[0].n_value, (void *)&sinfo, + sizeof(struct seminfo)) != sizeof(struct seminfo)) + return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; + buf->semmap = sinfo.semmap; + buf->semmni = sinfo.semmni; + buf->semmns = sinfo.semmns; + buf->semmnu = sinfo.semmnu; + buf->semmsl = sinfo.semmsl; + buf->semopm = sinfo.semopm; + buf->semume = sinfo.semume; + buf->semusz = sinfo.semusz; + buf->semvmx = sinfo.semvmx; + buf->semaem = sinfo.semaem; + buf->flags = _glibtop_sysdeps_sem_limits; - return 0; + return 0; } diff --git a/sysdeps/solaris/shm_limits.c b/sysdeps/solaris/shm_limits.c index 05da3888..2f16f1ac 100644 --- a/sysdeps/solaris/shm_limits.c +++ b/sysdeps/solaris/shm_limits.c @@ -37,14 +37,14 @@ static const unsigned long _glibtop_sysdeps_shm_limits = int glibtop_init_shm_limits_p (glibtop *server) { - kvm_t *kd = server->_priv->machine.kd; + kvm_t *kd = server->_priv->machine.kd; - if(kd && !kvm_nlist(kd, nlst)) - server->sysdeps.shm_limits = _glibtop_sysdeps_shm_limits; - else - server->sysdeps.shm_limits = 0; + if(kd && !kvm_nlist(kd, nlst)) + server->sysdeps.shm_limits = _glibtop_sysdeps_shm_limits; + else + server->sysdeps.shm_limits = 0; - return 0; + return 0; } /* Provides information about sysv ipc limits. */ @@ -52,21 +52,21 @@ glibtop_init_shm_limits_p (glibtop *server) int glibtop_get_shm_limits_p (glibtop *server, glibtop_shm_limits *buf) { - kvm_t *kd = server->_priv->machine.kd; - struct shminfo sinfo; + kvm_t *kd = server->_priv->machine.kd; + struct shminfo sinfo; - memset (buf, 0, sizeof (glibtop_shm_limits)); + memset (buf, 0, sizeof (glibtop_shm_limits)); - if(!(server->sysdeps.shm_limits)) - return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; - if(kvm_read(kd, nlst[0].n_value, (void *)&sinfo, - sizeof(struct shminfo)) != sizeof(struct shminfo)) - return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; - buf->shmmax = sinfo.shmmax; - buf->shmmin = sinfo.shmmin; - buf->shmmni = sinfo.shmmni; - buf->shmseg = sinfo.shmseg; - buf->flags = _glibtop_sysdeps_shm_limits; + if(!(server->sysdeps.shm_limits)) + return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; + if(kvm_read(kd, nlst[0].n_value, (void *)&sinfo, + sizeof(struct shminfo)) != sizeof(struct shminfo)) + return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; + buf->shmmax = sinfo.shmmax; + buf->shmmin = sinfo.shmmin; + buf->shmmni = sinfo.shmmni; + buf->shmseg = sinfo.shmseg; + buf->flags = _glibtop_sysdeps_shm_limits; - return 0; + return 0; } diff --git a/sysdeps/solaris/uptime.c b/sysdeps/solaris/uptime.c index faf13094..675aa465 100644 --- a/sysdeps/solaris/uptime.c +++ b/sysdeps/solaris/uptime.c @@ -34,9 +34,9 @@ static const unsigned long _glibtop_sysdeps_uptime = int glibtop_init_uptime_s (glibtop *server) { - server->sysdeps.uptime = _glibtop_sysdeps_uptime; + server->sysdeps.uptime = _glibtop_sysdeps_uptime; - return 0; + return 0; } /* Provides uptime and idle time. */ @@ -44,14 +44,14 @@ glibtop_init_uptime_s (glibtop *server) int glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf) { - memset (buf, 0, sizeof (glibtop_uptime)); + memset (buf, 0, sizeof (glibtop_uptime)); - if(!(server->_priv->machine.boot)) - return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; - buf->boot_time = server->_priv->machine.boot; - buf->uptime = time(NULL) - server->_priv->machine.boot; + if(!(server->_priv->machine.boot)) + return -GLIBTOP_ERROR_INCOMPATIBLE_KERNEL; + buf->boot_time = server->_priv->machine.boot; + buf->uptime = time(NULL) - server->_priv->machine.boot; - buf->flags = _glibtop_sysdeps_uptime; + buf->flags = _glibtop_sysdeps_uptime; - return 0; + return 0; }