parisc: multiple procs, topology, cpufreq, more cpuinfo fields

Signed-off-by: Burt P <pburt0@gmail.com>

2 files changed, 145 insertions, 20 deletions

diff --git a/includes/parisc/processor-platform.h b/includes/parisc/processor-platform.h
index 5b18e80f..c55c69ec 100644
--- a/includes/parisc/processor-platform.h
+++ b/includes/parisc/processor-platform.h
@@ -19,17 +19,24 @@
 #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;
     gchar *flags;
-    gfloat bogomips, cpu_mhz;
-
+    gfloat bogomips;
     gchar *has_fpu;
-
     gchar *strmodel;
 
+    gchar *cpu_family;
     gchar *icache_str, *dcache_str;
+    gchar *hversion, *sversion;
 };
 
 #endif	/* __PROCESSOR_PLATFORM_H__ */
diff --git a/modules/devices/parisc/processor.c b/modules/devices/parisc/processor.c
index fdb8cd54..c4eede8a 100644
--- a/modules/devices/parisc/processor.c
+++ b/modules/devices/parisc/processor.c
@@ -23,62 +23,180 @@
 GSList *
 processor_scan(void)
 {
-    Processor *processor;
+    GSList *procs = NULL;
+    Processor *processor = NULL;
     FILE *cpuinfo;
     gchar buffer[128];
+    gchar *rep_pname = 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("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("cpu family")
+            || CHECK_FOR("cpu MHz")
+            || CHECK_FOR("cpu") ) ) {
 
-            get_str("cpu family", processor->model_name);
+            /* 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("cpu family", processor->cpu_family);
             get_float("cpu MHz", processor->cpu_mhz);
-            get_str("cpu", processor->vendor_id);
+            get_str("cpu", processor->model_name);
             get_float("bogomips", processor->bogomips);
             get_str("model name", processor->strmodel);
             get_str("I-cache", processor->icache_str);
             get_str("D-cache", processor->dcache_str);
-
+            get_str("hversion", processor->hversion);
+            get_str("sversion", processor->sversion);
         }
         g_strfreev(tmp);
     }
 
+    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, _("PA-RISC Processor") );
+        STRIFNULL(cpu_family, "PA-RISC");
+        UNKIFNULL(strmodel);
+
+        /* 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"
-                        "CPU Family=%s\n"
-                        "CPU=%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"
+                        "%s=%s\n"
                         "%s=%s\n"      /* model name */
                         "%s=%.2f %s\n" /* frequency */
                         "%s=%.2f\n"    /* bogomips */
                         "%s=%s\n"      /* byte order */
+                        "%s=%s\n"      /* hversion */
+                        "%s=%s\n"      /* sversion */
                         "[%s]\n"
                         "I-Cache=%s\n"
-                        "D-Cache=%s\n",
+                        "D-Cache=%s\n"
+                        "%s" /* topology */
+                        "%s" /* frequency scaling */
+                        "%s",/* empty */
                    _("Processor"),
-                   processor->model_name,
-                   processor->vendor_id,
-                   _("Model Name"), processor->strmodel,
+                   _("Model"), processor->model_name,
+                   _("Architecture"), processor->cpu_family,
+                   _("System"), processor->strmodel,
                    _("Frequency"), processor->cpu_mhz, _("MHz"),
                    _("BogoMips"), processor->bogomips,
                    _("Byte Order"), byte_order_str(),
+                   _("HVersion"), processor->hversion,
+                   _("SVersion"), processor->sversion,
                    _("Cache"),
                    processor->icache_str,
-                   processor->dcache_str);
+                   processor->dcache_str,
+                   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);
 }