Moved cpu/mem constants from cpushare.cpp/mem.cpp to cpushare.hpp/mem.hpp
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9c94cceb Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9c94cceb Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9c94cceb Branch: refs/heads/master Commit: 9c94cceb654e87e8c487ea19b15206cdeef006c8 Parents: d5f9c58 Author: Yifan Gu <[email protected]> Authored: Mon Jul 7 12:09:57 2014 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Mon Aug 4 15:08:16 2014 -0700 ---------------------------------------------------------------------- src/docker/docker.cpp | 5 +++++ src/slave/containerizer/isolators/cgroups/cpushare.cpp | 6 ------ src/slave/containerizer/isolators/cgroups/cpushare.hpp | 6 ++++++ src/slave/containerizer/isolators/cgroups/mem.cpp | 3 --- src/slave/containerizer/isolators/cgroups/mem.hpp | 3 +++ 5 files changed, 14 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/9c94cceb/src/docker/docker.cpp ---------------------------------------------------------------------- diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp index c46df07..fb7f0e9 100644 --- a/src/docker/docker.cpp +++ b/src/docker/docker.cpp @@ -31,6 +31,11 @@ #include "docker/docker.hpp" +#include "slave/containerizer/isolators/cgroups/cpushare.hpp" +#include "slave/containerizer/isolators/cgroups/mem.hpp" + +using namespace mesos::internal::slave; + using namespace process; using std::list; http://git-wip-us.apache.org/repos/asf/mesos/blob/9c94cceb/src/slave/containerizer/isolators/cgroups/cpushare.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/cgroups/cpushare.cpp b/src/slave/containerizer/isolators/cgroups/cpushare.cpp index 3265a80..b1cad47 100644 --- a/src/slave/containerizer/isolators/cgroups/cpushare.cpp +++ b/src/slave/containerizer/isolators/cgroups/cpushare.cpp @@ -55,12 +55,6 @@ namespace mesos { namespace internal { namespace slave { -// CPU subsystem constants. -const uint64_t CPU_SHARES_PER_CPU = 1024; -const uint64_t MIN_CPU_SHARES = 10; -const Duration CPU_CFS_PERIOD = Milliseconds(100); // Linux default. -const Duration MIN_CPU_CFS_QUOTA = Milliseconds(1); - template<class T> static Future<Option<T> > none() { return None(); } http://git-wip-us.apache.org/repos/asf/mesos/blob/9c94cceb/src/slave/containerizer/isolators/cgroups/cpushare.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/cgroups/cpushare.hpp b/src/slave/containerizer/isolators/cgroups/cpushare.hpp index 780037b..19dde35 100644 --- a/src/slave/containerizer/isolators/cgroups/cpushare.hpp +++ b/src/slave/containerizer/isolators/cgroups/cpushare.hpp @@ -34,6 +34,12 @@ namespace mesos { namespace internal { namespace slave { +// CPU subsystem constants. +const uint64_t CPU_SHARES_PER_CPU = 1024; +const uint64_t MIN_CPU_SHARES = 10; +const Duration CPU_CFS_PERIOD = Milliseconds(100); // Linux default. +const Duration MIN_CPU_CFS_QUOTA = Milliseconds(1); + // Use the Linux cpu cgroup controller for cpu isolation which uses the // Completely Fair Scheduler (CFS). http://git-wip-us.apache.org/repos/asf/mesos/blob/9c94cceb/src/slave/containerizer/isolators/cgroups/mem.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/cgroups/mem.cpp b/src/slave/containerizer/isolators/cgroups/mem.cpp index e8d1e35..e8160ef 100644 --- a/src/slave/containerizer/isolators/cgroups/mem.cpp +++ b/src/slave/containerizer/isolators/cgroups/mem.cpp @@ -55,9 +55,6 @@ namespace mesos { namespace internal { namespace slave { -// Memory subsystem constants. -const Bytes MIN_MEMORY = Megabytes(32); - template<class T> static Future<Option<T> > none() { return None(); } http://git-wip-us.apache.org/repos/asf/mesos/blob/9c94cceb/src/slave/containerizer/isolators/cgroups/mem.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/cgroups/mem.hpp b/src/slave/containerizer/isolators/cgroups/mem.hpp index 8c476c7..6869ed4 100644 --- a/src/slave/containerizer/isolators/cgroups/mem.hpp +++ b/src/slave/containerizer/isolators/cgroups/mem.hpp @@ -38,6 +38,9 @@ namespace mesos { namespace internal { namespace slave { +// Memory subsystem constants. +const Bytes MIN_MEMORY = Megabytes(32); + class CgroupsMemIsolatorProcess : public IsolatorProcess {
