bughz/sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

optimize cpu.vm kstat lookups

Browse Source
This commit is contained in:
Doug MacEachern 2008-05-28 06:04:58 +00:00
parent c0bd0b1830
commit 87b194fbb1
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/os/solaris/solaris_sigar.c
View File

@ -36,6 +36,26 @@
#define PROC_ERRNO ((errno == ENOENT) ? ESRCH : errno) #define PROC_ERRNO ((errno == ENOENT) ? ESRCH : errno)
#define SIGAR_USR_UCB_PS "/usr/ucb/ps" #define SIGAR_USR_UCB_PS "/usr/ucb/ps"
/* like kstat_lookup but start w/ ksp->ks_next instead of kc->kc_chain */
static kstat_t *
kstat_next(kstat_t *ksp, char *ks_module, int ks_instance, char *ks_name)
{
if (ksp) {
ksp = ksp->ks_next;
}
for (; ksp; ksp = ksp->ks_next) {
if ((ks_module == NULL ||
strcmp(ksp->ks_module, ks_module) == 0) &&
(ks_instance == -1 || ksp->ks_instance == ks_instance) &&
(ks_name == NULL || strcmp(ksp->ks_name, ks_name) == 0))
return ksp;
}
errno = ENOENT;
return NULL;
}
int sigar_os_open(sigar_t **sig) int sigar_os_open(sigar_t **sig)
{ {
kstat_ctl_t *kc; kstat_ctl_t *kc;
@ -205,7 +225,6 @@ int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem)
int sigar_swap_get(sigar_t *sigar, sigar_swap_t *swap) int sigar_swap_get(sigar_t *sigar, sigar_swap_t *swap)
{ {
unsigned int i, id;
kstat_t *ksp; kstat_t *ksp;
kstat_named_t *kn; kstat_named_t *kn;
struct anoninfo anon; struct anoninfo anon;
@ -228,30 +247,23 @@ int sigar_swap_get(sigar_t *sigar, sigar_swap_t *swap)
swap->free <<= sigar->pagesize; swap->free <<= sigar->pagesize;
swap->used <<= sigar->pagesize; swap->used <<= sigar->pagesize;
swap->page_in = swap->page_out = SIGAR_FIELD_NOTIMPL;
if (sigar_kstat_update(sigar) == -1) { if (sigar_kstat_update(sigar) == -1) {
return errno; return errno;
} }
if (!kstat_lookup(sigar->kc, "cpu", -1, "vm")) { if (!(ksp = kstat_lookup(sigar->kc, "cpu", -1, "vm"))) {
swap->page_in = swap->page_out = SIGAR_FIELD_NOTIMPL;
return SIGAR_OK; return SIGAR_OK;
} }
swap->page_in = swap->page_out = 0; swap->page_in = swap->page_out = 0;
/* XXX: optimize out kstat_lookup */ /* XXX: these stats do not exist in this form on solaris 8 or 9.
/* XXX: these stats do not exist in this form on solaris 8
* they are in the raw cpu_stat struct, but thats not * they are in the raw cpu_stat struct, but thats not
* binary compatible * binary compatible
*/ */
/* XXX: not tested on 9. */ do {
for (i=0, id=0; i<sigar->ncpu; id++) {
if (!(ksp = kstat_lookup(sigar->kc, "cpu", id, "vm"))) {
continue;
}
i++;
if (kstat_read(sigar->kc, ksp, NULL) < 0) { if (kstat_read(sigar->kc, ksp, NULL) < 0) {
continue; break;
} }
if ((kn = (kstat_named_t *)kstat_data_lookup(ksp, "pgin"))) { if ((kn = (kstat_named_t *)kstat_data_lookup(ksp, "pgin"))) {
@ -260,7 +272,7 @@ int sigar_swap_get(sigar_t *sigar, sigar_swap_t *swap)
if ((kn = (kstat_named_t *)kstat_data_lookup(ksp, "pgout"))) { if ((kn = (kstat_named_t *)kstat_data_lookup(ksp, "pgout"))) {
swap->page_out += kn->value.i64; /* vmstat -s | grep "page outs" */ swap->page_out += kn->value.i64; /* vmstat -s | grep "page outs" */
} }
} } while ((ksp = kstat_next(ksp, "cpu", -1, "vm")));
return SIGAR_OK; return SIGAR_OK;
} }