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

branches one, trying a patch for xeon cpus, they have wrong /proc/cpuinfo file so adding workaround.

Browse source
This commit is contained in:
inxi-svn 2013-06-14 20:52:02 +00:00
parent 845785be8e
commit db44237e68
1 changed files with 34 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
inxi
View file

@ -3,7 +3,7 @@
#### Script Name: inxi #### Script Name: inxi
#### Version: 1.9.8 #### Version: 1.9.8
#### Date: June 14 2013 #### Date: June 14 2013
#### Patch Number: 03-b1 #### Patch Number: 04-b1
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
######################################################################## ########################################################################
@ -3591,7 +3591,8 @@ get_cpu_ht_multicore_smp_data()
eval $LOGFS eval $LOGFS
# in /proc/cpuinfo # in /proc/cpuinfo
local temp_array='' local temp_array=''
# note: known bug with xeon intel, they show core_id/physical_id as 0 for ht 4 core
if [[ $B_CPUINFO_FILE == 'true' ]]; then if [[ $B_CPUINFO_FILE == 'true' ]]; then
A_CPU_TYPE_PCNT_CCNT=( $( A_CPU_TYPE_PCNT_CCNT=( $(
gawk ' gawk '
@ -3611,8 +3612,22 @@ get_cpu_ht_multicore_smp_data()
count = 0 count = 0
nr = 0 nr = 0
bArm = "false" bArm = "false"
bXeon = "false"
siblings = ""
}
# hack to handle xeons which can have buggy /proc/cpuinfo files
/^model name/ && ( $0 ~ /Xeon/ ) {
bXeon = "true"
}
# only do this once since sibling count does not change
/^siblings/ && ( bXeon == "true" ) && ( siblings == "" ) {
gsub(/[^0-9]/,"",$NF)
if ( $NF != "" ) {
siblings = $NF
}
} }
# array of logical processors, both HT and physical # array of logical processors, both HT and physical
/^processor/ { /^processor/ {
gsub(/,/, " ", $NF) gsub(/,/, " ", $NF)
gsub(/^ +| +$/, "", $NF) gsub(/^ +| +$/, "", $NF)
@ -3665,18 +3680,22 @@ get_cpu_ht_multicore_smp_data()
for ( i in cpu_id ) { for ( i in cpu_id ) {
cpuHolder[cpu_id[i]] = 1 cpuHolder[cpu_id[i]] = 1
} }
for ( i in cpuHolder ) { for ( i in cpuHolder ) {
num_of_cpus++ num_of_cpus++
} }
i = 0 i = 0
## count unique cores ## ## count unique cores ##
for ( i in core_id ) { for ( i in core_id ) {
coreHolder[core_id[i]] = 1 coreHolder[core_id[i]] = 1
} }
for ( i in coreHolder ) { for ( i in coreHolder ) {
num_of_cores++ num_of_cores++
} }
# xeon may show wrong core / physical id count, if it does, fix it
if ( num_of_cores == 1 && bXeon == "true" && siblings != "" && siblings > 1 ) {
num_of_cores = siblings/2
}
# final check, override the num of cores value if it clearly is wrong # final check, override the num of cores value if it clearly is wrong
# and use the raw core count and synthesize the total instead of real count # and use the raw core count and synthesize the total instead of real count
if ( ( num_of_cores == 1 ) && ( cpu_core_count * num_of_cpus > 1 ) ) { if ( ( num_of_cores == 1 ) && ( cpu_core_count * num_of_cpus > 1 ) ) {
@ -3689,25 +3708,24 @@ get_cpu_ht_multicore_smp_data()
# if > 1 processor && processor id (physical id) != core id then Multi-Core Processors (MCP) # if > 1 processor && processor id (physical id) != core id then Multi-Core Processors (MCP)
# if > 1 processor && processor ids (physical id) > 1 then Multiple Processors (SMP) # if > 1 processor && processor ids (physical id) > 1 then Multiple Processors (SMP)
# if = 1 processor then single core/processor Uni-Processor (UP) # if = 1 processor then single core/processor Uni-Processor (UP)
if ( num_of_processors > 1 ) if ( num_of_processors > 1 || ( bXeon == "true" && siblings != "" ) ) {
{
# non-multicore HT # non-multicore HT
if ( num_of_processors == (num_of_cores * 2)) if ( num_of_processors == (num_of_cores * 2) ) {
{
type = type "HT-" type = type "HT-"
} }
else if ( bXeon == "true" && siblings != "" && siblings > 1 ) {
type = type "HT-" # num_of_processors num_of_cores num_of_cpus
}
# non-HT multi-core or HT multi-core # non-HT multi-core or HT multi-core
if (( num_of_processors == num_of_cores) || if (( num_of_processors == num_of_cores) || ( num_of_cpus < num_of_cores)) {
( num_of_cpus < num_of_cores))
{
type = type "MCP-" type = type "MCP-"
} }
# >1 cpu sockets active # >1 cpu sockets active
if ( num_of_cpus > 1 ) if ( num_of_cpus > 1 ) {
{
type = type "SMP-" type = type "SMP-"
} }
} else { }
else {
type = type "UP-" type = type "UP-"
} }
@ -6255,7 +6273,7 @@ get_partition_data()
} }
# next set devBase if it didn not get set above here # next set devBase if it didn not get set above here
( $1 ~ /^\/dev\/|:\/|\/\// ) && ( devBase == "" ) { ( devBase == "" ) && ( $1 ~ /^\/dev\/|:\/|\/\// ) {
devBase=gensub( /^(\/dev\/)(.+)$/, "\\2", 1, $1 ) devBase=gensub( /^(\/dev\/)(.+)$/, "\\2", 1, $1 )
} }
# this handles zfs type devices/partitions, which do not start with / but contain / # this handles zfs type devices/partitions, which do not start with / but contain /