Revert "Add systemd slice framework"

This reverts commit d5b07b9.

Author: jerboaa

src/hotspot/share/prims/whitebox.cpp

@@ -158,13 +158,6 @@ class VM_WhiteBoxOperation : public VM_Operation {
   bool allow_nested_vm_operations() const        { return true; }
 };
 
-#ifdef LINUX
-class Whitebox_Linux : public os::Linux {
- public:
-  static int host_cpus() { return os::Linux::active_processor_count(); }
-};
-#endif
-
 
 WB_ENTRY(jlong, WB_GetObjectAddress(JNIEnv* env, jobject o, jobject obj))
   return (jlong)(void*)JNIHandles::resolve(obj);
@@ -2495,12 +2488,6 @@ WB_ENTRY(jint, WB_ValidateCgroup(JNIEnv* env,
   return ret;
 WB_END
 
-// Physical cpus of the host machine (including containers), Linux only.
-WB_ENTRY(jint, WB_HostCPUs(JNIEnv* env, jobject o))
-  LINUX_ONLY(return Whitebox_Linux::host_cpus();)
-  return -1; // Not used/implemented on other platforms
-WB_END
-
 WB_ENTRY(void, WB_PrintOsInfo(JNIEnv* env, jobject o))
   os::print_os_info(tty);
 WB_END
@@ -2942,7 +2929,6 @@ static JNINativeMethod methods[] = {
                                                       (void*)&WB_ValidateCgroup },
   {CC"hostPhysicalMemory",        CC"()J",            (void*)&WB_HostPhysicalMemory },
   {CC"hostPhysicalSwap",          CC"()J",            (void*)&WB_HostPhysicalSwap },
-  {CC"hostCPUs",                  CC"()I",            (void*)&WB_HostCPUs },
   {CC"printOsInfo",               CC"()V",            (void*)&WB_PrintOsInfo },
   {CC"disableElfSectionCache",    CC"()V",            (void*)&WB_DisableElfSectionCache },
   {CC"resolvedMethodItemsCount",  CC"()J",            (void*)&WB_ResolvedMethodItemsCount },

test/hotspot/jtreg/ProblemList.txt

@@ -118,7 +118,6 @@ applications/jcstress/copy.java 8229852 linux-all
 containers/docker/TestJcmd.java 8278102 linux-all
 containers/docker/TestMemoryAwareness.java 8303470 linux-all
 containers/docker/TestJFREvents.java 8327723 linux-x64
-containers/systemd/SystemdMemoryAwarenessTest.java 8322420 linux-all
 
 #############################################################################
 

test/hotspot/jtreg/TEST.ROOT

@@ -87,7 +87,6 @@ requires.properties= \
     vm.musl \
     vm.flagless \
     docker.support \
-    systemd.support \
     jdk.containerized
 
 # Minimum jtreg version

test/hotspot/jtreg/containers/systemd/HelloSystemd.java

@@ -101,7 +101,6 @@ requires.properties= \
     vm.jvmti \
     vm.cpu.features \
     docker.support \
-    systemd.support \
     release.implementor \
     jdk.containerized \
     jdk.foreign.linker

test/hotspot/jtreg/containers/systemd/SystemdMemoryAwarenessTest.java

@@ -133,7 +133,6 @@ public Map<String, String> call() {
         map.put("vm.compiler1.enabled", this::isCompiler1Enabled);
         map.put("vm.compiler2.enabled", this::isCompiler2Enabled);
         map.put("docker.support", this::dockerSupport);
-        map.put("systemd.support", this::systemdSupport);
         map.put("vm.musl", this::isMusl);
         map.put("release.implementor", this::implementor);
         map.put("jdk.containerized", this::jdkContainerized);
@@ -611,7 +610,7 @@ protected String dockerSupport() {
 
         if (isSupported) {
            try {
-              isSupported = checkProgramSupport("checkDockerSupport()", Container.ENGINE_COMMAND);
+              isSupported = checkDockerSupport();
            } catch (Exception e) {
               isSupported = false;
            }
@@ -621,27 +620,6 @@ protected String dockerSupport() {
         return "" + isSupported;
     }
 
-    /**
-     * A simple check for systemd support
-     *
-     * @return true if systemd is supported in a given environment
-     */
-    protected String systemdSupport() {
-        log("Entering systemdSupport()");
-
-        boolean isSupported = Platform.isLinux();
-        if (isSupported) {
-           try {
-              isSupported = checkProgramSupport("checkSystemdSupport()", "systemd-run");
-           } catch (Exception e) {
-              isSupported = false;
-           }
-         }
-
-        log("systemdSupport(): returning isSupported = " + isSupported);
-        return "" + isSupported;
-    }
-
     // Configures process builder to redirect process stdout and stderr to a file.
     // Returns file names for stdout and stderr.
     private Map<String, String> redirectOutputToLogFile(String msg, ProcessBuilder pb, String fileNameBase) {
@@ -676,17 +654,17 @@ private void printLogfileContent(Map<String, String> logFileNames) {
                 });
     }
 
-    private boolean checkProgramSupport(String logString, String cmd) throws IOException, InterruptedException {
-        log(logString + ": entering");
-        ProcessBuilder pb = new ProcessBuilder("which", cmd);
+    private boolean checkDockerSupport() throws IOException, InterruptedException {
+        log("checkDockerSupport(): entering");
+        ProcessBuilder pb = new ProcessBuilder("which", Container.ENGINE_COMMAND);
         Map<String, String> logFileNames =
-            redirectOutputToLogFile(logString + ": which " + cmd,
-                                                      pb, "which-cmd");
+            redirectOutputToLogFile("checkDockerSupport(): which " + Container.ENGINE_COMMAND,
+                                                      pb, "which-container");
         Process p = pb.start();
         p.waitFor(10, TimeUnit.SECONDS);
         int exitValue = p.exitValue();
 
-        log(String.format("%s: exitValue = %s, pid = %s", logString, exitValue, p.pid()));
+        log(String.format("checkDockerSupport(): exitValue = %s, pid = %s", exitValue, p.pid()));
         if (exitValue != 0) {
             printLogfileContent(logFileNames);
         }