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

refactor sigar_net_ifstat_get_any to prepare for 'bge' interface support

Browse Source
This commit is contained in:
Doug MacEachern 2005-10-09 00:13:25 +00:00
parent 3ff35b960b
commit 15d139a8a5
1 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1797,46 +1797,15 @@ static int sigar_net_ifstat_get_mib2(sigar_t *sigar, const char *name,
} }
#endif #endif
static int sigar_net_ifstat_get_any(sigar_t *sigar, const char *name, static void ifstat_kstat_common(sigar_net_interface_stat_t *ifstat,
sigar_net_interface_stat_t *ifstat) kstat_named_t *data, int ndata)
{ {
kstat_ctl_t *kc = sigar->kc; int i;
kstat_t *ksp;
kstat_named_t *data;
char dev[64], *ptr=dev;
int num, i;
kstat_chain_update(kc); for (i=0; i<ndata; i++) {
strncpy(dev, name, sizeof(dev)-1);
dev[sizeof(dev)-1] = '\0';
while (!sigar_isdigit(*ptr) && (*ptr != '\0')) {
ptr++;
}
if (*ptr == '\0') {
return ENXIO;
}
/* iprb0 -> dev="iprb", num=0 */
num = atoi(ptr);
*ptr = '\0';
if (!(ksp = kstat_lookup(kc, dev, num, NULL))) {
return ENXIO;
}
if (kstat_read(kc, ksp, NULL) < 0) {
return ENOENT;
}
SIGAR_ZERO(ifstat);
data = (kstat_named_t *)ksp->ks_data;
for (i=0; i<ksp->ks_ndata; i++) {
sigar_uint64_t value = data[i].value.ui32; sigar_uint64_t value = data[i].value.ui32;
ptr = data[i].name; char *ptr = data[i].name;
switch (*ptr) { switch (*ptr) {
case 'c': case 'c':
@ -1903,6 +1872,53 @@ static int sigar_net_ifstat_get_any(sigar_t *sigar, const char *name,
break; break;
} }
} }
}
static int sigar_net_ifstat_get_any(sigar_t *sigar, const char *name,
sigar_net_interface_stat_t *ifstat)
{
kstat_ctl_t *kc = sigar->kc;
kstat_t *ksp;
kstat_named_t *data;
char dev[64], *ptr=dev;
int num;
kstat_chain_update(kc);
strncpy(dev, name, sizeof(dev)-1);
dev[sizeof(dev)-1] = '\0';
while (!sigar_isdigit(*ptr) && (*ptr != '\0')) {
ptr++;
}
if (*ptr == '\0') {
return ENXIO;
}
/* iprb0 -> dev="iprb", num=0 */
num = atoi(ptr);
*ptr = '\0';
if (!(ksp = kstat_lookup(kc, dev, num, NULL))) {
return ENXIO;
}
if (kstat_read(kc, ksp, NULL) < 0) {
return ENOENT;
}
SIGAR_ZERO(ifstat);
data = (kstat_named_t *)ksp->ks_data;
/* http://cvs.opensolaris.org/source/xref/usr/src/uts/common/io/bge */
if (strEQ(dev, "bge")) {
/* XXX totally different names */
/* ifstat_kstat_bge(ifstat, data, ksp->ks_ndata); */
}
else {
ifstat_kstat_common(ifstat, data, ksp->ks_ndata);
}
return SIGAR_OK; return SIGAR_OK;
} }