Skip to content

fix cpu list diaplay incorrectly on hpux ia64 platform #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −17
Open

fix cpu list diaplay incorrectly on hpux ia64 platform #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 23 additions & 17 deletions src/os/hpux/hpux_sigar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ int sigar_cpu_list_get(sigar_t *sigar, sigar_cpu_list_t *cpulist)
struct pst_dynamic stats;

pstat_getdynamic(&stats, sizeof(stats), 1, 0);
sigar->ncpu = stats.psd_proc_cnt;
sigar->ncpu = stats.psd_max_proc_cnt;

sigar_cpu_list_create(cpulist);

Expand All @@ -180,14 +180,18 @@ int sigar_cpu_list_get(sigar_t *sigar, sigar_cpu_list_t *cpulist)
struct pst_processor proc;

if (pstat_getprocessor(&proc, sizeof(proc), 1, i) < 0) {
perror("pstat_getprocessor");
continue;
}

SIGAR_CPU_LIST_GROW(cpulist);
if(proc.psp_processor_state == PSP_SPU_ENABLED) {

SIGAR_CPU_LIST_GROW(cpulist);

cpu = &cpulist->data[cpulist->number++];
cpu = &cpulist->data[cpulist->number++];

get_cpu_metrics(sigar, cpu, proc.psp_cpu_time);
get_cpu_metrics(sigar, cpu, proc.psp_cpu_time);
}
}

return SIGAR_OK;
Expand Down Expand Up @@ -714,7 +718,7 @@ int sigar_cpu_info_list_get(sigar_t *sigar,
struct pst_dynamic stats;

pstat_getdynamic(&stats, sizeof(stats), 1, 0);
sigar->ncpu = stats.psd_proc_cnt;
sigar->ncpu = stats.psd_max_proc_cnt;

sigar_cpu_info_list_create(cpu_infos);

Expand All @@ -726,28 +730,30 @@ int sigar_cpu_info_list_get(sigar_t *sigar,
perror("pstat_getprocessor");
continue;
}
if(proc.psp_processor_state == PSP_SPU_ENABLED) {

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++];

info->total_cores = sigar->ncpu;
info->cores_per_socket = 1; /*XXX*/
info->total_sockets = sigar->ncpu; /*XXX*/
info->total_cores = sigar->ncpu;
info->cores_per_socket = 1; /*XXX*/
info->total_sockets = sigar->ncpu; /*XXX*/

#ifdef __ia64__
SIGAR_SSTRCPY(info->vendor, "Intel"); /*XXX*/
SIGAR_SSTRCPY(info->model, "Itanium"); /*XXX*/
SIGAR_SSTRCPY(info->vendor, "Intel"); /*XXX*/
SIGAR_SSTRCPY(info->model, "Itanium"); /*XXX*/
#else
SIGAR_SSTRCPY(info->vendor, "HP"); /*XXX*/
SIGAR_SSTRCPY(info->model, "PA RISC"); /*XXX*/
SIGAR_SSTRCPY(info->vendor, "HP"); /*XXX*/
SIGAR_SSTRCPY(info->model, "PA RISC"); /*XXX*/
#endif
#ifdef PSP_MAX_CACHE_LEVELS /* 11.31+; see SIGAR-196 */
info->mhz = proc.psp_cpu_frequency / 1000000;
info->mhz = proc.psp_cpu_frequency / 1000000;
#else
info->mhz = sigar->ticks * proc.psp_iticksperclktick / 1000000;
info->mhz = sigar->ticks * proc.psp_iticksperclktick / 1000000;
#endif
info->cache_size = SIGAR_FIELD_NOTIMPL; /*XXX*/
info->cache_size = SIGAR_FIELD_NOTIMPL; /*XXX*/
}
}

return SIGAR_OK;
Expand Down