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

adjust model name

This commit is contained in:
Doug MacEachern 2004-07-02 02:52:51 +00:00
parent 5934d4bfc4
commit ebc80f9357
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/os/linux/linux_sigar.c
View File

@ -995,7 +995,8 @@ static SIGAR_INLINE void cpu_info_strcpy(char *ptr, char *buf, int len)
}
}
static int get_cpu_info(sigar_cpu_info_t *info, FILE *fp, int *id)
static int get_cpu_info(sigar_t *sigar, sigar_cpu_info_t *info,
FILE *fp, int *id)
{
char buffer[BUFSIZ], *ptr;
@ -1028,6 +1029,7 @@ static int get_cpu_info(sigar_cpu_info_t *info, FILE *fp, int *id)
case 'm':
if (strnEQ(ptr, "model name", 10)) {
cpu_info_strcpy(ptr, info->model, sizeof(info->model));
sigar_cpu_model_adjust(sigar, info);
}
break;
case 'c':
@ -1091,7 +1093,7 @@ int sigar_cpu_infos_get(sigar_t *sigar,
sigar_cpu_infos_create(cpu_infos);
memset(&cpu_id[0], -1, sizeof(cpu_id));
while (get_cpu_info(&cpu_infos->data[cpu_infos->number], fp, &id)) {
while (get_cpu_info(sigar, &cpu_infos->data[cpu_infos->number], fp, &id)) {
if (id >= 0) {
int i, fold=0;
for (i=0; (i<cpu_ix) && (i<cpu_id_max); i++) {