deleted file mode 100644

@@ -1 +0,0 @@

-Michael Crosby <michael@crosbymichael.com> (@crosbymichael)

deleted file mode 100644

@@ -1,106 +0,0 @@

-package cgroups

-

-import (

-	"bufio"

-	"fmt"

-	"github.com/dotcloud/docker/pkg/mount"

-	"io"

-	"io/ioutil"

-	"os"

-	"path/filepath"

-	"strconv"

-	"strings"

-)

-

-type Values struct {

-	Memory     int64 `json:"memory"`

-	MemorySwap int64 `json:"memory_swap"`

-	CpuShares  int64 `json:"cpu_shares"`

-}

-

-// https://www.kernel.org/doc/Documentation/cgroups/cgroups.txt

-func FindCgroupMountpoint(subsystem string) (string, error) {

-	mounts, err := mount.GetMounts()

-	if err != nil {

-		return "", err

-	}

-

-	for _, mount := range mounts {

-		if mount.Fstype == "cgroup" {

-			for _, opt := range strings.Split(mount.VfsOpts, ",") {

-				if opt == subsystem {

-					return mount.Mountpoint, nil

-				}

-			}

-		}

-	}

-

-	return "", fmt.Errorf("cgroup mountpoint not found for %s", subsystem)

-}

-

-// Returns the relative path to the cgroup docker is running in.

-func getThisCgroupDir(subsystem string) (string, error) {

-	f, err := os.Open("/proc/self/cgroup")

-	if err != nil {

-		return "", err

-	}

-	defer f.Close()

-

-	return parseCgroupFile(subsystem, f)

-}

-

-func parseCgroupFile(subsystem string, r io.Reader) (string, error) {

-	s := bufio.NewScanner(r)

-

-	for s.Scan() {

-		if err := s.Err(); err != nil {

-			return "", err

-		}

-		text := s.Text()

-		parts := strings.Split(text, ":")

-		if parts[1] == subsystem {

-			return parts[2], nil

-		}

-	}

-	return "", fmt.Errorf("cgroup '%s' not found in /proc/self/cgroup", subsystem)

-}

-

-// Returns a list of pids for the given container.

-func GetPidsForContainer(id string) ([]int, error) {

-	pids := []int{}

-

-	// memory is chosen randomly, any cgroup used by docker works

-	subsystem := "memory"

-

-	cgroupRoot, err := FindCgroupMountpoint(subsystem)

-	if err != nil {

-		return pids, err

-	}

-

-	cgroupDir, err := getThisCgroupDir(subsystem)

-	if err != nil {

-		return pids, err

-	}

-

-	filename := filepath.Join(cgroupRoot, cgroupDir, id, "tasks")

-	if _, err := os.Stat(filename); os.IsNotExist(err) {

-		// With more recent lxc versions use, cgroup will be in lxc/

-		filename = filepath.Join(cgroupRoot, cgroupDir, "lxc", id, "tasks")

-	}

-

-	output, err := ioutil.ReadFile(filename)

-	if err != nil {

-		return pids, err

-	}

-	for _, p := range strings.Split(string(output), "\n") {

-		if len(p) == 0 {

-			continue

-		}

-		pid, err := strconv.Atoi(p)

-		if err != nil {

-			return pids, fmt.Errorf("Invalid pid '%s': %s", p, err)

-		}

-		pids = append(pids, pid)

-	}

-	return pids, nil

-}

deleted file mode 100644

@@ -1,27 +0,0 @@

-package cgroups

-

-import (

-	"bytes"

-	"testing"

-)

-

-const (

-	cgroupsContents = `11:hugetlb:/

-10:perf_event:/

-9:blkio:/

-8:net_cls:/

-7:freezer:/

-6:devices:/

-5:memory:/

-4:cpuacct,cpu:/

-3:cpuset:/

-2:name=systemd:/user.slice/user-1000.slice/session-16.scope`

-)

-

-func TestParseCgroups(t *testing.T) {

-	r := bytes.NewBuffer([]byte(cgroupsContents))

-	_, err := parseCgroupFile("blkio", r)

-	if err != nil {

-		t.Fatal(err)

-	}

-}

