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

deal w/ unpartitioned disk kstats

This commit is contained in:
Doug MacEachern 2004-12-07 06:06:29 +00:00
parent 1a4f8ae004
commit 836d67f92f
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1296,32 +1296,50 @@ static int create_fsdev_cache(sigar_t *sigar)
return SIGAR_OK; return SIGAR_OK;
} }
static int fs_kstat_read(sigar_t *sigar,
sigar_file_system_usage_t *fsusage,
kstat_t *ksp)
{
kstat_io_t io;
kstat_read(sigar->kc, ksp, &io);
fsusage->disk_reads = io.reads;
fsusage->disk_writes = io.writes;
return SIGAR_OK;
}
static int get_fs_kstat(sigar_t *sigar, static int get_fs_kstat(sigar_t *sigar,
sigar_file_system_usage_t *fsusage, sigar_file_system_usage_t *fsusage,
fs_kstat_t *fsk) fs_kstat_t *fsk)
{ {
kstat_t *ksp; kstat_t *ksp, *first;
char *ptr; char *ptr;
kstat_chain_update(sigar->kc); kstat_chain_update(sigar->kc);
ksp = kstat_lookup(sigar->kc, fsk->module, fsk->instance, NULL); first = ksp =
kstat_lookup(sigar->kc, fsk->module, fsk->instance, NULL);
if (!ksp) { if (!ksp) {
return ENXIO; return ENXIO;
} }
/* first entry is for the entire disk.
* if there are no partitions specified,
* report metrics for the entire disk.
*/
if (!ksp->ks_next ||
!strEQ(ksp->ks_next->ks_module, fsk->module))
{
return fs_kstat_read(sigar, fsusage, first);
}
ksp = ksp->ks_next;
while (ksp) { while (ksp) {
if (!strEQ(ksp->ks_module, fsk->module)) { if (!strEQ(ksp->ks_module, fsk->module)) {
break; /* chain goes beyond our module */ break; /* chain goes beyond our module */
} }
if ((ptr = strchr(ksp->ks_name, ','))) { if ((ptr = strchr(ksp->ks_name, ','))) {
if (*(ptr+1) == fsk->partition) { if (*(ptr+1) == fsk->partition) {
kstat_io_t io; return fs_kstat_read(sigar, fsusage, ksp);
kstat_read(sigar->kc, ksp, &io);
fsusage->disk_reads = io.reads;
fsusage->disk_writes = io.writes;
return SIGAR_OK;
} }
} }