Support restore with -XX:CRaCRestoreFrom=PATH

Signed-off-by: Jason Feng <[email protected]>

Author: JasonFengJ9

closed/src/java.base/share/native/libjli/criuhelpers.c

@@ -25,6 +25,11 @@
 #include "criuhelpers.h"
 
 #if defined(J9VM_OPT_CRAC_SUPPORT)
+
+#include "java.h"
+#include <ctype.h>
+#include <sys/wait.h>
+
 /**
  * Get the value of a command line option in the array of command line arguments.
  * @param[in] optionName The name of the command line option to search for
@@ -37,7 +42,7 @@ static const char *
 getCommandLineOptionValue(const char *optionName, int argc, char **argv, int *error)
 {
     const char *value = NULL;
-    int i = argc - 1;
+    int i = 0;
     size_t optionNameLength = strlen(optionName);
     *error = -1;
     for (i = argc - 1; i >= 0; i--) {
@@ -85,6 +90,7 @@ getCheckpointDirectory(int argc, char **argv, int *error)
 
 /**
  * Get the log level specified in the command line arguments.
+ * Valid log levels are from 0 to 4, inclusive; the default is 2.
  * @param[in] argc The number of command line arguments
  * @param[in] argv The array of command line arguments
  * @param[in/out] error A pointer to an integer for the error code
@@ -94,8 +100,7 @@ static int
 getLogLevel(int argc, char **argv, int *error)
 {
     int logLevelValue = 2; /* default */
-    const char *logLevelPropertyValue = NULL;
-    logLevelPropertyValue = getCommandLineOptionValue("-Dopenj9.internal.criu.logLevel", argc, argv, error);
+    const char *logLevelPropertyValue = getCommandLineOptionValue("-Dopenj9.internal.criu.logLevel", argc, argv, error);
     if (0 == *error) {
         const char *c = logLevelPropertyValue;
         if (NULL == c) {
@@ -116,7 +121,9 @@ getLogLevel(int argc, char **argv, int *error)
         goto done;
     }
 setLogLevelOptionValueNotValidError:
-    JLI_ReportErrorMessage("The value of the command line option is not valid, option=-Dopenj9.internal.criu.logLevel, value=%s.", logLevelPropertyValue);
+    JLI_ReportErrorMessage(
+            "The option '-Dopenj9.internal.criu.logLevel=%s' is not valid.",
+            logLevelPropertyValue);
     *error = -2;
 done:
     return logLevelValue;
@@ -138,7 +145,9 @@ isUnprivilegedModeOn(int argc, char **argv, int *error)
         if (NULL == unprivilegedModePropertyValue) {
             isUnprivilegedModeOn = JNI_TRUE;
         } else {
-            JLI_ReportErrorMessage("The value of the command line option is not expected, option=-Dopenj9.internal.criu.unprivilegedMode, value=%s.", unprivilegedModePropertyValue);
+            JLI_ReportErrorMessage(
+                    "The option '-Dopenj9.internal.criu.unprivilegedMode=%s' does not accept a value.",
+                    unprivilegedModePropertyValue);
             *error = -2;
         }
     }
@@ -161,7 +170,7 @@ getLogFile(int argc, char **argv, int *error)
         if (NULL != logFilePropertyValue) {
             logFile = logFilePropertyValue;
         } else {
-            JLI_ReportErrorMessage("The value of the command line option -Dopenj9.internal.criu.logFile was not found.");
+            JLI_ReportErrorMessage("The option -Dopenj9.internal.criu.logFile requires a value.");
             *error = -2;
         }
     }