@@ -5,9 +5,9 @@ import (

 	"errors"

 	"fmt"

 	"github.com/dotcloud/docker/archive"

-	"github.com/dotcloud/docker/cgroups"

 	"github.com/dotcloud/docker/execdriver"

 	"github.com/dotcloud/docker/graphdriver"

+	"github.com/dotcloud/docker/pkg/cgroups"

 	"github.com/dotcloud/docker/pkg/mount"

 	"github.com/dotcloud/docker/pkg/term"

 	"github.com/dotcloud/docker/utils"

@@ -2,7 +2,7 @@ package execdriver

 import (

 	"errors"

-	"github.com/dotcloud/docker/cgroups"

+	"github.com/dotcloud/docker/pkg/cgroups"

 	"os/exec"

 	"syscall"

 )

@@ -1,7 +1,7 @@

 package lxc

 import (

-	"github.com/dotcloud/docker/cgroups"

+	"github.com/dotcloud/docker/pkg/cgroups"

 	"strings"

 	"text/template"

 )

@@ -3,8 +3,8 @@ package lxc

 import (

 	"bufio"

 	"fmt"

-	"github.com/dotcloud/docker/cgroups"

 	"github.com/dotcloud/docker/execdriver"

+	"github.com/dotcloud/docker/pkg/cgroups"

 	"io/ioutil"

 	"math/rand"

 	"os"

new file mode 100644

@@ -0,0 +1 @@

+Michael Crosby <michael@crosbymichael.com> (@crosbymichael)

new file mode 100644

@@ -0,0 +1,106 @@

+package cgroups

+

+import (

+	"bufio"

+	"fmt"

+	"github.com/dotcloud/docker/pkg/mount"

+	"io"

+	"io/ioutil"

+	"os"

+	"path/filepath"

+	"strconv"

+	"strings"

+)

+

+type Values struct {

+	Memory     int64 `json:"memory"`

+	MemorySwap int64 `json:"memory_swap"`

+	CpuShares  int64 `json:"cpu_shares"`

+}

+

+// https://www.kernel.org/doc/Documentation/cgroups/cgroups.txt

+func FindCgroupMountpoint(subsystem string) (string, error) {

+	mounts, err := mount.GetMounts()

+	if err != nil {

+		return "", err

+	}

+

+	for _, mount := range mounts {

+		if mount.Fstype == "cgroup" {

+			for _, opt := range strings.Split(mount.VfsOpts, ",") {

+				if opt == subsystem {

+					return mount.Mountpoint, nil

+				}

+			}

+		}

+	}

+

+	return "", fmt.Errorf("cgroup mountpoint not found for %s", subsystem)

+}

+

+// Returns the relative path to the cgroup docker is running in.

+func getThisCgroupDir(subsystem string) (string, error) {

+	f, err := os.Open("/proc/self/cgroup")

+	if err != nil {

+		return "", err

+	}

+	defer f.Close()

+

+	return parseCgroupFile(subsystem, f)

+}

+

+func parseCgroupFile(subsystem string, r io.Reader) (string, error) {

+	s := bufio.NewScanner(r)

+

+	for s.Scan() {

+		if err := s.Err(); err != nil {

+			return "", err

+		}

+		text := s.Text()

+		parts := strings.Split(text, ":")

+		if parts[1] == subsystem {

+			return parts[2], nil

+		}

+	}

+	return "", fmt.Errorf("cgroup '%s' not found in /proc/self/cgroup", subsystem)

+}

+

+// Returns a list of pids for the given container.

+func GetPidsForContainer(id string) ([]int, error) {

+	pids := []int{}

+

+	// memory is chosen randomly, any cgroup used by docker works

+	subsystem := "memory"

+

+	cgroupRoot, err := FindCgroupMountpoint(subsystem)

+	if err != nil {

+		return pids, err

+	}

+

+	cgroupDir, err := getThisCgroupDir(subsystem)

+	if err != nil {

+		return pids, err

+	}

+

+	filename := filepath.Join(cgroupRoot, cgroupDir, id, "tasks")

+	if _, err := os.Stat(filename); os.IsNotExist(err) {

+		// With more recent lxc versions use, cgroup will be in lxc/

+		filename = filepath.Join(cgroupRoot, cgroupDir, "lxc", id, "tasks")

+	}

+

+	output, err := ioutil.ReadFile(filename)

+	if err != nil {

+		return pids, err

+	}

+	for _, p := range strings.Split(string(output), "\n") {

+		if len(p) == 0 {

+			continue

+		}

+		pid, err := strconv.Atoi(p)

+		if err != nil {

+			return pids, fmt.Errorf("Invalid pid '%s': %s", p, err)

+		}

+		pids = append(pids, pid)

+	}

+	return pids, nil

+}

new file mode 100644

@@ -0,0 +1,27 @@

+package cgroups

+

+import (

+	"bytes"

+	"testing"

+)

+

+const (

+	cgroupsContents = `11:hugetlb:/

+10:perf_event:/

+9:blkio:/

+8:net_cls:/

+7:freezer:/

+6:devices:/

+5:memory:/

+4:cpuacct,cpu:/

+3:cpuset:/

+2:name=systemd:/user.slice/user-1000.slice/session-16.scope`

+)

+

+func TestParseCgroups(t *testing.T) {

+	r := bytes.NewBuffer([]byte(cgroupsContents))

+	_, err := parseCgroupFile("blkio", r)

+	if err != nil {

+		t.Fatal(err)

+	}

+}

@@ -1,7 +1,7 @@

 package sysinfo

 import (

-	"github.com/dotcloud/docker/cgroups" // FIXME: move cgroups in pkg

+	"github.com/dotcloud/docker/pkg/cgroups"

 	"io/ioutil"

 	"log"

 	"os"

@@ -6,8 +6,8 @@ import (

 	"fmt"

 	"github.com/dotcloud/docker/archive"

 	"github.com/dotcloud/docker/auth"

-	"github.com/dotcloud/docker/cgroups"

 	"github.com/dotcloud/docker/engine"

+	"github.com/dotcloud/docker/pkg/cgroups"

 	"github.com/dotcloud/docker/pkg/graphdb"

 	"github.com/dotcloud/docker/registry"

 	"github.com/dotcloud/docker/utils"