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

refactor wrapper around get_physical_stat() for reuse

This commit is contained in:
Doug MacEachern 2010-01-17 21:53:28 -08:00
parent 392f6325e0
commit d47fd1e3e7
1 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/os/hpux/hpux_sigar.c
View File

@ -737,6 +737,37 @@ static int sigar_get_mib_info(sigar_t *sigar,
return get_mib_info(sigar->mib, parms); return get_mib_info(sigar->mib, parms);
} }
/* wrapper around get_physical_stat() */
static int sigar_get_physical_stat(sigar_t *sigar, int *count)
{
int status;
unsigned int len;
struct nmparms parms;
len = sizeof(*count);
parms.objid = ID_ifNumber;
parms.buffer = count;
parms.len = &len;
if ((status = sigar_get_mib_info(sigar, &parms)) != SIGAR_OK) {
return status;
}
len = sizeof(nmapi_phystat) * *count;
if (sigar->ifconf_len < len) {
sigar->ifconf_buf = realloc(sigar->ifconf_buf, len);
sigar->ifconf_len = len;
}
if (get_physical_stat(sigar->ifconf_buf, &len) < 0) {
return errno;
}
else {
return SIGAR_OK;
}
}
int sigar_net_route_list_get(sigar_t *sigar, int sigar_net_route_list_get(sigar_t *sigar,
sigar_net_route_list_t *routelist) sigar_net_route_list_t *routelist)
{ {
@ -805,31 +836,13 @@ static int get_mib_ifstat(sigar_t *sigar,
const char *name, const char *name,
mib_ifEntry *mib) mib_ifEntry *mib)
{ {
int status, count, i; int i, status, count;
unsigned int len;
nmapi_phystat *stat; nmapi_phystat *stat;
struct nmparms parms;
len = sizeof(count); if ((status = sigar_get_physical_stat(sigar, &count) != SIGAR_OK)) {
parms.objid = ID_ifNumber;
parms.buffer = &count;
parms.len = &len;
if ((status = sigar_get_mib_info(sigar, &parms)) != SIGAR_OK) {
return status; return status;
} }
len = sizeof(nmapi_phystat) * count;
if (sigar->ifconf_len < len) {
sigar->ifconf_buf = realloc(sigar->ifconf_buf, len);
sigar->ifconf_len = len;
}
if (get_physical_stat(sigar->ifconf_buf, &len) < 0) {
return errno;
}
for (i=0, stat = (nmapi_phystat *)sigar->ifconf_buf; for (i=0, stat = (nmapi_phystat *)sigar->ifconf_buf;
i<count; i<count;
i++, stat++) i++, stat++)