dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2024-11-17 00:31:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug in ht detection, much simpler now, this should work I hope.

Browse source
This commit is contained in:
inxi-svn 2009-02-04 06:32:10 +00:00
parent 460f028877
commit ad6da8977e
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
inxi
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 0.9.8 #### version: 0.9.9
#### Date: 3 February 2009 #### Date: 3 February 2009
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
@ -1519,18 +1519,19 @@ get_cpu_ht_multicore_smp_data()
FS=": " FS=": "
IGNORECASE = 1 IGNORECASE = 1
core_count = 0 core_count = 0
cores = 1 # single cores are obviously a Uni-processor
i = 0 i = 0
index_temp = "" index_temp = ""
num_of_cores = 0
physical_cpu_count = 0 physical_cpu_count = 0
processor_logical_count = 0
processors = 1 processors = 1
type = "UP" type = "UP"
} }
# counts logical processors, both HT and physical # counts logical processors, both HT and physical
/^processor/ { /^processor/ {
num_of_processors = $NF + 1 processor_logical_count = $NF + 1
} }
# counts physical cores # counts physical cores (not used currently)
/^cpu cores/ { /^cpu cores/ {
num_of_cores = $NF num_of_cores = $NF
} }
@ -1545,11 +1546,12 @@ get_cpu_ht_multicore_smp_data()
} }
END { END {
# look for the largest id number, and assign it # look for the largest id number, and assign it
for ( j = 0; j < num_of_processors; j++ ) { for ( j = 0; j < processor_logical_count; j++ ) {
if ( a_core_id[j] > core_count ) { if ( a_core_id[j] > core_count ) {
core_count = a_core_id[j] core_count = a_core_id[j]
} }
} }
core_count = core_count + 1
# trick, set the index equal to value, if the same, it will overwrite # trick, set the index equal to value, if the same, it will overwrite
# this lets us create the actual array of true cpu physical ids # this lets us create the actual array of true cpu physical ids
for ( j in a_physical_id ) { for ( j in a_physical_id ) {
@ -1560,15 +1562,14 @@ get_cpu_ht_multicore_smp_data()
for ( j in a_cpu_physical_working ) { for ( j in a_cpu_physical_working ) {
++physical_cpu_count ++physical_cpu_count
} }
core_count = core_count + 1
# looking at logical processor counts over 1, which means either HT, SMP or MCP # looking at logical processor counts over 1, which means either HT, SMP or MCP
# http://en.wikipedia.org/wiki/Symmetric_multiprocessing # http://en.wikipedia.org/wiki/Symmetric_multiprocessing
if ( num_of_processors > 1 ) { if ( processor_logical_count > 1 ) {
per_cpu_core_count = num_of_processors / physical_cpu_count if ( processor_logical_count > core_count && physical_cpu_count > 1 ) {
if ( physical_cpu_count == per_cpu_core_count && physical_cpu_count > 1 ) { type = "SMP-HT" # could be Xeon/P4 HT dual cpu
type = "SMP-HT"
} }
else if ( physical_cpu_count == per_cpu_core_count ) { else if ( processor_logical_count > core_count ) {
type = "HT" # this is more than likely a P4 w/HT or an Atom 270 type = "HT" # this is more than likely a P4 w/HT or an Atom 270
} }
else { else {
@ -2481,14 +2482,14 @@ print_short_data()
local cpu_core_count=${A_CPU_CORE_DATA[3]} local cpu_core_count=${A_CPU_CORE_DATA[3]}
local cpu_core_alpha=${A_CPU_CORE_DATA[1]} local cpu_core_alpha=${A_CPU_CORE_DATA[1]}
local cpu_type=${A_CPU_CORE_DATA[2]} local cpu_type=${A_CPU_CORE_DATA[2]}
local cores_per_cpu=$(( $cpu_core_count / $cpu_physical_count ))
if [[ "$cpu_physical_count" -gt 1 ]];then if [[ "$cpu_physical_count" -gt 1 ]];then
cpc_plural='(s)' cpc_plural='(s)'
model_plural='s' model_plural='s'
cpu_count_print="$cpu_physical_count " cpu_count_print="$cpu_physical_count "
fi fi
local cpu_data_string="${cpu_count_print}${cpu_core_alpha} core ${cpu_type}" local cpu_data_string="${cpu_count_print}${cpu_core_alpha} core"
# local cpu_core_count=${A_CPU_CORE_DATA[0]} # local cpu_core_count=${A_CPU_CORE_DATA[0]}
# load A_HDD_DATA # load A_HDD_DATA
@ -2538,7 +2539,7 @@ print_short_data()
#C1="${C1},1"; C2="${C2},1"; CN="${CN},1" #C1="${C1},1"; C2="${C2},1"; CN="${CN},1"
fi fi
fi fi
short_data="${C1}CPU$cpc_plural${CN}[${C2} ${cpu_data_string} ${cpu_model}$model_plural ${C1}clocked at${C2} ${min_max_clock}${CN}] ${C1}Kernel${CN}[${C2} ${current_kernel}${CN}] ${C1}Up${CN}[${C2}${FL2}${FL1}${up_time}${FL1}${CN}] ${C1}Mem${CN}[${C2}${FL2}${FL1}${memory}${FL1}${CN}] ${C1}HDD${CN}[${C2}${FL2}${FL1}${hdd_capacity}($hdd_used)${FL1}${CN}] ${C1}Procs${CN}[${C2}${FL2}${FL1}${processes}${FL1}${CN}]" short_data="${C1}CPU$cpc_plural${CN}[${C2} ${cpu_data_string} ${cpu_model}$model_plural (${cpu_type}) ${C1}clocked at${C2} ${min_max_clock}${CN}] ${C1}Kernel${CN}[${C2} ${current_kernel}${CN}] ${C1}Up${CN}[${C2}${FL2}${FL1}${up_time}${FL1}${CN}] ${C1}Mem${CN}[${C2}${FL2}${FL1}${memory}${FL1}${CN}] ${C1}HDD${CN}[${C2}${FL2}${FL1}${hdd_capacity}($hdd_used)${FL1}${CN}] ${C1}Procs${CN}[${C2}${FL2}${FL1}${processes}${FL1}${CN}]"
if [[ $SHOW_IRC -gt 0 ]];then if [[ $SHOW_IRC -gt 0 ]];then
short_data="${short_data} ${C1}Client${CN}[${C2}${IRC_CLIENT}${IRC_CLIENT_VERSION}${CN}]" short_data="${short_data} ${C1}Client${CN}[${C2}${IRC_CLIENT}${IRC_CLIENT_VERSION}${CN}]"
@ -2663,7 +2664,7 @@ print_cpu_data()
model_plural='s' model_plural='s'
fi fi
local cpu_data_string="${cpu_count_print}${cpu_core_alpha} core ${cpu_type}" local cpu_data_string="${cpu_count_print}${cpu_core_alpha} core"
# Strange (and also some expected) behavior encountered. If print_screen_output() uses $1 # Strange (and also some expected) behavior encountered. If print_screen_output() uses $1
# as the parameter to output to the screen, then passing "<text1> ${ARR[@]} <text2>" # as the parameter to output to the screen, then passing "<text1> ${ARR[@]} <text2>"
# will output only <text1> and first element of ARR. That "@" splits in elements and "*" _doesn't_, # will output only <text1> and first element of ARR. That "@" splits in elements and "*" _doesn't_,
@ -2676,12 +2677,12 @@ print_cpu_data()
a_cpu_working[2]="unknown" a_cpu_working[2]="unknown"
fi fi
cpu_data=$( create_print_line "CPU$cpc_plural:" "${C1}${cpu_data_string}${C2} ${a_cpu_working[0]}$model_plural" ) cpu_data=$( create_print_line "CPU$cpc_plural:" "${C1}${cpu_data_string}${C2} ${a_cpu_working[0]}$model_plural (${cpu_type})" )
if [[ $VERBOSITY_LEVEL -ge 3 || $B_SHOW_CPU == 'true' ]];then if [[ $VERBOSITY_LEVEL -ge 3 || $B_SHOW_CPU == 'true' ]];then
# update for multicore, bogomips x core count. # update for multicore, bogomips x core count.
if [[ $B_EXTRA_DATA == 'true' ]];then if [[ $B_EXTRA_DATA == 'true' ]];then
# if [[ $cpu_vendor != 'intel' ]];then # if [[ $cpu_vendor != 'intel' ]];then
bmip_data=$( calculate_multicore_data "${a_cpu_working[4]}" "$(( $cpu_core_count * $cpu_physical_count ))" ) bmip_data=$( calculate_multicore_data "${a_cpu_working[4]}" "$(( $cpu_core_count * $cpu_physical_count ))" )
# else # else
# bmip_data="${a_cpu_working[4]}" # bmip_data="${a_cpu_working[4]}"
# fi # fi