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

fix freebsd compile

This commit is contained in:
Doug MacEachern 2005-12-02 02:30:53 +00:00
parent abf6d0735f
commit e0bc9674b5
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/os/darwin/darwin_sigar.c
View File

@ -1345,18 +1345,27 @@ int sigar_cpu_info_list_get(sigar_t *sigar,
sigar_cpu_info_list_t *cpu_infos) sigar_cpu_info_list_t *cpu_infos)
{ {
int i; int i;
unsigned int mhz, cache_size; unsigned int mhz;
int cache_size=SIGAR_FIELD_NOTIMPL;
size_t size; size_t size;
char model[128], vendor[128], *ptr; char model[128], vendor[128], *ptr;
size = sizeof(mhz); size = sizeof(mhz);
if (sysctlbyname(CTL_HW_FREQ, &mhz, &size, NULL, 0) < 0) {
#ifdef DARWIN
{
int mib[] = { CTL_HW, HW_CPU_FREQ }; int mib[] = { CTL_HW, HW_CPU_FREQ };
size = sizeof(mhz); size = sizeof(mhz);
if (sysctl(mib, NMIB(mib), &mhz, &size, NULL, 0) < 0) { if (sysctl(mib, NMIB(mib), &mhz, &size, NULL, 0) < 0) {
mhz = SIGAR_FIELD_NOTIMPL; mhz = SIGAR_FIELD_NOTIMPL;
} }
} }
#else
if (sysctlbyname(CTL_HW_FREQ, &mhz, &size, NULL, 0) < 0) {
mhz = SIGAR_FIELD_NOTIMPL;
}
#endif
if (mhz != SIGAR_FIELD_NOTIMPL) { if (mhz != SIGAR_FIELD_NOTIMPL) {
mhz /= 1000000; mhz /= 1000000;
} }
@ -1388,6 +1397,7 @@ int sigar_cpu_info_list_get(sigar_t *sigar,
SIGAR_SSTRCPY(model, ptr+1); SIGAR_SSTRCPY(model, ptr+1);
} }
#ifdef DARWIN
{ {
int mib[] = { CTL_HW, HW_L2CACHESIZE }; / * in bytes */ int mib[] = { CTL_HW, HW_L2CACHESIZE }; / * in bytes */
size = sizeof(cache_size); size = sizeof(cache_size);
@ -1395,6 +1405,7 @@ int sigar_cpu_info_list_get(sigar_t *sigar,
cache_size = SIGAR_FIELD_NOTIMPL; cache_size = SIGAR_FIELD_NOTIMPL;
} }
} }
#endif
sigar_cpu_info_list_create(cpu_infos); sigar_cpu_info_list_create(cpu_infos);