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

set sys_info arch, version and description

This commit is contained in:
Doug MacEachern 2006-09-25 13:57:49 +00:00
parent 09de663e8e
commit f5e87e752e
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/os/aix/aix_sigar.c
View File

@ -1863,6 +1863,22 @@ static int sigar_get_cpu_mhz(sigar_t *sigar)
return sigar->cpu_mhz; return sigar->cpu_mhz;
} }
static char *get_cpu_arch(void)
{
switch (_system_configuration.architecture) {
case POWER_RS:
return "Power Classic";
case POWER_PC:
return "PowerPC";
break;
case IA64:
return "IA64";
break;
default:
return "PowerPC"; /* what else could it be */
}
}
int sigar_cpu_info_list_get(sigar_t *sigar, int sigar_cpu_info_list_get(sigar_t *sigar,
sigar_cpu_info_list_t *cpu_infos) sigar_cpu_info_list_t *cpu_infos)
{ {
@ -1884,20 +1900,7 @@ int sigar_cpu_info_list_get(sigar_t *sigar,
info->mhz = sigar_get_cpu_mhz(sigar); info->mhz = sigar_get_cpu_mhz(sigar);
switch (_system_configuration.architecture) { arch = get_cpu_arch();
case POWER_RS:
arch = "Power Classic";
break;
case POWER_PC:
arch = "PowerPC";
break;
case IA64:
arch = "IA64";
break;
default:
arch = "PowerPC"; /* what else could it be */
break;
}
if (*arch == 'P') { if (*arch == 'P') {
SIGAR_SSTRCPY(info->vendor, "IBM"); SIGAR_SSTRCPY(info->vendor, "IBM");
@ -2355,7 +2358,20 @@ int sigar_proc_port_get(sigar_t *sigar, int protocol,
int sigar_os_sys_info_get(sigar_t *sigar, int sigar_os_sys_info_get(sigar_t *sigar,
sigar_sys_info_t *sysinfo) sigar_sys_info_t *sysinfo)
{ {
struct utsname name;
uname(&name);
SIGAR_SSTRCPY(sysinfo->vendor, "IBM"); SIGAR_SSTRCPY(sysinfo->vendor, "IBM");
SIGAR_SSTRCPY(sysinfo->arch, get_cpu_arch());
sprintf(sysinfo->version, "%s.%s",
name.version, name.release);
SIGAR_SSTRCPY(sysinfo->vendor_version, sysinfo->version);
sprintf(sysinfo->description, "%s %s",
sysinfo->name, sysinfo->version);
return SIGAR_OK; return SIGAR_OK;
} }