vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Fix compile and unit test errors after merge

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-03-27 08:25:01 +00:00
parent 42be9fb9d2
commit ffa86e398a
2 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cgroups/apply_raw.go
View file

@ -49,6 +49,9 @@ func rawApply(c *Cgroup, pid int) (ActiveCgroup, error) {
if err := raw.setupCpu(c, pid); err != nil { if err := raw.setupCpu(c, pid); err != nil {
return nil, err return nil, err
} }
if err := raw.setupCpuset(c, pid); err != nil {
return nil, err
}
return raw, nil return raw, nil
} }
@ -170,6 +173,25 @@ func (raw *rawCgroup) setupCpu(c *Cgroup, pid int) (err error) {
return nil return nil
} }
func (raw *rawCgroup) setupCpuset(c *Cgroup, pid int) (err error) {
if c.CpusetCpus != "" {
dir, err := raw.join("cpuset", pid)
if err != nil {
return err
}
defer func() {
if err != nil {
os.RemoveAll(dir)
}
}()
if err := writeFile(dir, "cpuset.cpus", c.CpusetCpus); err != nil {
return err
}
}
return nil
}
func (raw *rawCgroup) Cleanup() error { func (raw *rawCgroup) Cleanup() error {
get := func(subsystem string) string { get := func(subsystem string) string {
path, _ := raw.path(subsystem) path, _ := raw.path(subsystem)
@ -180,6 +202,7 @@ func (raw *rawCgroup) Cleanup() error {
get("memory"), get("memory"),
get("devices"), get("devices"),
get("cpu"), get("cpu"),
get("cpuset"),
} { } {
if path != "" { if path != "" {
os.RemoveAll(path) os.RemoveAll(path)

19
cgroups/cgroups.go
View file

@ -101,22 +101,3 @@ func (c *Cgroup) Apply(pid int) (ActiveCgroup, error) {
return rawApply(c, pid) return rawApply(c, pid)
} }
} }
func (c *Cgroup) setupCpuset(cgroupRoot string, pid int) (err error) {
if c.CpusetCpus != "" {
dir, err := c.Join(cgroupRoot, "cpuset", pid)
if err != nil {
return err
}
defer func() {
if err != nil {
os.RemoveAll(dir)
}
}()
if err := writeFile(dir, "cpuset.cpus", c.CpusetCpus); err != nil {
return err
}
}
return nil
}