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

Move cgroups package into libcontainer

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-05-14 15:21:44 -07:00
parent 9133caa6d3
commit b30f280d2f
25 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
cgroups/MAINTAINERS → libcontainer/cgroups/MAINTAINERS
View file

0
cgroups/cgroups.go → libcontainer/cgroups/cgroups.go
View file

0
cgroups/cgroups_test.go → libcontainer/cgroups/cgroups_test.go
View file

2
cgroups/fs/apply_raw.go → libcontainer/cgroups/fs/apply_raw.go
View file

@ -7,7 +7,7 @@ import (
"path/filepath" "path/filepath"
"strconv" "strconv"
"github.com/dotcloud/docker/pkg/cgroups" "github.com/dotcloud/docker/pkg/libcontainer/cgroups"
) )
var ( var (

2
cgroups/fs/blkio.go → libcontainer/cgroups/fs/blkio.go
View file

@ -9,7 +9,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/dotcloud/docker/pkg/cgroups" "github.com/dotcloud/docker/pkg/libcontainer/cgroups"
) )
type blkioGroup struct { type blkioGroup struct {

0
cgroups/fs/blkio_test.go → libcontainer/cgroups/fs/blkio_test.go
View file

0
cgroups/fs/cpu.go → libcontainer/cgroups/fs/cpu.go
View file

0
cgroups/fs/cpu_test.go → libcontainer/cgroups/fs/cpu_test.go
View file

2
cgroups/fs/cpuacct.go → libcontainer/cgroups/fs/cpuacct.go
View file

@ -10,7 +10,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/dotcloud/docker/pkg/cgroups" "github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/dotcloud/docker/pkg/system" "github.com/dotcloud/docker/pkg/system"
) )

0
cgroups/fs/cpuset.go → libcontainer/cgroups/fs/cpuset.go
View file

0
cgroups/fs/devices.go → libcontainer/cgroups/fs/devices.go
View file

2
cgroups/fs/freezer.go → libcontainer/cgroups/fs/freezer.go
View file

@ -8,7 +8,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/dotcloud/docker/pkg/cgroups" "github.com/dotcloud/docker/pkg/libcontainer/cgroups"
) )
type freezerGroup struct { type freezerGroup struct {

0
cgroups/fs/memory.go → libcontainer/cgroups/fs/memory.go
View file

0
cgroups/fs/memory_test.go → libcontainer/cgroups/fs/memory_test.go
View file

2
cgroups/fs/perf_event.go → libcontainer/cgroups/fs/perf_event.go
View file

@ -1,7 +1,7 @@
package fs package fs
import ( import (
"github.com/dotcloud/docker/pkg/cgroups" "github.com/dotcloud/docker/pkg/libcontainer/cgroups"
) )
type perfEventGroup struct { type perfEventGroup struct {

0
cgroups/fs/test_util.go → libcontainer/cgroups/fs/test_util.go
View file

0
cgroups/fs/utils.go → libcontainer/cgroups/fs/utils.go
View file

0
cgroups/fs/utils_test.go → libcontainer/cgroups/fs/utils_test.go
View file

3
cgroups/systemd/apply_nosystemd.go → libcontainer/cgroups/systemd/apply_nosystemd.go
View file

@ -4,7 +4,8 @@ package systemd
import ( import (
"fmt" "fmt"
"github.com/dotcloud/docker/pkg/cgroups"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
) )
func UseSystemd() bool { func UseSystemd() bool {

2
cgroups/systemd/apply_systemd.go → libcontainer/cgroups/systemd/apply_systemd.go
View file

@ -11,7 +11,7 @@ import (
"sync" "sync"
systemd1 "github.com/coreos/go-systemd/dbus" systemd1 "github.com/coreos/go-systemd/dbus"
"github.com/dotcloud/docker/pkg/cgroups" "github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/dotcloud/docker/pkg/systemd" "github.com/dotcloud/docker/pkg/systemd"
"github.com/godbus/dbus" "github.com/godbus/dbus"
) )

0
cgroups/utils.go → libcontainer/cgroups/utils.go
View file

2
libcontainer/container.go
View file

@ -1,7 +1,7 @@
package libcontainer package libcontainer
import ( import (
"github.com/dotcloud/docker/pkg/cgroups" "github.com/dotcloud/docker/pkg/libcontainer/cgroups"
) )
// Context is a generic key value pair that allows // Context is a generic key value pair that allows

6
libcontainer/nsinit/exec.go
View file

@ -7,10 +7,10 @@ import (
"os/exec" "os/exec"
"syscall" "syscall"
"github.com/dotcloud/docker/pkg/cgroups"
"github.com/dotcloud/docker/pkg/cgroups/fs"
"github.com/dotcloud/docker/pkg/cgroups/systemd"
"github.com/dotcloud/docker/pkg/libcontainer" "github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups/fs"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups/systemd"
"github.com/dotcloud/docker/pkg/libcontainer/network" "github.com/dotcloud/docker/pkg/libcontainer/network"
"github.com/dotcloud/docker/pkg/system" "github.com/dotcloud/docker/pkg/system"
) )

2
libcontainer/nsinit/unsupported.go
View file

@ -3,8 +3,8 @@
package nsinit package nsinit
import ( import (
"github.com/dotcloud/docker/pkg/cgroups"
"github.com/dotcloud/docker/pkg/libcontainer" "github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
) )
func Exec(container *libcontainer.Container, term Terminal, rootfs, dataPath string, args []string, createCommand CreateCommand, startCallback func()) (int, error) { func Exec(container *libcontainer.Container, term Terminal, rootfs, dataPath string, args []string, createCommand CreateCommand, startCallback func()) (int, error) {

3
sysinfo/sysinfo.go
View file

@ -1,11 +1,12 @@
package sysinfo package sysinfo
import ( import (
"github.com/dotcloud/docker/pkg/cgroups"
"io/ioutil" "io/ioutil"
"log" "log"
"os" "os"
"path" "path"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
) )
type SysInfo struct { type SysInfo struct {