aboutsummaryrefslogtreecommitdiff
path: root/hardinfo2/arch/linux
diff options
context:
space:
mode:
Diffstat (limited to 'hardinfo2/arch/linux')
-rw-r--r--hardinfo2/arch/linux/alpha/processor.h12
-rw-r--r--hardinfo2/arch/linux/armv4l/processor.h10
-rw-r--r--hardinfo2/arch/linux/ia64/processor.h10
-rw-r--r--hardinfo2/arch/linux/m68k/processor.h10
-rw-r--r--hardinfo2/arch/linux/mips/processor.h10
-rw-r--r--hardinfo2/arch/linux/parisc/processor.h10
-rw-r--r--hardinfo2/arch/linux/ppc/processor.h10
-rw-r--r--hardinfo2/arch/linux/s390/processor.h13
-rw-r--r--hardinfo2/arch/linux/sparc/processor.h12
-rw-r--r--hardinfo2/arch/linux/x86/processor.h436
10 files changed, 297 insertions, 236 deletions
diff --git a/hardinfo2/arch/linux/alpha/processor.h b/hardinfo2/arch/linux/alpha/processor.h
index fa02ea05..682a54db 100644
--- a/hardinfo2/arch/linux/alpha/processor.h
+++ b/hardinfo2/arch/linux/alpha/processor.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-static Processor *
-computer_get_processor(void)
+static GSList *
+computer_get_processors(void)
{
Processor *processor;
FILE *cpuinfo;
@@ -43,18 +43,20 @@ computer_get_processor(void)
g_strfreev(tmp);
}
- gchar *tmp = g_strconcat("Alpha", processor->model_name, NULL);
+ gchar *tmp = g_strconcat("Alpha ", processor->model_name, NULL);
g_free(processor->model_name);
processor->model_name = tmp;
fclose(cpuinfo);
- return processor;
+ return g_slist_append(NULL, processor);
}
static gchar *
-processor_get_info(Processor *processor)
+processor_get_info(GSList *processors)
{
+ Processor *processor = (Processor *)processors->data;
+
return g_strdup_printf("[Processor] %s\n"
"Plataform String=%s\n"
"BogoMips=%.2f"
diff --git a/hardinfo2/arch/linux/armv4l/processor.h b/hardinfo2/arch/linux/armv4l/processor.h
index 7a9c1f2e..3e912a31 100644
--- a/hardinfo2/arch/linux/armv4l/processor.h
+++ b/hardinfo2/arch/linux/armv4l/processor.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-static Processor *
-computer_get_processor(void)
+static GSList *
+computer_get_processors(void)
{
Processor *processor;
FILE *cpuinfo;
@@ -46,12 +46,14 @@ computer_get_processor(void)
fclose(cpuinfo);
- return processor;
+ return g_slist_append(NULL, processor);
}
static gchar *
-processor_get_info(Processor *processor)
+processor_get_info(GSList *processors)
{
+ Processor *processor = (Processor *)processors->data;
+
return g_strdup_printf("[Processor]\n"
"Name=%s\n"
"Features=%s\n"
diff --git a/hardinfo2/arch/linux/ia64/processor.h b/hardinfo2/arch/linux/ia64/processor.h
index 9cad3b24..c66b2df8 100644
--- a/hardinfo2/arch/linux/ia64/processor.h
+++ b/hardinfo2/arch/linux/ia64/processor.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-static Processor *
-computer_get_processor(void)
+static GSList *
+computer_get_processors(void)
{
Processor *processor;
FILE *cpuinfo;
@@ -46,12 +46,14 @@ computer_get_processor(void)
fclose(cpuinfo);
- return processor;
+ return g_slist_append(NULL, processor);
}
static gchar *
-processor_get_info(Processor *processor)
+processor_get_info(GSList *processors)
{
+ Processor *processor = (Processor *)processors->data;
+
return g_strdup_printf("[Processor] %s\n"
"Arch=%s\n"
"Family=%sMHz\n"
diff --git a/hardinfo2/arch/linux/m68k/processor.h b/hardinfo2/arch/linux/m68k/processor.h
index 0a1bab62..0fece402 100644
--- a/hardinfo2/arch/linux/m68k/processor.h
+++ b/hardinfo2/arch/linux/m68k/processor.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-static Processor *
-computer_get_processor(void)
+static GSList *
+computer_get_processors(void)
{
Processor *processor;
FILE *cpuinfo;
@@ -51,12 +51,14 @@ computer_get_processor(void)
fclose(cpuinfo);
- return processor;
+ return g_slist_append(NULL, processor);
}
static gchar *
-processor_get_info(Processor *processor)
+processor_get_info(GSList *processors)
{
+ Processor *processor = (Processor *)processors->data;
+
return g_strdup_printf("[Processor]\n"
"Name=%s\n"
"Frequency=%.2fMHz\n"
diff --git a/hardinfo2/arch/linux/mips/processor.h b/hardinfo2/arch/linux/mips/processor.h
index 8be922f9..e1233849 100644
--- a/hardinfo2/arch/linux/mips/processor.h
+++ b/hardinfo2/arch/linux/mips/processor.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-static Processor *
-computer_get_processor(void)
+static GSList *
+computer_get_processors(void)
{
Processor *processor;
FILE *cpuinfo;
@@ -45,12 +45,14 @@ computer_get_processor(void)
fclose(cpuinfo);
- return processor;
+ return g_slist_append(NULL, processor);
}
static gchar *
-processor_get_info(Processor *processor)
+processor_get_info(GSList *processors)
{
+ Processor *processor = (Processor *)processors->data;
+
return g_strdup_printf("[Processor]\n"
"System Type=%s\n"
"CPU Model=%s\n"
diff --git a/hardinfo2/arch/linux/parisc/processor.h b/hardinfo2/arch/linux/parisc/processor.h
index 41b628f4..5d7ad27c 100644
--- a/hardinfo2/arch/linux/parisc/processor.h
+++ b/hardinfo2/arch/linux/parisc/processor.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-static Processor *
-computer_get_processor(void)
+static GSList *
+computer_get_processors(void)
{
Processor *processor;
FILE *cpuinfo;
@@ -51,12 +51,14 @@ computer_get_processor(void)
fclose(cpuinfo);
- return processor;
+ return g_slist_append(NULL, processor);
}
static gchar *
-processor_get_info(Processor *processor)
+processor_get_info(GSList *processors)
{
+ Processor *processor = (Processor *)processors->data;
+
return g_strdup_printf("[Processor]\n"
"CPU Family=%s\n"
"CPU=%s\n"
diff --git a/hardinfo2/arch/linux/ppc/processor.h b/hardinfo2/arch/linux/ppc/processor.h
index f4ff5b0e..3c09a34f 100644
--- a/hardinfo2/arch/linux/ppc/processor.h
+++ b/hardinfo2/arch/linux/ppc/processor.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-static Processor *
-computer_get_processor(void)
+static GSList *
+computer_get_processors(void)
{
Processor *processor;
FILE *cpuinfo;
@@ -51,12 +51,14 @@ computer_get_processor(void)
fclose(cpuinfo);
- return processor;
+ return g_slist_append(NULL, processor);
}
static gchar *
-processor_get_info(Processor *processor)
+processor_get_info(GSList *processors)
{
+ Processor *processor = (Processor *)processors->data;
+
return g_strdup_printf("[Processor]\n"
"Machine=%s\n"
"CPU=%s\n"
diff --git a/hardinfo2/arch/linux/s390/processor.h b/hardinfo2/arch/linux/s390/processor.h
index 604b3514..12c71a7d 100644
--- a/hardinfo2/arch/linux/s390/processor.h
+++ b/hardinfo2/arch/linux/s390/processor.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-static Processor *
-computer_get_processor(void)
+static GSList *
+computer_get_processors(void)
{
Processor *processor;
FILE *cpuinfo;
@@ -43,17 +43,18 @@ computer_get_processor(void)
g_strfreev(tmp);
}
- gchar *tmp = g_strconcat("S390 ", processor->vendor_id, NULL);
- processor->model_name = tmp;
+ processor->model_name = g_strconcat("S390 ", processor->vendor_id, NULL);
fclose(cpuinfo);
- return processor;
+ return g_slist_append(NULL, processor);
}
static gchar *
-processor_get_info(Processor *processor)
+processor_get_info(GSList *processors)
{
+ Processor *processor = (Processor *)processors->data;
+
return g_strdup_printf("[Processor]\n"
"Processors=%d\n"
"BogoMips per CPU=%.2f"
diff --git a/hardinfo2/arch/linux/sparc/processor.h b/hardinfo2/arch/linux/sparc/processor.h
index 211ea56b..4a02a7bd 100644
--- a/hardinfo2/arch/linux/sparc/processor.h
+++ b/hardinfo2/arch/linux/sparc/processor.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-static Processor *
-computer_get_processor(void)
+static GSList *
+computer_get_processors(void)
{
Processor *processor;
FILE *cpuinfo;
@@ -41,16 +41,16 @@ computer_get_processor(void)
g_strfreev(tmp);
}
- get_processor_strfamily(processor);
-
fclose(cpuinfo);
- return processor;
+ return g_slist_append(NULL, processor);
}
static gchar *
-processor_get_info(Processor *processor)
+processor_get_info(GSList *processors)
{
+ Processor *processor = (Processor *)processors->data;
+
return g_strdup_printf("[Processor]\n"
"CPU=%s\n"
"FPU=%s\n",
diff --git a/hardinfo2/arch/linux/x86/processor.h b/hardinfo2/arch/linux/x86/processor.h
index 1897a3e7..4b2b3447 100644
--- a/hardinfo2/arch/linux/x86/processor.h
+++ b/hardinfo2/arch/linux/x86/processor.h
@@ -19,135 +19,142 @@
/*
* This function is partly based on x86cpucaps
* by Osamu Kayasono <jacobi@jcom.home.ne.jp>
- */
-static void
-get_processor_strfamily(Processor *processor)
+ */
+static void get_processor_strfamily(Processor * processor)
{
gint family = processor->family;
gint model = processor->model;
if (g_str_equal(processor->vendor_id, "GenuineIntel")) {
- if (family == 4) {
- processor->strmodel = g_strdup("i486 series");
- } else if (family == 5) {
- if (model < 4) {
- processor->strmodel = g_strdup("Pentium Classic");
- } else {
- processor->strmodel = g_strdup("Pentium MMX");
- }
- } else if (family == 6) {
- if (model <= 1) {
- processor->strmodel = g_strdup("Pentium Pro");
- } else if (model < 7) {
- processor->strmodel = g_strdup("Pentium II/Pentium II Xeon/Celeron");
- } else if (model == 9) {
- processor->strmodel = g_strdup("Pentium M");
- } else {
- processor->strmodel = g_strdup("Pentium III/Pentium III Xeon/Celeron");
- }
- } else if (family > 6) {
- processor->strmodel = g_strdup("Pentium 4");
- } else {
- processor->strmodel = g_strdup("i386 class");
- }
+ if (family == 4) {
+ processor->strmodel = g_strdup("i486 series");
+ } else if (family == 5) {
+ if (model < 4) {
+ processor->strmodel = g_strdup("Pentium Classic");
+ } else {
+ processor->strmodel = g_strdup("Pentium MMX");
+ }
+ } else if (family == 6) {
+ if (model <= 1) {
+ processor->strmodel = g_strdup("Pentium Pro");
+ } else if (model < 7) {
+ processor->strmodel = g_strdup("Pentium II/Pentium II Xeon/Celeron");
+ } else if (model == 9) {
+ processor->strmodel = g_strdup("Pentium M");
+ } else {
+ processor->strmodel = g_strdup("Pentium III/Pentium III Xeon/Celeron");
+ }
+ } else if (family > 6) {
+ processor->strmodel = g_strdup("Pentium 4");
+ } else {
+ processor->strmodel = g_strdup("i386 class");
+ }
} else if (g_str_equal(processor->vendor_id, "AuthenticAMD")) {
- if (family == 4) {
- if (model <= 9) {
- processor->strmodel = g_strdup("AMD i80486 series");
- } else {
- processor->strmodel = g_strdup("AMD 5x86");
- }
- } else if (family == 5) {
- if (model <= 3) {
- processor->strmodel = g_strdup("AMD K5");
- } else if (model <= 7) {
- processor->strmodel = g_strdup("AMD K6");
- } else if (model == 8) {
- processor->strmodel = g_strdup("AMD K6-2");
- } else if (model == 9) {
- processor->strmodel = g_strdup("AMD K6-III");
- } else {
- processor->strmodel = g_strdup("AMD K6-2+/III+");
- }
- } else if (family == 6) {
- if (model == 1) {
- processor->strmodel = g_strdup("AMD Athlon (K7");
- } else if (model == 2) {
- processor->strmodel = g_strdup("AMD Athlon (K75)");
- } else if (model == 3) {
- processor->strmodel = g_strdup("AMD Duron (Spitfire)");
- } else if (model == 4) {
- processor->strmodel = g_strdup("AMD Athlon (Thunderbird)");
- } else if (model == 6) {
- processor->strmodel = g_strdup("AMD Athlon XP/MP/4 (Palomino)");
- } else if (model == 7) {
- processor->strmodel = g_strdup("AMD Duron (Morgan)");
- } else if (model == 8) {
- processor->strmodel = g_strdup("AMD Athlon XP/MP (Thoroughbred)");
- } else if (model == 10) {
- processor->strmodel = g_strdup("AMD Athlon XP/MP (Barton)");
- } else {
- processor->strmodel = g_strdup("AMD Athlon (unknown)");
- }
- } else if (family > 6) {
- processor->strmodel = g_strdup("AMD Opteron/Athlon64/FX");
- } else {
- processor->strmodel = g_strdup("AMD i386 class");
- }
+ if (family == 4) {
+ if (model <= 9) {
+ processor->strmodel = g_strdup("AMD i80486 series");
+ } else {
+ processor->strmodel = g_strdup("AMD 5x86");
+ }
+ } else if (family == 5) {
+ if (model <= 3) {
+ processor->strmodel = g_strdup("AMD K5");
+ } else if (model <= 7) {
+ processor->strmodel = g_strdup("AMD K6");
+ } else if (model == 8) {
+ processor->strmodel = g_strdup("AMD K6-2");
+ } else if (model == 9) {
+ processor->strmodel = g_strdup("AMD K6-III");
+ } else {
+ processor->strmodel = g_strdup("AMD K6-2+/III+");
+ }
+ } else if (family == 6) {
+ if (model == 1) {
+ processor->strmodel = g_strdup("AMD Athlon (K7");
+ } else if (model == 2) {
+ processor->strmodel = g_strdup("AMD Athlon (K75)");
+ } else if (model == 3) {
+ processor->strmodel = g_strdup("AMD Duron (Spitfire)");
+ } else if (model == 4) {
+ processor->strmodel = g_strdup("AMD Athlon (Thunderbird)");
+ } else if (model == 6) {
+ processor->strmodel = g_strdup("AMD Athlon XP/MP/4 (Palomino)");
+ } else if (model == 7) {
+ processor->strmodel = g_strdup("AMD Duron (Morgan)");
+ } else if (model == 8) {
+ processor->strmodel = g_strdup("AMD Athlon XP/MP (Thoroughbred)");
+ } else if (model == 10) {
+ processor->strmodel = g_strdup("AMD Athlon XP/MP (Barton)");
+ } else {
+ processor->strmodel = g_strdup("AMD Athlon (unknown)");
+ }
+ } else if (family > 6) {
+ processor->strmodel = g_strdup("AMD Opteron/Athlon64/FX");
+ } else {
+ processor->strmodel = g_strdup("AMD i386 class");
+ }
} else if (g_str_equal(processor->vendor_id, "CyrixInstead")) {
- if (family == 4) {
- processor->strmodel = g_strdup("Cyrix 5x86");
- } else if (family == 5) {
- processor->strmodel = g_strdup("Cyrix M1 (6x86)");
- } else if (family == 6) {
- if (model == 0) {
- processor->strmodel = g_strdup("Cyrix M2 (6x86MX)");
- } else if (model <= 5) {
- processor->strmodel = g_strdup("VIA Cyrix III (M2 core)");
- } else if (model == 6) {
- processor->strmodel = g_strdup("VIA Cyrix III (WinChip C5A)");
- } else if (model == 7) {
- processor->strmodel = g_strdup("VIA Cyrix III (WinChip C5B/C)");
- } else {
- processor->strmodel = g_strdup("VIA Cyrix III (WinChip C5C-T)");
- }
- } else {
- processor->strmodel = g_strdup("Cyrix i386 class");
- }
+ if (family == 4) {
+ processor->strmodel = g_strdup("Cyrix 5x86");
+ } else if (family == 5) {
+ processor->strmodel = g_strdup("Cyrix M1 (6x86)");
+ } else if (family == 6) {
+ if (model == 0) {
+ processor->strmodel = g_strdup("Cyrix M2 (6x86MX)");
+ } else if (model <= 5) {
+ processor->strmodel = g_strdup("VIA Cyrix III (M2 core)");
+ } else if (model == 6) {
+ processor->strmodel = g_strdup("VIA Cyrix III (WinChip C5A)");
+ } else if (model == 7) {
+ processor->strmodel = g_strdup("VIA Cyrix III (WinChip C5B/C)");
+ } else {
+ processor->strmodel = g_strdup("VIA Cyrix III (WinChip C5C-T)");
+ }
+ } else {
+ processor->strmodel = g_strdup("Cyrix i386 class");
+ }
} else if (g_str_equal(processor->vendor_id, "CentaurHauls")) {
- if (family == 5) {
- if (model <= 4) {
- processor->strmodel = g_strdup("Centaur WinChip C6");
- } else if (model <= 8) {
- processor->strmodel = g_strdup("Centaur WinChip 2");
- } else {
- processor->strmodel = g_strdup("Centaur WinChip 2A");
- }
- } else {
- processor->strmodel = g_strdup("Centaur i386 class");
- }
+ if (family == 5) {
+ if (model <= 4) {
+ processor->strmodel = g_strdup("Centaur WinChip C6");
+ } else if (model <= 8) {
+ processor->strmodel = g_strdup("Centaur WinChip 2");
+ } else {
+ processor->strmodel = g_strdup("Centaur WinChip 2A");
+ }
+ } else {
+ processor->strmodel = g_strdup("Centaur i386 class");
+ }
} else if (g_str_equal(processor->vendor_id, "GenuineTMx86")) {
- processor->strmodel = g_strdup("Transmeta Crusoe TM3x00/5x00");
+ processor->strmodel = g_strdup("Transmeta Crusoe TM3x00/5x00");
} else {
- processor->strmodel = g_strdup("Unknown");
+ processor->strmodel = g_strdup("Unknown");
}
}
-static Processor *
-computer_get_processor(void)
+static GSList *computer_get_processors(void)
{
- Processor *processor;
+ GSList *procs = NULL;
+ Processor *processor = NULL;
FILE *cpuinfo;
- gchar buffer[128];
+ gchar buffer[256];
cpuinfo = fopen("/proc/cpuinfo", "r");
if (!cpuinfo)
return NULL;
- processor = g_new0(Processor, 1);
- while (fgets(buffer, 128, cpuinfo)) {
+ while (fgets(buffer, 256, cpuinfo)) {
gchar **tmp = g_strsplit(buffer, ":", 2);
+ if (g_str_has_prefix(tmp[0], "processor")) {
+ if (processor) {
+ get_processor_strfamily(processor);
+ procs = g_slist_append(procs, processor);
+ }
+
+ processor = g_new0(Processor, 1);
+ }
+
if (tmp[0] && tmp[1]) {
tmp[0] = g_strstrip(tmp[0]);
tmp[1] = g_strstrip(tmp[1]);
@@ -165,72 +172,77 @@ computer_get_processor(void)
get_str("hlt_bug", processor->bug_hlt);
get_str("f00f_bug", processor->bug_f00f);
get_str("coma_bug", processor->bug_coma);
-
+
get_int("model", processor->model);
get_int("cpu family", processor->family);
get_int("stepping", processor->stepping);
+
+ get_int("processor", processor->id);
}
g_strfreev(tmp);
}
- get_processor_strfamily(processor);
+ if (processor) {
+ get_processor_strfamily(processor);
+ procs = g_slist_append(procs, processor);
+ }
fclose(cpuinfo);
- return processor;
+ return procs;
}
static struct {
char *name, *meaning;
} flag_meaning[] = {
- { "3dnow", "3DNow! Technology" },
- { "3dnowext", "Extended 3DNow! Technology" },
- { "fpu", "Floating Point Unit" },
- { "vme", "Virtual 86 Mode Extension" },
- { "de", "Debug Extensions - I/O breakpoints" },
- { "pse", "Page Size Extensions (4MB pages)" },
- { "tsc", "Time Stamp Counter and RDTSC instruction" },
- { "msr", "Model Specific Registers" },
- { "pae", "Physical Address Extensions (36-bit address, 2MB pages)" },
- { "mce", "Machine Check Architeture" },
- { "cx8", "CMPXCHG8 instruction" },
- { "apic", "Advanced Programmable Interrupt Controller" },
- { "sep", "Fast System Call (SYSENTER/SYSEXIT instructions)" },
- { "mtrr", "Memory Type Range Registers" },
- { "pge", "Page Global Enable" },
- { "mca", "Machine Check Architecture" },
- { "cmov", "Conditional Move instruction" },
- { "pat", "Page Attribute Table" },
- { "pse36", "36bit Page Size Extensions" },
- { "psn", "96 bit Processor Serial Number" },
- { "mmx", "MMX technology" },
- { "mmxext", "Extended MMX Technology" },
- { "cflush", "Cache Flush" },
- { "dtes", "Debug Trace Store" },
- { "fxsr", "FXSAVE and FXRSTOR instructions" },
- { "kni", "Streaming SIMD instructions" },
- { "xmm", "Streaming SIMD instructions" },
- { "ht", "HyperThreading" },
- { "mp", "Multiprocessing Capable" },
- { "sse", "SSE instructions" },
- { "sse2", "SSE2 (WNI) instructions" },
- { "acc", "Automatic Clock Control" },
- { "ia64", "IA64 Instructions" },
- { "syscall", "SYSCALL and SYSEXIT instructions" },
- { "nx", "No-execute Page Protection" },
- { "xd", "Execute Disable" },
- { "clflush", "Cache Line Flush instruction" },
- { "acpi", "Thermal Monitor and Software Controlled Clock Facilities" },
- { "dts", "Debug Store" },
- { "ss", "Self Snoop" },
- { "tm", "Thermal Monitor" },
- { "pbe", "Pending Break Enable" },
- { "pb", "Pending Break Enable" },
- { NULL, NULL}
+ {
+ "3dnow", "3DNow! Technology"}, {
+ "3dnowext", "Extended 3DNow! Technology"}, {
+ "fpu", "Floating Point Unit"}, {
+ "vme", "Virtual 86 Mode Extension"}, {
+ "de", "Debug Extensions - I/O breakpoints"}, {
+ "pse", "Page Size Extensions (4MB pages)"}, {
+ "tsc", "Time Stamp Counter and RDTSC instruction"}, {
+ "msr", "Model Specific Registers"}, {
+ "pae", "Physical Address Extensions (36-bit address, 2MB pages)"}, {
+ "mce", "Machine Check Architeture"}, {
+ "cx8", "CMPXCHG8 instruction"}, {
+ "apic", "Advanced Programmable Interrupt Controller"}, {
+ "sep", "Fast System Call (SYSENTER/SYSEXIT instructions)"}, {
+ "mtrr", "Memory Type Range Registers"}, {
+ "pge", "Page Global Enable"}, {
+ "mca", "Machine Check Architecture"}, {
+ "cmov", "Conditional Move instruction"}, {
+ "pat", "Page Attribute Table"}, {
+ "pse36", "36bit Page Size Extensions"}, {
+ "psn", "96 bit Processor Serial Number"}, {
+ "mmx", "MMX technology"}, {
+ "mmxext", "Extended MMX Technology"}, {
+ "cflush", "Cache Flush"}, {
+ "dtes", "Debug Trace Store"}, {
+ "fxsr", "FXSAVE and FXRSTOR instructions"}, {
+ "kni", "Streaming SIMD instructions"}, {
+ "xmm", "Streaming SIMD instructions"}, {
+ "ht", "HyperThreading"}, {
+ "mp", "Multiprocessing Capable"}, {
+ "sse", "SSE instructions"}, {
+ "sse2", "SSE2 (WNI) instructions"}, {
+ "acc", "Automatic Clock Control"}, {
+ "ia64", "IA64 Instructions"}, {
+ "syscall", "SYSCALL and SYSEXIT instructions"}, {
+ "nx", "No-execute Page Protection"}, {
+ "xd", "Execute Disable"}, {
+ "clflush", "Cache Line Flush instruction"}, {
+ "acpi", "Thermal Monitor and Software Controlled Clock Facilities"}, {
+ "dts", "Debug Store"}, {
+ "ss", "Self Snoop"}, {
+ "tm", "Thermal Monitor"}, {
+ "pbe", "Pending Break Enable"}, {
+ "pb", "Pending Break Enable"}, {
+ NULL, NULL}
};
-gchar *
-processor_get_capabilities_from_flags(gchar * strflags)
+gchar *processor_get_capabilities_from_flags(gchar * strflags)
{
/* FIXME:
* - Separate between processor capabilities, additional instructions and whatnot.
@@ -260,47 +272,81 @@ processor_get_capabilities_from_flags(gchar * strflags)
return tmp;
}
-static gchar *
-processor_get_info(Processor *processor)
+static gchar *processor_get_detailed_info(Processor * processor)
{
- gchar *tmp = processor_get_capabilities_from_flags(processor->
- flags);
- gchar *ret = g_strdup_printf("[Processor]\n"
- "Name=%s\n"
- "Specification=%s\n"
- "Family, model, stepping=%d, %d, %d\n"
- "Vendor=%s\n"
- "Cache Size=%dkb\n"
- "Frequency=%.2fMHz\n"
- "BogoMips=%.2f\n"
- "Byte Order=%s\n"
- "[Features]\n"
- "FDIV Bug=%s\n"
- "HLT Bug=%s\n"
- "F00F Bug=%s\n"
- "Coma Bug=%s\n"
- "Has FPU=%s\n"
- "[Capabilities]\n" "%s",
- processor->strmodel,
- processor->model_name,
- processor->family,
- processor->model,
- processor->stepping,
- vendor_get_name(processor->vendor_id),
- processor->cache_size,
- processor->cpu_mhz,
- processor->bogomips,
+ gchar *tmp, *ret;
+
+ tmp = processor_get_capabilities_from_flags(processor->flags);
+ ret = g_strdup_printf("[Processor]\n"
+ "Name=%s\n"
+ "Specification=%s\n"
+ "Family, model, stepping=%d, %d, %d\n"
+ "Vendor=%s\n"
+ "Cache Size=%dkb\n"
+ "Frequency=%.2fMHz\n"
+ "BogoMips=%.2f\n"
+ "Byte Order=%s\n"
+ "[Features]\n"
+ "FDIV Bug=%s\n"
+ "HLT Bug=%s\n"
+ "F00F Bug=%s\n"
+ "Coma Bug=%s\n"
+ "Has FPU=%s\n"
+ "[Capabilities]\n" "%s",
+ processor->strmodel,
+ processor->model_name,
+ processor->family,
+ processor->model,
+ processor->stepping,
+ vendor_get_name(processor->vendor_id),
+ processor->cache_size,
+ processor->cpu_mhz, processor->bogomips,
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
- "Little Endian",
+ "Little Endian",
#else
- "Big Endian",
+ "Big Endian",
#endif
- processor->bug_fdiv,
- processor->bug_hlt,
- processor->bug_f00f,
- processor->bug_coma,
- processor->has_fpu,
- tmp);
- g_free(tmp);
- return ret;
+ processor->bug_fdiv,
+ processor->bug_hlt,
+ processor->bug_f00f,
+ processor->bug_coma, processor->has_fpu, tmp);
+ g_free(tmp);
+ return ret;
+
+}
+
+static 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);
+ g_hash_table_insert(moreinfo, hashkey,
+ processor_get_detailed_info(processor));
+ }
+
+ 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);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 13:14:43 +0000