@@ -179,7 +188,6 @@ getLogFile(int argc, char **argv, int *error)
 static int
 restoreFromCheckpoint(const char *checkpointDirectory, int logLevel, jboolean unprivilegedModeOn, const char *logFile)
 {
-    int restoreStatus = 0;
     int length = -1;
     char logLevelOption[4] = { 0 };
     char *logFileOption = NULL;
@@ -189,48 +197,34 @@ restoreFromCheckpoint(const char *checkpointDirectory, int logLevel, jboolean un
     argv[argc++] = "restore";
     argv[argc++] = "-D";
     argv[argc++] = checkpointDirectory;
-    length = snprintf(NULL, 0, "-v%d", logLevel);
-    if (length < 0) {
-        JLI_ReportErrorMessage("Failed to calculate the length of option '-v%d'.", logLevel);
-        restoreStatus = -1;
-        goto done;
-    }
-    if (snprintf(logLevelOption, sizeof(logLevelOption), "-v%d", logLevel) < 0) {
-        JLI_ReportErrorMessage("Failed to format the log level option '-v%d'.", logLevel);
-        restoreStatus = -1;
-        goto done;
-    }
+    /* The log level is a single digit. */
+    snprintf(logLevelOption, sizeof(logLevelOption), "-v%d", logLevel);
     argv[argc++] = logLevelOption;
     argv[argc++] = "--shell-job";
     if (unprivilegedModeOn) {
         argv[argc++] = "--unprivileged";
     }
     if (NULL != logFile) {
         length = strlen(logFile) + sizeof("--log-file=%s") - 1;
-        logFileOption = (char *)JLI_MemAlloc(length - 1);
+        logFileOption = (char *)JLI_MemAlloc(length + 1);
         if (NULL == logFileOption) {
             JLI_ReportErrorMessage("Failed to allocate memory for option '--log-file=%s'.", logFile);
-            restoreStatus = -1;
-            goto done;
+            goto fail;
         }
-        if (snprintf(logFileOption, length - 1, "--log-file=%s", logFile) < 0) {
+        if (snprintf(logFileOption, length + 1, "--log-file=%s", logFile) < 0) {
             JLI_ReportErrorMessage("Failed to format option '--log-file=%s'.", logFile);
-            restoreStatus = -1;
-            goto done;
+            goto fail;
         }
         argv[argc++] = logFileOption;
     }
     argv[argc] = NULL;
     execvp(argv[0], (char * const *)argv);
     /* If execvp returns, there was an error. */
-    restoreStatus = -1;
-freeLogFileOption:
+fail:
     if (NULL != logFileOption) {
         JLI_MemFree((void *)logFileOption);
-        logFileOption = NULL;
     }
-done:
-    return restoreStatus;
+    return -1;
 }
 
 /**
@@ -252,12 +246,12 @@ handleCRaCRestore(int argc, char **argv)
     int childProcessPidStatus = 0;
     int childProcessPidExitStatus = 0;
     checkpointDirectory = getCheckpointDirectory(argc, argv, &error);
-    /* We ignore restore if the restore option -XX:CRaCRestoreFrom is not specified. */
     if (-1 == error) {
+        /* Option -XX:CRaCRestoreFrom not specified. */
         return;
     }
     if (-2 == error) {
-        JLI_ReportErrorMessage("Failed to get the CRIU checkpoint directory, error=%d.", error);
+        JLI_ReportErrorMessage("Failed to get the CRIU checkpoint directory.");
         parentProcessExitStatus = EXIT_FAILURE;
         goto doneParentProcess;
     }
@@ -269,19 +263,19 @@ handleCRaCRestore(int argc, char **argv)
     if (0 == childProcessPid) {
         logLevel = getLogLevel(argc, argv, &error);
         if (-2 == error) {
-            JLI_ReportErrorMessage("Failed to get the CRIU log level, error=%d.", error);
+            JLI_ReportErrorMessage("Failed to get the CRIU log level.");
             childProcessExitStatus = EXIT_FAILURE;
             goto doneChildProcess;
         }
         unprivilegedModeOn = isUnprivilegedModeOn(argc, argv, &error);
         if (-2 == error) {
-            JLI_ReportErrorMessage("Failed to get the CRIU unprivileged mode, error=%d.", error);
+            JLI_ReportErrorMessage("Failed to get the CRIU unprivileged mode.");
             childProcessExitStatus = EXIT_FAILURE;
             goto doneChildProcess;
         }
         logFile = getLogFile(argc, argv, &error);
         if (-2 == error) {
-            JLI_ReportErrorMessage("Failed to get the CRIU log file, error=%d.", error);
+            JLI_ReportErrorMessage("Failed to get the CRIU log file.");
             childProcessExitStatus = EXIT_FAILURE;
             goto doneChildProcess;
         }

closed/src/java.base/share/native/libjli/criuhelpers.h

@@ -25,14 +25,10 @@
 #ifndef CRIUHELPERS_H
 #define CRIUHELPERS_H
 
-#include "java.h"
 #include "j9cfg.h"
 
 #if defined(J9VM_OPT_CRAC_SUPPORT)
-#include <ctype.h>
-#include <sys/wait.h>
-void
-handleCRaCRestore(int argc, char **argv);
+void handleCRaCRestore(int argc, char **argv);
 #endif /* defined(J9VM_OPT_CRAC_SUPPORT) */
 
 #endif /* CRIUHELPERS_H */

src/java.base/share/native/libjli/java.c

@@ -567,12 +567,12 @@ JavaMain(void* _args)
     jfieldID noArgMainField;
     jboolean noArgMain;
 
-    RegisterThread();
-
 #if defined(J9VM_OPT_CRAC_SUPPORT)
     handleCRaCRestore(argc, argv);
 #endif /* defined(J9VM_OPT_CRAC_SUPPORT) */
 
+    RegisterThread();
+
     /* Initialize the virtual machine */
     start = CurrentTimeMicros();
     if (!InitializeJVM(&vm, &env, &ifn)) {