wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-10-26 12:24:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

sensors-detect: Fix printing CPU info on ppc and arm

Browse Source 
The format of /proc/cpuinfo on other arches is different from the
format on x86. Modify the print_cpu_info function to handle arm and
ppc.

This change also eliminates Perl warnings caused by non-existent
elements in the %cpu hash:
Use of uninitialized value in concatenation (.) or string at
./prog/detect/sensors-detect line 3124.

Based on a patch from Changqing Li <changqing.li@windriver.com>,
GitHub PR: https://github.com/lm-sensors/lm-sensors/pull/168
This commit is contained in:
Ondřej Lysoněk committed 2019-10-17 10:07:21 +02:00
1 parent 2b5e364e0a
commit c28d20d19d
1 file changed
+11 -2
Download Patch File Download Diff File Expand all files Collapse all files
prog/detect/sensors-detect
+11 -2
View File
@@ -3130,7 +3130,7 @@ sub initialize_cpu_list
};
next;
}
if (m/^(vendor_id|cpu family|model|model name|stepping|cpuid level)\s*:\s*(.+)$/) {
if (m/^(vendor_id|cpu family|model|model name|stepping|cpuid level|cpu|revision)\s*:\s*(.+)$/) {
my $k = $1;
my $v = $2;
$v =~ s/\s+/ /g; # Merge multiple spaces
@@ -3146,7 +3146,16 @@ sub initialize_cpu_list
sub print_cpu_info
{
my $cpu = $cpu[0];
print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n";
if ($kernel_arch =~ m/^ppc(64(le)?)?$/) {
print "# Processor: $cpu->{cpu} ($cpu->{revision})\n";
} elsif ($kernel_arch =~ m/^arm/) {
print "# Processor: $cpu->{'model name'}\n";
} elsif (exists $cpu->{'model name'} && exists $cpu->{'cpu family'}
&& exists $cpu->{'model'} && exists $cpu->{'stepping'}) {
print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n";
} else {
print "# Cannot show processor info on $kernel_arch architecture.\n";
}
}
# @i2c_adapters is a list of references to hashes, one hash per I2C/SMBus