From 02fdc7083728b0789284a3cd3ac78603bc3d51b2 Mon Sep 17 00:00:00 2001
From: Michael Crosby <crosbymichael@gmail.com>
Date: Thu, 15 Oct 2015 15:19:23 -0700
Subject: [PATCH] Add Name() to cgroup subsystems

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
---
 libcontainer/cgroups/fs/apply_raw.go  | 2 ++
 libcontainer/cgroups/fs/blkio.go      | 4 ++++
 libcontainer/cgroups/fs/cpu.go        | 4 ++++
 libcontainer/cgroups/fs/cpuacct.go    | 4 ++++
 libcontainer/cgroups/fs/cpuset.go     | 4 ++++
 libcontainer/cgroups/fs/devices.go    | 4 ++++
 libcontainer/cgroups/fs/freezer.go    | 4 ++++
 libcontainer/cgroups/fs/hugetlb.go    | 4 ++++
 libcontainer/cgroups/fs/memory.go     | 4 ++++
 libcontainer/cgroups/fs/net_cls.go    | 4 ++++
 libcontainer/cgroups/fs/net_prio.go   | 4 ++++
 libcontainer/cgroups/fs/perf_event.go | 4 ++++
 12 files changed, 46 insertions(+)

diff --git a/libcontainer/cgroups/fs/apply_raw.go b/libcontainer/cgroups/fs/apply_raw.go
index a0a93a4aa..e597d43e0 100644
--- a/libcontainer/cgroups/fs/apply_raw.go
+++ b/libcontainer/cgroups/fs/apply_raw.go
@@ -34,6 +34,8 @@ var (
 )
 
 type subsystem interface {
+	// Name returns the name of the subsystem.
+	Name() string
 	// Returns the stats, as 'stats', corresponding to the cgroup under 'path'.
 	GetStats(path string, stats *cgroups.Stats) error
 	// Removes the cgroup represented by 'data'.
diff --git a/libcontainer/cgroups/fs/blkio.go b/libcontainer/cgroups/fs/blkio.go
index db886bcf1..0cb65cb98 100644
--- a/libcontainer/cgroups/fs/blkio.go
+++ b/libcontainer/cgroups/fs/blkio.go
@@ -17,6 +17,10 @@ import (
 type BlkioGroup struct {
 }
 
+func (s *BlkioGroup) Name() string {
+	return "blkio"
+}
+
 func (s *BlkioGroup) Apply(d *data) error {
 	dir, err := d.join("blkio")
 	if err != nil && !cgroups.IsNotFound(err) {
diff --git a/libcontainer/cgroups/fs/cpu.go b/libcontainer/cgroups/fs/cpu.go
index 5afd5b8d1..5161a7a61 100644
--- a/libcontainer/cgroups/fs/cpu.go
+++ b/libcontainer/cgroups/fs/cpu.go
@@ -15,6 +15,10 @@ import (
 type CpuGroup struct {
 }
 
+func (s *CpuGroup) Name() string {
+	return "cpu"
+}
+
 func (s *CpuGroup) Apply(d *data) error {
 	// We always want to join the cpu group, to allow fair cpu scheduling
 	// on a container basis
diff --git a/libcontainer/cgroups/fs/cpuacct.go b/libcontainer/cgroups/fs/cpuacct.go
index 4ff4fefea..c855fb323 100644
--- a/libcontainer/cgroups/fs/cpuacct.go
+++ b/libcontainer/cgroups/fs/cpuacct.go
@@ -24,6 +24,10 @@ var clockTicks = uint64(system.GetClockTicks())
 type CpuacctGroup struct {
 }
 
+func (s *CpuacctGroup) Name() string {
+	return "cpuacct"
+}
+
 func (s *CpuacctGroup) Apply(d *data) error {
 	// we just want to join this group even though we don't set anything
 	if _, err := d.join("cpuacct"); err != nil && !cgroups.IsNotFound(err) {
diff --git a/libcontainer/cgroups/fs/cpuset.go b/libcontainer/cgroups/fs/cpuset.go
index 9c603be6c..19c27bde8 100644
--- a/libcontainer/cgroups/fs/cpuset.go
+++ b/libcontainer/cgroups/fs/cpuset.go
@@ -16,6 +16,10 @@ import (
 type CpusetGroup struct {
 }
 
+func (s *CpusetGroup) Name() string {
+	return "cpuset"
+}
+
 func (s *CpusetGroup) Apply(d *data) error {
 	dir, err := d.path("cpuset")
 	if err != nil && !cgroups.IsNotFound(err) {
diff --git a/libcontainer/cgroups/fs/devices.go b/libcontainer/cgroups/fs/devices.go
index d621d275c..dfd20601c 100644
--- a/libcontainer/cgroups/fs/devices.go
+++ b/libcontainer/cgroups/fs/devices.go
@@ -10,6 +10,10 @@ import (
 type DevicesGroup struct {
 }
 
+func (s *DevicesGroup) Name() string {
+	return "devices"
+}
+
 func (s *DevicesGroup) Apply(d *data) error {
 	dir, err := d.join("devices")
 	if err != nil {
diff --git a/libcontainer/cgroups/fs/freezer.go b/libcontainer/cgroups/fs/freezer.go
index 47f743954..b6df93ea8 100644
--- a/libcontainer/cgroups/fs/freezer.go
+++ b/libcontainer/cgroups/fs/freezer.go
@@ -14,6 +14,10 @@ import (
 type FreezerGroup struct {
 }
 
+func (s *FreezerGroup) Name() string {
+	return "freezer"
+}
+
 func (s *FreezerGroup) Apply(d *data) error {
 	dir, err := d.join("freezer")
 	if err != nil && !cgroups.IsNotFound(err) {
diff --git a/libcontainer/cgroups/fs/hugetlb.go b/libcontainer/cgroups/fs/hugetlb.go
index a7d3a8700..1c2f7f78f 100644
--- a/libcontainer/cgroups/fs/hugetlb.go
+++ b/libcontainer/cgroups/fs/hugetlb.go
@@ -14,6 +14,10 @@ import (
 type HugetlbGroup struct {
 }
 
+func (s *HugetlbGroup) Name() string {
+	return "hugetlb"
+}
+
 func (s *HugetlbGroup) Apply(d *data) error {
 	dir, err := d.join("hugetlb")
 	if err != nil && !cgroups.IsNotFound(err) {
diff --git a/libcontainer/cgroups/fs/memory.go b/libcontainer/cgroups/fs/memory.go
index 23c68f837..19dfcc726 100644
--- a/libcontainer/cgroups/fs/memory.go
+++ b/libcontainer/cgroups/fs/memory.go
@@ -17,6 +17,10 @@ import (
 type MemoryGroup struct {
 }
 
+func (s *MemoryGroup) Name() string {
+	return "memory"
+}
+
 func (s *MemoryGroup) Apply(d *data) (err error) {
 	path, err := d.path("memory")
 	if err != nil {
diff --git a/libcontainer/cgroups/fs/net_cls.go b/libcontainer/cgroups/fs/net_cls.go
index 23335dd7b..abee87c96 100644
--- a/libcontainer/cgroups/fs/net_cls.go
+++ b/libcontainer/cgroups/fs/net_cls.go
@@ -8,6 +8,10 @@ import (
 type NetClsGroup struct {
 }
 
+func (s *NetClsGroup) Name() string {
+	return "net_cls"
+}
+
 func (s *NetClsGroup) Apply(d *data) error {
 	dir, err := d.join("net_cls")
 	if err != nil && !cgroups.IsNotFound(err) {
diff --git a/libcontainer/cgroups/fs/net_prio.go b/libcontainer/cgroups/fs/net_prio.go
index 88f2ea8ba..54edcfc73 100644
--- a/libcontainer/cgroups/fs/net_prio.go
+++ b/libcontainer/cgroups/fs/net_prio.go
@@ -8,6 +8,10 @@ import (
 type NetPrioGroup struct {
 }
 
+func (s *NetPrioGroup) Name() string {
+	return "net_prio"
+}
+
 func (s *NetPrioGroup) Apply(d *data) error {
 	dir, err := d.join("net_prio")
 	if err != nil && !cgroups.IsNotFound(err) {
diff --git a/libcontainer/cgroups/fs/perf_event.go b/libcontainer/cgroups/fs/perf_event.go
index 30be9e568..7bcb8df81 100644
--- a/libcontainer/cgroups/fs/perf_event.go
+++ b/libcontainer/cgroups/fs/perf_event.go
@@ -10,6 +10,10 @@ import (
 type PerfEventGroup struct {
 }
 
+func (s *PerfEventGroup) Name() string {
+	return "perf_event"
+}
+
 func (s *PerfEventGroup) Apply(d *data) error {
 	// we just want to join this group even though we don't set anything
 	if _, err := d.join("perf_event"); err != nil && !cgroups.IsNotFound(err) {