From cc85ccbce5fffe23f227c74aa8d6ee92bdee5abe Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Tue, 3 Feb 2009 20:42:40 +0000 Subject: [PATCH] up bug fix for branch one --- inxi | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/inxi b/inxi index 603c41f..23ce27e 100755 --- a/inxi +++ b/inxi @@ -1,7 +1,7 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 0.9.8-b1-t1 +#### version: 0.9.8-b1-t2 #### Date: 3 February 2009 ######################################################################## #### SPECIAL THANKS @@ -1587,32 +1587,11 @@ get_cpu_ht_multicore_smp_data() else { type = "SMP" } -# if ( 1.1 == 1 ){print "yes"}else{print "no"} - -# if ( physical_cpu_count == 1 ) { -# if ( physical_cpu_count == core_count ) { -# type = "HT" # this is more than likely a P4 w/HT or an Atom 270 -# } -# else { -# if ( core_count == num_of_cores && core_count == num_of_processors) { -# type = "MCP" -# cores = core_count -# } -# else { -# type = "HT" # this is i7 or Atom 330 or some Xeons -# cores = core_count -# } -# } -# } -# else { -# type = "SMP" -# processors = physical_cpu_count -# -# if ( num_of_cores > 1 ) { -# type = "SMPMC" # processors could be both MCP and SMP -# cores = core_count -# } -# } + } + # make sure to handle up cpus too + else { + core_count = 1 + physical_cpu_count = 1 } print type " " physical_cpu_count " " core_count }