diff options
| -rw-r--r-- | includes/ia64/processor-platform.h | 12 | ||||
| -rw-r--r-- | modules/devices/ia64/processor.c | 146 |
2 files changed, 143 insertions, 15 deletions
diff --git a/includes/ia64/processor-platform.h b/includes/ia64/processor-platform.h index ad44a1f1..5d525639 100644 --- a/includes/ia64/processor-platform.h +++ b/includes/ia64/processor-platform.h @@ -19,14 +19,22 @@ #ifndef __PROCESSOR_PLATFORM_H__ #define __PROCESSOR_PLATFORM_H__ +#include "cpu_util.h" + struct _Processor { + gint id; + gfloat cpu_mhz; /* for devices.c, identical to cpukhz_max/1000 */ + cpu_topology_data *cputopo; + cpufreq_data *cpufreq; + gchar *model_name; gchar *vendor_id; - gfloat bogomips, cpu_mhz; + gfloat bogomips; gchar *strmodel; - gchar *family, *arch; + gchar *family, *arch, *archrev, *features; gint model, revision; + gint cpu_regs; }; #endif /* __PROCESSOR_PLATFORM_H__ */ diff --git a/modules/devices/ia64/processor.c b/modules/devices/ia64/processor.c index 7c311c0a..df79291c 100644 --- a/modules/devices/ia64/processor.c +++ b/modules/devices/ia64/processor.c @@ -20,71 +20,191 @@ #include "devices.h" #include "cpu_util.h" +#include "cpu_util.h" + GSList * processor_scan(void) { - Processor *processor; + GSList *procs = NULL; + Processor *processor = NULL; FILE *cpuinfo; gchar buffer[128]; + gchar *rep_pname = NULL; gchar *toss = NULL; + GSList *pi = NULL; cpuinfo = fopen(PROC_CPUINFO, "r"); if (!cpuinfo) return NULL; - processor = g_new0(Processor, 1); +#define CHECK_FOR(k) (g_str_has_prefix(tmp[0], k)) while (fgets(buffer, 128, cpuinfo)) { gchar **tmp = g_strsplit(buffer, ":", 2); - if (tmp[0] && tmp[1]) { tmp[0] = g_strstrip(tmp[0]); tmp[1] = g_strstrip(tmp[1]); + } else { + g_strfreev(tmp); + continue; + } - get_str("archrev", toss); /* ignore this or "arch" will catch it below */ + get_str("Processor", rep_pname); + + if ( CHECK_FOR("processor") ) { + /* finish previous */ + if (processor) { + procs = g_slist_append(procs, processor); + } + + /* start next */ + processor = g_new0(Processor, 1); + processor->id = atol(tmp[1]); + + if (rep_pname) + processor->model_name = g_strdup(rep_pname); + + g_strfreev(tmp); + continue; + } + if (!processor && + ( CHECK_FOR("vendor") + || CHECK_FOR("arch") + || CHECK_FOR("family") ) ) { + + /* single proc/core may not have "processor : n" */ + processor = g_new0(Processor, 1); + processor->id = 0; + + if (rep_pname) + processor->model_name = g_strdup(rep_pname); + } + + if (processor) { get_str("vendor", processor->vendor_id); + get_str("archrev", processor->archrev); get_str("arch", processor->arch); get_str("family", processor->family); + get_str("features", processor->features); get_int("model", processor->model); get_int("revision", processor->revision); get_float("BogoMIPS", processor->bogomips); get_float("cpu MHz", processor->cpu_mhz); - + get_int("cpu regs", processor->cpu_regs); } g_strfreev(tmp); } - processor->model_name = _("IA64 Processor"); + if (processor) + procs = g_slist_append(procs, processor); + g_free(rep_pname); fclose(cpuinfo); - return g_slist_append(NULL, processor); + /* TODO: redup */ + + /* data not from /proc/cpuinfo */ + for (pi = procs; pi; pi = pi->next) { + processor = (Processor *) pi->data; + + /* strings can't be null or segfault later */ + STRIFNULL(model_name, _("IA64 Processor") ); + UNKIFNULL(vendor_id); + STRIFNULL(arch, "IA-64"); + STRIFNULL(archrev, "0"); + UNKIFNULL(family); + UNKIFNULL(features); + + /* topo & freq */ + processor->cpufreq = cpufreq_new(processor->id); + processor->cputopo = cputopo_new(processor->id); + + if (processor->cpufreq->cpukhz_max) + processor->cpu_mhz = processor->cpufreq->cpukhz_max / 1000; + + } + + return procs; } gchar * -processor_get_info(GSList *processors) +processor_get_detailed_info(Processor *processor) { - Processor *processor = (Processor *)processors->data; + gchar *tmp_cpufreq, *tmp_topology, *ret; - return g_strdup_printf("[%s]\n" + tmp_topology = cputopo_section_str(processor->cputopo); + tmp_cpufreq = cpufreq_section_str(processor->cpufreq); + + ret = g_strdup_printf("[%s]\n" "%s=%s\n" /* name */ "%s=%s\n" /* vendor */ "%s=%s\n" /* arch */ + "%s=%s\n" /* archrev */ "%s=%s\n" /* family */ "%s=%d\n" /* model no. */ "%s=%d\n" /* revision */ "%s=%.2f %s\n" /* frequency */ "%s=%.2f\n" /* bogomips */ - "%s=%s\n", /* byte order */ + "%s=%s\n" /* byte order */ + "%s=%d\n" /* regs */ + "%s=%s\n" /* features */ + "%s" /* topology */ + "%s" /* frequency scaling */ + "%s",/* empty */ _("Processor"), _("Name"), processor->model_name, _("Vendor"), processor->vendor_id, _("Architecture"), processor->arch, + _("Architecture Revision"), processor->archrev, _("Family"), processor->family, _("Model"), processor->model, _("Revision"), processor->revision, _("Frequency"), processor->cpu_mhz, _("MHz"), _("BogoMips"), processor->bogomips, - _("Byte Order"), byte_order_str() - ); + _("Byte Order"), byte_order_str(), + _("CPU regs"), processor->cpu_regs, + _("Features"), processor->features, + tmp_topology, + tmp_cpufreq, + ""); + g_free(tmp_cpufreq); + g_free(tmp_topology); + return ret; +} + +gchar *processor_get_info(GSList * processors) +{ + Processor *processor; + + if (g_slist_length(processors) > 1) { + gchar *ret, *tmp, *hashkey; + GSList *l; + + tmp = g_strdup(""); + + for (l = processors; l; l = l->next) { + processor = (Processor *) l->data; + + tmp = g_strdup_printf(_("%s$CPU%d$%s=%.2fMHz\n"), + tmp, processor->id, + processor->model_name, + processor->cpu_mhz); + + hashkey = g_strdup_printf("CPU%d", processor->id); + moreinfo_add_with_prefix("DEV", hashkey, + processor_get_detailed_info(processor)); + g_free(hashkey); + } + + ret = g_strdup_printf("[$ShellParam$]\n" + "ViewType=1\n" + "[Processors]\n" + "%s", tmp); + g_free(tmp); + + return ret; + } + + processor = (Processor *) processors->data; + return processor_get_detailed_info(processor); } |