cpuset: replace 'kind' with an 'effective' boolean

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

diff --git a/src/PVE/CpuSet.pm b/src/PVE/CpuSet.pm
index 92fd18fe73a86c6120f5f0f70547aa1eb8275fd5..fe36536badc8bdb50fdcf97a4e67ab0892da2a4d 100644 (file)
--- a/src/PVE/CpuSet.pm
+++ b/src/PVE/CpuSet.pm
@@ -6,27 +6,35 @@ use PVE::Tools;
 use PVE::ProcFSTools;
 
 sub new {
-    my ($this) = @_;
+    my ($class, $members) = @_;
 
-    my $class = ref($this) || $this;
-
-    my $self = bless { members => {} }, $class;
+    $members //= {};
+    my $self = bless { members => $members }, $class;
 
     return $self;
 }
 
+# Create a new set with the contents of a cgroup-v1 subdirectory
 sub new_from_cgroup {
-    my ($this, $cgroup, $kind) = @_;
+    my ($class, $cgroup, $effective) = @_;
 
-    $kind //= 'cpus';
+    my $kind = $effective ? 'effective_cpus' : '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)) {
@@ -43,10 +51,7 @@ sub new_from_cgroup {
        }
     }
 
-    die "got empty cpuset for cgroup '$cgroup'\n"
-       if !$count;
-
-    return $cpuset;
+    return ($count, $members);
 }
 
 sub write_to_cgroup {
@@ -72,7 +77,7 @@ sub insert {
     my ($self, @members) = @_;
 
     my $count = 0;
-    
+
     foreach my $cpu (@members) {
        next if $self->{members}->{$cpu};
        $self->{members}->{$cpu} = 1;
@@ -86,7 +91,7 @@ sub delete {
     my ($self, @members) = @_;
 
     my $count = 0;
-    
+
     foreach my $cpu (@members) {
        next if !$self->{members}->{$cpu};
        delete $self->{members}->{$cpu};
@@ -107,7 +112,7 @@ sub members {
     my ($self) = @_;
 
     return sort { $a <=> $b } keys %{$self->{members}};
-}    
+}
 
 sub size {
     my ($self) = @_;
@@ -127,7 +132,7 @@ sub is_equal {
     foreach my $id (keys %$members2) {
        return 0 if !$members1->{$id};
     }
-    
+
     return 1;
 }