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

fix cpu_list bug

This commit is contained in:
Doug MacEachern 2004-06-22 01:29:47 +00:00
parent f4f3fa05fb
commit e964155cd6
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@ int sigar_os_open(sigar_t **sig)
return errno; return errno;
} }
sigar->cpulist.size = 0;
sigar->ncpu = 0; sigar->ncpu = 0;
sigar->ks.cpu = NULL; sigar->ks.cpu = NULL;
sigar->ks.cpuid = NULL; sigar->ks.cpuid = NULL;
@ -99,6 +100,9 @@ int sigar_os_close(sigar_t *sigar)
if (sigar->pinfo) { if (sigar->pinfo) {
free(sigar->pinfo); free(sigar->pinfo);
} }
if (sigar->cpulist.size != 0) {
sigar_cpu_list_destroy(sigar, &sigar->cpulist);
}
free(sigar); free(sigar);
return SIGAR_OK; return SIGAR_OK;
} }
@ -276,10 +280,20 @@ int sigar_cpu_list_get(sigar_t *sigar, sigar_cpu_list_t *cpulist)
unsigned int i, n; unsigned int i, n;
sigar_kstat_update(sigar); sigar_kstat_update(sigar);
if (cpulist != &sigar->cpulist) { if (cpulist == &sigar->cpulist) {
if (sigar->cpulist.size == 0) {
/* create once */
sigar_cpu_list_create(cpulist);
}
else {
/* reset, re-using cpulist.data */
sigar->cpulist.number = 0;
}
}
else {
sigar_cpu_list_create(cpulist); sigar_cpu_list_create(cpulist);
} }
for (i=0; i<sigar->ncpu; i++) { for (i=0; i<sigar->ncpu; i++) {
sigar_cpu_t *cpu; sigar_cpu_t *cpu;
char *buf; char *buf;