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

need to use sysctlbyname with hw.cpufrequency_{min,max}

This commit is contained in:
Doug MacEachern 2009-08-13 15:45:03 -07:00
parent 326d6085a2
commit ee15426546
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2236,7 +2236,6 @@ int sigar_file_system_usage_get(sigar_t *sigar,
} }
#ifdef DARWIN #ifdef DARWIN
#define CTL_HW_FREQ "hw.cpufrequency"
#define CTL_HW_FREQ_MAX "hw.cpufrequency_max" #define CTL_HW_FREQ_MAX "hw.cpufrequency_max"
#define CTL_HW_FREQ_MIN "hw.cpufrequency_min" #define CTL_HW_FREQ_MIN "hw.cpufrequency_min"
#else #else
@ -2259,25 +2258,18 @@ int sigar_cpu_info_list_get(sigar_t *sigar,
#if defined(DARWIN) #if defined(DARWIN)
{ {
int mib[2]; int mib[] = { CTL_HW, HW_CPU_FREQ };
mib[0] = CTL_HW;
mib[1] = 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;
} }
mib[1] = HW_CPU_FREQ_MAX; }
size = sizeof(mhz_max); if (sysctlbyname(CTL_HW_FREQ_MAX, &mhz_max, &size, NULL, 0) < 0) {
if (sysctl(mib, NMIB(mib), &mhz_max, &size, NULL, 0) < 0) {
mhz_max = SIGAR_FIELD_NOTIMPL; mhz_max = SIGAR_FIELD_NOTIMPL;
} }
mib[1] = HW_CPU_FREQ_MIN; if (sysctlbyname(CTL_HW_FREQ_MIN, &mhz_min, &size, NULL, 0) < 0) {
size = sizeof(mhz_min);
if (sysctl(mib, NMIB(mib), &mhz_max, &size, NULL, 0) < 0) {
mhz_min = SIGAR_FIELD_NOTIMPL; mhz_min = SIGAR_FIELD_NOTIMPL;
} }
}
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
if (sysctlbyname(CTL_HW_FREQ, &mhz, &size, NULL, 0) < 0) { if (sysctlbyname(CTL_HW_FREQ, &mhz, &size, NULL, 0) < 0) {
mhz = SIGAR_FIELD_NOTIMPL; mhz = SIGAR_FIELD_NOTIMPL;