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

unhardcode cpu vendor

Browse Source
This commit is contained in:
Doug MacEachern 2006-07-05 19:20:12 +00:00
parent c13e03716e
commit a2597443b7
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1316,6 +1316,19 @@ int sigar_cpu_info_list_get(sigar_t *sigar,
mhz = sigar_cpu_mhz_from_model(model); mhz = sigar_cpu_mhz_from_model(model);
} }
#ifdef DARWIN
size = sizeof(vendor);
if (sysctlbyname("machdep.cpu.vendor", &vendor, &size, NULL, 0) < 0) {
SIGAR_SSTRCPY(vendor, "Apple");
}
else {
/* GenuineIntel -> Intel */
if (strstr(vendor, "Intel")) {
SIGAR_SSTRCPY(vendor, "Intel");
}
}
#endif
if ((ptr = strchr(model, ' '))) { if ((ptr = strchr(model, ' '))) {
*ptr = '\0'; *ptr = '\0';
if (strstr(model, "Intel")) { if (strstr(model, "Intel")) {
@ -1351,11 +1364,8 @@ int sigar_cpu_info_list_get(sigar_t *sigar,
SIGAR_CPU_INFO_LIST_GROW(cpu_infos); SIGAR_CPU_INFO_LIST_GROW(cpu_infos);
info = &cpu_infos->data[cpu_infos->number++]; info = &cpu_infos->data[cpu_infos->number++];
#ifdef DARWIN
SIGAR_SSTRCPY(info->vendor, "Apple");
#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);