Commit 00344b00 authored by Dietmar Maurer's avatar Dietmar Maurer

use PVE::ProcFSTools::read_cpuinfo to get numbert of sockets

parent 8c846a7b
...@@ -9,6 +9,7 @@ use LWP::UserAgent; ...@@ -9,6 +9,7 @@ use LWP::UserAgent;
use JSON; use JSON;
use PVE::Tools; use PVE::Tools;
use PVE::ProcFSTools;
use PVE::Exception qw(raise_param_exc); use PVE::Exception qw(raise_param_exc);
use PVE::INotify; use PVE::INotify;
use PVE::Cluster qw (cfs_read_file cfs_write_file); use PVE::Cluster qw (cfs_read_file cfs_write_file);
...@@ -47,29 +48,9 @@ sub get_hwaddress { ...@@ -47,29 +48,9 @@ sub get_hwaddress {
return $hwaddress; return $hwaddress;
} }
my $hwsockets;
sub get_sockets { sub get_sockets {
return $hwsockets if $hwsockets; my $info = PVE::ProcFSTools::read_cpuinfo();
return $info->{sockets};
my $fh = IO::File->new ('/proc/cpuinfo', "r") ||
die "can't read cpu info - $!\n";
my $sockets = 0;
while (defined(my $line = <$fh>)) {
if ($line =~ m/^physical id\s*:\s*(\d+)\s*$/i) {
my $sid = $1 + 1;
$sockets = $sid if $sid > $sockets;
}
}
close($fh);
die "unable to get socket count\n" if !$sockets;
$hwsockets = $sockets;
return $hwsockets;
} }
sub parse_key { sub parse_key {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment