mirror of
https://github.com/smxi/inxi.git
synced 2024-11-17 00:31:19 +00:00
maybe svn glitch, double checking
This commit is contained in:
parent
d57cbf4b1e
commit
e41eeea227
9
inxi
9
inxi
|
@ -1,13 +1,8 @@
|
|||
#!/bin/bash
|
||||
########################################################################
|
||||
#### Script Name: inxi
|
||||
<<<<<<< .mine
|
||||
#### version: 1.1.12
|
||||
#### Date: August 6 2009
|
||||
=======
|
||||
#### version: 1.1.12
|
||||
#### Date: August 4 2009
|
||||
>>>>>>> .r685
|
||||
########################################################################
|
||||
#### SPECIAL THANKS
|
||||
########################################################################
|
||||
|
@ -2004,11 +1999,11 @@ get_cpu_ht_multicore_smp_data()
|
|||
|
||||
# looking at logical processor counts over 1, which means either HT, SMP or MCP
|
||||
# http://en.wikipedia.org/wiki/Symmetric_multiprocessing
|
||||
if ( processor_logical_count > 1 ) {
|
||||
if ( processor_logical_count > 1 && core_count > 1 ) {
|
||||
if ( processor_logical_count > core_count && physical_cpu_count > 1 ) {
|
||||
type = "SMP-HT" # could be Xeon/P4 HT dual cpu
|
||||
}
|
||||
else if ( processor_logical_count > core_count && core_count > 1) {
|
||||
else if ( processor_logical_count > core_count ) {
|
||||
type = "HT" # this is more than likely a P4 w/HT or an Atom 270
|
||||
}
|
||||
else {
|
||||
|
|
Loading…
Reference in a new issue