From 1e70eece00605b7c81ae536c08eac9a4894c4137 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri, 30 Jan 2009 11:03:50 -0800
Subject: Fix CPU summary
Handle case of UP and virtualized CPU better.
Fix path to script.
---
scripts/vyatta-cpu-summary.pl | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
(limited to 'scripts')
diff --git a/scripts/vyatta-cpu-summary.pl b/scripts/vyatta-cpu-summary.pl
index 1839a5d..771bc5a 100755
--- a/scripts/vyatta-cpu-summary.pl
+++ b/scripts/vyatta-cpu-summary.pl
@@ -31,7 +31,9 @@ while (<$cpuinfo>) {
}
close $cpuinfo;
-print "CPU ", join( " \n", keys %models ), "\n";
-print "Packages ", scalar keys %packages, "\n";
-print "Cores ", scalar keys %cores, "\n";
-print "Threads ", $cpu, "\n";
+print "Processors ", $cpu, "\n";
+print "Packages ", scalar keys %packages, "\n" if (%packages);
+print "Cores ", scalar keys %cores, "\n" if (%cores);
+
+# Handle any attempt to run different CPU models
+print "Model ", join( " \n", keys %models ), "\n";
--
cgit v1.2.3