From 4d3ef349fb1f64f6c579e29d24138470703d5432 Mon Sep 17 00:00:00 2001 From: "Tim St. Clair" Date: Mon, 2 May 2016 15:56:49 -0700 Subject: [PATCH] Move utils/machine -> machine --- container/docker/docker.go | 2 +- container/raw/handler.go | 2 +- {utils/machine => machine}/info.go | 0 {utils/machine => machine}/machine.go | 3 +-- {utils/machine => machine}/testdata/cpuinfo | 0 {utils/machine => machine}/topology_test.go | 0 manager/manager.go | 2 +- 7 files changed, 4 insertions(+), 5 deletions(-) rename {utils/machine => machine}/info.go (100%) rename {utils/machine => machine}/machine.go (98%) rename {utils/machine => machine}/testdata/cpuinfo (100%) rename {utils/machine => machine}/topology_test.go (100%) diff --git a/container/docker/docker.go b/container/docker/docker.go index d164c4ba..ae9f1fdf 100644 --- a/container/docker/docker.go +++ b/container/docker/docker.go @@ -24,7 +24,7 @@ import ( "golang.org/x/net/context" "github.com/google/cadvisor/info/v1" - "github.com/google/cadvisor/utils/machine" + "github.com/google/cadvisor/machine" ) func Status() (v1.DockerStatus, error) { diff --git a/container/raw/handler.go b/container/raw/handler.go index 0e55046e..7006a002 100644 --- a/container/raw/handler.go +++ b/container/raw/handler.go @@ -26,7 +26,7 @@ import ( "github.com/google/cadvisor/container/libcontainer" "github.com/google/cadvisor/fs" info "github.com/google/cadvisor/info/v1" - "github.com/google/cadvisor/utils/machine" + "github.com/google/cadvisor/machine" "github.com/golang/glog" "github.com/opencontainers/runc/libcontainer/cgroups" diff --git a/utils/machine/info.go b/machine/info.go similarity index 100% rename from utils/machine/info.go rename to machine/info.go diff --git a/utils/machine/machine.go b/machine/machine.go similarity index 98% rename from utils/machine/machine.go rename to machine/machine.go index e8949e50..7992216d 100644 --- a/utils/machine/machine.go +++ b/machine/machine.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +// The machine package contains functions that extract machine-level specs. package machine import ( @@ -33,8 +34,6 @@ import ( "github.com/golang/glog" ) -// The utils/machine package contains functions that extract machine-level specs. - var ( cpuRegExp = regexp.MustCompile(`^processor\s*:\s*([0-9]+)$`) coreRegExp = regexp.MustCompile(`^core id\s*:\s*([0-9]+)$`) diff --git a/utils/machine/testdata/cpuinfo b/machine/testdata/cpuinfo similarity index 100% rename from utils/machine/testdata/cpuinfo rename to machine/testdata/cpuinfo diff --git a/utils/machine/topology_test.go b/machine/topology_test.go similarity index 100% rename from utils/machine/topology_test.go rename to machine/topology_test.go diff --git a/manager/manager.go b/manager/manager.go index ddebc7a6..def695d5 100644 --- a/manager/manager.go +++ b/manager/manager.go @@ -36,8 +36,8 @@ import ( "github.com/google/cadvisor/fs" info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/info/v2" + "github.com/google/cadvisor/machine" "github.com/google/cadvisor/utils/cpuload" - "github.com/google/cadvisor/utils/machine" "github.com/google/cadvisor/utils/oomparser" "github.com/google/cadvisor/utils/sysfs" "github.com/google/cadvisor/version"