diff --git a/utils/common/cgroupconfigurator.cpp b/utils/common/cgroupconfigurator.cpp index 4437d05c8..c950c99ae 100644 --- a/utils/common/cgroupconfigurator.cpp +++ b/utils/common/cgroupconfigurator.cpp @@ -78,21 +78,12 @@ CGroupConfigurator::CGroupConfigurator() cGroupDefined = false; else cGroupDefined = true; - cout << __func__ << " cGroupDefined (from getConfig)" << cGroupDefined << endl; + ifstream v2Check("/sys/fs/cgroup/cgroup.controllers"); cGroupVersion_ = (v2Check) ? v2 : v1; - string cGroupVersion_str=""; - switch(cGroupVersion_){ - case v1: - cGroupVersion_str="v1"; - break; - case v2: - cGroupVersion_str="v2"; - break; - } - cout << __func__<< " cGroupVersion_str " << cGroupVersion_str << endl; + } CGroupConfigurator::~CGroupConfigurator() @@ -200,17 +191,19 @@ uint64_t CGroupConfigurator::getTotalMemory() if (totalMemory != 0) return totalMemory; + cout << __func__ << " cGroupDefined (from getConfig) " << cGroupDefined << endl; if (!cGroupDefined) ret = getTotalMemoryFromProc(); else { + cout << __func__ << " cGroupVersion " << ((cGroupVersion_ == v2) ? std::string("v2") : std::string("v1")) << endl; ret = getTotalMemoryFromCGroup(); if (ret == 0 || ret == std::numeric_limits::max()) ret = getTotalMemoryFromProc(); } - cout <<__func__ << " Total mem available (bytes) " << ret << " (GIB) " << ret/GIB << endl; + cout << __func__ << " Total mem available (bytes) " << ret << " (GIB) " << ret/GIB << endl; totalMemory = ret; return totalMemory; }