svm: readd libcontainer namespace

Author: zapster

substratevm/src/com.oracle.svm.native.libcontainer/src/hotspot/os/linux/cgroupSubsystem_linux.cpp

@@ -44,6 +44,9 @@
 #endif
 
 // controller names have to match the *_IDX indices
+
+namespace svm_container {
+
 static const char* cg_controller_name[] = { "cpuset", "cpu", "cpuacct", "memory", "pids" };
 static inline int cg_v2_controller_index(const char* name) {
   if (strcmp(name, "cpuset") == 0) {
@@ -900,3 +903,6 @@ void CgroupSubsystem::print_version_specific_info(outputStream* st) {
   memory_controller()->controller()->print_version_specific_info(st, phys_mem);
 }
 #endif // !NATIVE_IMAGE
+
+} // namespace svm_container
+

substratevm/src/com.oracle.svm.native.libcontainer/src/hotspot/os/linux/cgroupSubsystem_linux.hpp

@@ -103,6 +103,9 @@
   log_trace(os, container)(log_string " is: %s", retval);                                 \
 }
 
+
+namespace svm_container {
+
 class CgroupController: public CHeapObj<mtInternal> {
   protected:
     char* _cgroup_path;
@@ -361,4 +364,7 @@ class CgroupSubsystemFactory: AllStatic {
     static void cleanup(CgroupInfo* cg_infos);
 };
 
+
+} // namespace svm_container
+
 #endif // CGROUP_SUBSYSTEM_LINUX_HPP

substratevm/src/com.oracle.svm.native.libcontainer/src/hotspot/os/linux/cgroupUtil_linux.cpp

@@ -27,6 +27,9 @@
 #include "os_linux.hpp"
 #include "cgroupUtil_linux.hpp"
 
+
+namespace svm_container {
+
 int CgroupUtil::processor_count(CgroupCpuController* cpu_ctrl, int host_cpus) {
   assert(host_cpus > 0, "physical host cpus must be positive");
   int limit_count = host_cpus;
@@ -175,3 +178,6 @@ void CgroupUtil::adjust_controller(CgroupCpuController* cpu) {
   os::free(orig);
   os::free(limit_cg_path);
 }
+
+} // namespace svm_container
+

substratevm/src/com.oracle.svm.native.libcontainer/src/hotspot/os/linux/cgroupUtil_linux.hpp

@@ -30,6 +30,9 @@
 #include "utilities/globalDefinitions.hpp"
 #include "cgroupSubsystem_linux.hpp"
 
+
+namespace svm_container {
+
 class CgroupUtil: AllStatic {
 
   public:
@@ -42,4 +45,7 @@ class CgroupUtil: AllStatic {
     static void adjust_controller(CgroupCpuController* c);
 };
 
+
+} // namespace svm_container
+
 #endif // CGROUP_UTIL_LINUX_HPP

substratevm/src/com.oracle.svm.native.libcontainer/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp

@@ -80,6 +80,9 @@
  * component is found. The subsystem path will be set to
  * the _mount_point joined with the subgroup path.
  */
+
+namespace svm_container {
+
 void CgroupV1Controller::set_subsystem_path(const char* cgroup_path) {
   if (_cgroup_path != nullptr) {
     os::free(_cgroup_path);
@@ -462,3 +465,6 @@ jlong CgroupV1Subsystem::pids_current() {
   CONTAINER_READ_NUMBER_CHECKED(_pids, "/pids.current", "Current number of tasks", pids_current);
   return (jlong)pids_current;
 }
+
+} // namespace svm_container
+

substratevm/src/com.oracle.svm.native.libcontainer/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp

@@ -33,6 +33,9 @@
 
 // Cgroups version 1 specific implementation
 
+
+namespace svm_container {
+
 class CgroupV1Controller: public CgroupController {
   private:
     /* mountinfo contents */
@@ -210,4 +213,7 @@ class CgroupV1Subsystem: public CgroupSubsystem {
 
 };
 
+
+} // namespace svm_container
+
 #endif // CGROUP_V1_SUBSYSTEM_LINUX_HPP

substratevm/src/com.oracle.svm.native.libcontainer/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp

@@ -28,6 +28,9 @@
 #include "cgroupUtil_linux.hpp"
 
 // Constructor
+
+namespace svm_container {
+
 CgroupV2Controller::CgroupV2Controller(char* mount_path,
                                        char *cgroup_path,
                                        bool ro) :  _read_only(ro),
@@ -375,3 +378,6 @@ jlong CgroupV2Subsystem::pids_current() {
   CONTAINER_READ_NUMBER_CHECKED(unified(), "/pids.current", "Current number of tasks", pids_current);
   return pids_current;
 }
+
+} // namespace svm_container
+

substratevm/src/com.oracle.svm.native.libcontainer/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp

@@ -30,6 +30,9 @@
 #include "cgroupSubsystem_linux.hpp"
 #include "cgroupUtil_linux.hpp"
 
+
+namespace svm_container {
+
 class CgroupV2Controller: public CgroupController {
   private:
     bool _read_only;
@@ -176,4 +179,7 @@ class CgroupV2Subsystem: public CgroupSubsystem {
     CgroupCpuacctController* cpuacct_controller() override { return _cpuacct; };
 };
 
+
+} // namespace svm_container
+
 #endif // CGROUP_V2_SUBSYSTEM_LINUX_HPP

substratevm/src/com.oracle.svm.native.libcontainer/src/hotspot/os/linux/osContainer_linux.cpp

@@ -34,6 +34,9 @@
 #include "cgroupSubsystem_linux.hpp"
 
 
+
+namespace svm_container {
+
 bool  OSContainer::_is_initialized   = false;
 bool  OSContainer::_is_containerized = false;
 CgroupSubsystem* cgroup_subsystem;
@@ -214,3 +217,6 @@ void OSContainer::print_container_helper(outputStream* st, jlong j, const char*
   }
 }
 #endif // !NATIVE_IMAGE
+
+} // namespace svm_container
+

substratevm/src/com.oracle.svm.native.libcontainer/src/hotspot/os/linux/osContainer_linux.hpp

@@ -36,6 +36,9 @@
 // 20ms timeout between re-reads of memory limit and _active_processor_count.
 #define OSCONTAINER_CACHE_TIMEOUT (NANOSECS_PER_SEC/50)
 
+
+namespace svm_container {
+
 class OSContainer: AllStatic {
 
  private:
@@ -83,4 +86,7 @@ inline bool OSContainer::is_containerized() {
   return _is_containerized;
 }
 
+
+} // namespace svm_container
+
 #endif // OS_LINUX_OSCONTAINER_LINUX_HPP