cpuset: cleanup/refactor

[pve-common.git] / src / PVE / CpuSet.pm

diff --git a/src/PVE/CpuSet.pm b/src/PVE/CpuSet.pm
index 9f76f385d27843282cc617167b751020d88539bd..aab2c9a7f454197f47ab59f79a064241a0d17e48 100644 (file)
--- a/src/PVE/CpuSet.pm
+++ b/src/PVE/CpuSet.pm
@@ -5,51 +5,41 @@ use warnings;
 use PVE::Tools;
 use PVE::ProcFSTools;
 
-my $MAX_CPUID;
-
-sub max_cpuid {
-
-    return $MAX_CPUID if defined($MAX_CPUID);
-
-    my $cpuinfo = PVE::ProcFSTools::read_cpuinfo();
-
-    $MAX_CPUID = $cpuinfo->{cpus} || 1;
-
-    return $MAX_CPUID;
-}
-
 sub new {
-    my ($this) = @_;
+    my ($class, $members) = @_;
 
-    my $class = ref($this) || $this;
+    $members //= {};
+    my $self = bless { members => $members }, $class;
 
-    my $self = bless { members => {} }, $class;
-    
-    max_cpuid() if !defined($MAX_CPUID); # initialize $MAX_CPUID
-    
     return $self;
 }
 
 sub new_from_cgroup {
-    my ($this, $cgroup, $kind) = @_;
+    my ($class, $cgroup, $kind) = @_;
 
     $kind //= 'cpus';
 
     my $filename = "/sys/fs/cgroup/cpuset/$cgroup/cpuset.$kind";
     my $set_text = PVE::Tools::file_read_firstline($filename) // '';
 
-    my $cpuset = $this->new();
-    
-    my $members = $cpuset->{members};
+    my ($count, $members) = parse_cpuset($set_text);
+
+    die "got empty cpuset for cgroup '$cgroup'\n"
+       if !$count;
+
+    return $class->new($members);
+}
+
+sub parse_cpuset {
+    my ($set_text) = @_;
 
+    my $members = {};
     my $count = 0;
 
     foreach my $part (split(/,/, $set_text)) {
        if ($part =~ /^\s*(\d+)(?:-(\d+))?\s*$/) {
            my ($from, $to) = ($1, $2);
            $to //= $1;
-           die "cpu id '$from' is out of range\n" if $from >= $MAX_CPUID;
-           die "cpu id '$to' is out of range\n" if $to >= $MAX_CPUID;
            die "invalid range: $part ($to < $from)\n" if $to < $from;
            for (my $i = $from; $i <= $to; $i++) {
                $members->{$i} = 1;
@@ -60,10 +50,7 @@ sub new_from_cgroup {
        }
     }
 
-    die "got empty cpuset for cgroup '$cgroup'\n"
-       if !$count;
-
-    return $cpuset;
+    return ($count, $members);
 }
 
 sub write_to_cgroup {
@@ -89,9 +76,8 @@ sub insert {
     my ($self, @members) = @_;
 
     my $count = 0;
-    
+
     foreach my $cpu (@members) {
-       die "cpu id '$cpu' is out of range\n" if $cpu >= $MAX_CPUID;
        next if $self->{members}->{$cpu};
        $self->{members}->{$cpu} = 1;
        $count++;
@@ -104,9 +90,8 @@ sub delete {
     my ($self, @members) = @_;
 
     my $count = 0;
-    
+
     foreach my $cpu (@members) {
-       die "cpu id '$cpu' is out of range\n" if $cpu >= $MAX_CPUID;
        next if !$self->{members}->{$cpu};
        delete $self->{members}->{$cpu};
        $count++;
@@ -125,8 +110,8 @@ sub has {
 sub members {
     my ($self) = @_;
 
-    return sort keys %{$self->{members}};
-}    
+    return sort { $a <=> $b } keys %{$self->{members}};
+}
 
 sub size {
     my ($self) = @_;
@@ -146,7 +131,7 @@ sub is_equal {
     foreach my $id (keys %$members2) {
        return 0 if !$members1->{$id};
     }
-    
+
     return 1;
 }