jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cgroupv2/systemd: privatize UnifiedManager 

... and its Cgroup field. There is no sense to keep it public.

This was generated by gorename.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2020-04-05 19:06:25 -07:00
parent 88c13c0713
commit dbeff89491
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libcontainer/cgroups/systemd/unified_hierarchy.go
View File

@ -20,25 +20,25 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
type UnifiedManager struct { type unifiedManager struct {
mu sync.Mutex mu sync.Mutex
Cgroups *configs.Cgroup cgroups *configs.Cgroup
// path is like "/sys/fs/cgroup/user.slice/user-1001.slice/session-1.scope" // path is like "/sys/fs/cgroup/user.slice/user-1001.slice/session-1.scope"
path string path string
rootless bool rootless bool
} }
func NewUnifiedManager(config *configs.Cgroup, path string, rootless bool) *UnifiedManager { func NewUnifiedManager(config *configs.Cgroup, path string, rootless bool) *unifiedManager {
return &UnifiedManager{ return &unifiedManager{
Cgroups: config, cgroups: config,
path: path, path: path,
rootless: rootless, rootless: rootless,
} }
} }
func (m *UnifiedManager) Apply(pid int) error { func (m *unifiedManager) Apply(pid int) error {
var ( var (
c = m.Cgroups c = m.cgroups
unitName = getUnitName(c) unitName = getUnitName(c)
slice = "system.slice" slice = "system.slice"
properties []systemdDbus.Property properties []systemdDbus.Property
@ -159,8 +159,8 @@ func (m *UnifiedManager) Apply(pid int) error {
return nil return nil
} }
func (m *UnifiedManager) Destroy() error { func (m *unifiedManager) Destroy() error {
if m.Cgroups.Paths != nil { if m.cgroups.Paths != nil {
return nil return nil
} }
m.mu.Lock() m.mu.Lock()
@ -170,7 +170,7 @@ func (m *UnifiedManager) Destroy() error {
if err != nil { if err != nil {
return err return err
} }
dbusConnection.StopUnit(getUnitName(m.Cgroups), "replace", nil) dbusConnection.StopUnit(getUnitName(m.cgroups), "replace", nil)
// XXX this is probably not needed, systemd should handle it // XXX this is probably not needed, systemd should handle it
err = os.Remove(m.path) err = os.Remove(m.path)
@ -182,7 +182,7 @@ func (m *UnifiedManager) Destroy() error {
} }
// this method is for v1 backward compatibility and will be removed // this method is for v1 backward compatibility and will be removed
func (m *UnifiedManager) GetPaths() map[string]string { func (m *unifiedManager) GetPaths() map[string]string {
_, _ = m.GetUnifiedPath() _, _ = m.GetUnifiedPath()
paths := map[string]string{ paths := map[string]string{
"pids": m.path, "pids": m.path,
@ -196,14 +196,14 @@ func (m *UnifiedManager) GetPaths() map[string]string {
return paths return paths
} }
func (m *UnifiedManager) GetUnifiedPath() (string, error) { func (m *unifiedManager) GetUnifiedPath() (string, error) {
m.mu.Lock() m.mu.Lock()
defer m.mu.Unlock() defer m.mu.Unlock()
if m.path != "" { if m.path != "" {
return m.path, nil return m.path, nil
} }
c := m.Cgroups c := m.cgroups
slice := "system.slice" slice := "system.slice"
if c.Parent != "" { if c.Parent != "" {
slice = c.Parent slice = c.Parent
@ -261,15 +261,15 @@ func createCgroupsv2Path(path string) (Err error) {
return nil return nil
} }
func (m *UnifiedManager) fsManager() (cgroups.Manager, error) { func (m *unifiedManager) fsManager() (cgroups.Manager, error) {
path, err := m.GetUnifiedPath() path, err := m.GetUnifiedPath()
if err != nil { if err != nil {
return nil, err return nil, err
} }
return fs2.NewManager(m.Cgroups, path, m.rootless) return fs2.NewManager(m.cgroups, path, m.rootless)
} }
func (m *UnifiedManager) Freeze(state configs.FreezerState) error { func (m *unifiedManager) Freeze(state configs.FreezerState) error {
fsMgr, err := m.fsManager() fsMgr, err := m.fsManager()
if err != nil { if err != nil {
return err return err
@ -277,7 +277,7 @@ func (m *UnifiedManager) Freeze(state configs.FreezerState) error {
return fsMgr.Freeze(state) return fsMgr.Freeze(state)
} }
func (m *UnifiedManager) GetPids() ([]int, error) { func (m *unifiedManager) GetPids() ([]int, error) {
path, err := m.GetUnifiedPath() path, err := m.GetUnifiedPath()
if err != nil { if err != nil {
return nil, err return nil, err
@ -285,7 +285,7 @@ func (m *UnifiedManager) GetPids() ([]int, error) {
return cgroups.GetPids(path) return cgroups.GetPids(path)
} }
func (m *UnifiedManager) GetAllPids() ([]int, error) { func (m *unifiedManager) GetAllPids() ([]int, error) {
path, err := m.GetUnifiedPath() path, err := m.GetUnifiedPath()
if err != nil { if err != nil {
return nil, err return nil, err
@ -293,7 +293,7 @@ func (m *UnifiedManager) GetAllPids() ([]int, error) {
return cgroups.GetAllPids(path) return cgroups.GetAllPids(path)
} }
func (m *UnifiedManager) GetStats() (*cgroups.Stats, error) { func (m *unifiedManager) GetStats() (*cgroups.Stats, error) {
fsMgr, err := m.fsManager() fsMgr, err := m.fsManager()
if err != nil { if err != nil {
return nil, err return nil, err
@ -301,7 +301,7 @@ func (m *UnifiedManager) GetStats() (*cgroups.Stats, error) {
return fsMgr.GetStats() return fsMgr.GetStats()
} }
func (m *UnifiedManager) Set(container *configs.Config) error { func (m *unifiedManager) Set(container *configs.Config) error {
fsMgr, err := m.fsManager() fsMgr, err := m.fsManager()
if err != nil { if err != nil {
return err return err
@ -309,6 +309,6 @@ func (m *UnifiedManager) Set(container *configs.Config) error {
return fsMgr.Set(container) return fsMgr.Set(container)
} }
func (m *UnifiedManager) GetCgroups() (*configs.Cgroup, error) { func (m *unifiedManager) GetCgroups() (*configs.Cgroup, error) {
return m.Cgroups, nil return m.cgroups, nil
} }