Add cgroup1

kzys · kzys · commit 7c55330b97d3 · 2022-11-08T02:28:22.000Z
Signed-off-by: Kazuyoshi Kato &lt;katokazu@amazon.com&gt;
diff --git a/cgroup1/blkio.go b/cgroup1/blkio.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"bufio"
diff --git a/cgroup1/blkio_test.go b/cgroup1/blkio_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"os"
diff --git a/cgroup1/cgroup.go b/cgroup1/cgroup.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"errors"
diff --git a/cgroup1/cgroup_test.go b/cgroup1/cgroup_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"fmt"
diff --git a/cgroup1/control.go b/cgroup1/control.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"os"
diff --git a/cgroup1/cpu.go b/cgroup1/cpu.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"bufio"
diff --git a/cgroup1/cpuacct.go b/cgroup1/cpuacct.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"bufio"
diff --git a/cgroup1/cpuacct_test.go b/cgroup1/cpuacct_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"os"
diff --git a/cgroup1/cpuset.go b/cgroup1/cpuset.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"bytes"
diff --git a/cgroup1/devices.go b/cgroup1/devices.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"fmt"
diff --git a/cgroup1/errors.go b/cgroup1/errors.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"errors"
diff --git a/cgroup1/freezer.go b/cgroup1/freezer.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"os"
diff --git a/cgroup1/hierarchy.go b/cgroup1/hierarchy.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 // Hierarchy enables both unified and split hierarchy for cgroups
 type Hierarchy func() ([]Subsystem, error)
diff --git a/cgroup1/hugetlb.go b/cgroup1/hugetlb.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"os"
diff --git a/cgroup1/memory.go b/cgroup1/memory.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"bufio"
diff --git a/cgroup1/memory_test.go b/cgroup1/memory_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"fmt"
diff --git a/cgroup1/mock_test.go b/cgroup1/mock_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"os"
diff --git a/cgroup1/named.go b/cgroup1/named.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import "path/filepath"
 
diff --git a/cgroup1/named_test.go b/cgroup1/named_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import "testing"
 
diff --git a/cgroup1/net_cls.go b/cgroup1/net_cls.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"os"
diff --git a/cgroup1/net_prio.go b/cgroup1/net_prio.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"fmt"
diff --git a/cgroup1/opts.go b/cgroup1/opts.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"errors"
diff --git a/cgroup1/paths.go b/cgroup1/paths.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"errors"
diff --git a/cgroup1/paths_test.go b/cgroup1/paths_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"os"
diff --git a/cgroup1/perf_event.go b/cgroup1/perf_event.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import "path/filepath"
 
diff --git a/cgroup1/pids.go b/cgroup1/pids.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"os"
diff --git a/cgroup1/pids_test.go b/cgroup1/pids_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"encoding/hex"
diff --git a/cgroup1/rdma.go b/cgroup1/rdma.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"math"
diff --git a/cgroup1/state.go b/cgroup1/state.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 // State is a type that represents the state of the current cgroup
 type State string
diff --git a/cgroup1/subsystem.go b/cgroup1/subsystem.go
@@ -14,12 +14,13 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"fmt"
 	"os"
 
+	"github.com/containerd/cgroups/v2"
 	v1 "github.com/containerd/cgroups/v2/stats/v1"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
@@ -59,7 +60,7 @@ func Subsystems() []Name {
 		Blkio,
 		Rdma,
 	}
-	if !RunningInUserNS() {
+	if !cgroups.RunningInUserNS() {
 		n = append(n, Devices)
 	}
 	if _, err := os.Stat("/sys/kernel/mm/hugepages"); err == nil {
diff --git a/cgroup1/systemd.go b/cgroup1/systemd.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"context"
diff --git a/cgroup1/testutil_test.go b/cgroup1/testutil_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 import (
 	"golang.org/x/sys/unix"
diff --git a/cgroup1/ticks.go b/cgroup1/ticks.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package cgroups
+package cgroup1
 
 func getClockTicks() uint64 {
 	// The value comes from `C.sysconf(C._SC_CLK_TCK)`, and
diff --git a/cgroup1/utils.go b/cgroup1/utils.go
diff --git a/cgroup1/v1.go b/cgroup1/v1.go
diff --git a/utils.go b/utils.go
