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

unhardcode powerpc as the cpu model

This commit is contained in:
Doug MacEachern 2005-12-02 01:12:51 +00:00
parent c7061cc660
commit 1cf03e463a
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1362,10 +1362,19 @@ int sigar_cpu_info_list_get(sigar_t *sigar,
} }
size = sizeof(model); size = sizeof(model);
if (sysctlbyname("hw.model", &model, &size, NULL, 0) == -1) { if (sysctlbyname("hw.model", &model, &size, NULL, 0) < 0) {
strcpy(model, "Unknown"); int mib[] = { CTL_HW, HW_MODEL };
size = sizeof(model);
if (sysctl(mib, NMIB(mib), &model[0], &size, NULL, 0) < 0) {
#ifdef DARWIN
strcpy(model, "powerpc");
#else
strcpy(model, "Unknown");
#endif
}
} }
else if ((ptr = strchr(model, ' '))) {
if ((ptr = strchr(model, ' '))) {
*ptr = '\0'; *ptr = '\0';
if (strstr(model, "Intel")) { if (strstr(model, "Intel")) {
SIGAR_SSTRCPY(vendor, "Intel"); SIGAR_SSTRCPY(vendor, "Intel");
@ -1389,12 +1398,12 @@ int sigar_cpu_info_list_get(sigar_t *sigar,
info = &cpu_infos->data[cpu_infos->number++]; info = &cpu_infos->data[cpu_infos->number++];
#ifdef DARWIN #ifdef DARWIN
SIGAR_SSTRCPY(info->vendor, "Apple"); SIGAR_SSTRCPY(info->vendor, "Apple");
SIGAR_SSTRCPY(info->model, "powerpc");
#else #else
SIGAR_SSTRCPY(info->vendor, vendor); SIGAR_SSTRCPY(info->vendor, vendor);
#endif
SIGAR_SSTRCPY(info->model, model); SIGAR_SSTRCPY(info->model, model);
sigar_cpu_model_adjust(sigar, info); sigar_cpu_model_adjust(sigar, info);
#endif
info->mhz = mhz; info->mhz = mhz;
info->cache_size = SIGAR_FIELD_NOTIMPL; info->cache_size = SIGAR_FIELD_NOTIMPL;
} }