Merge pull request #110 from JasonFengJ9/portjdk11pr53

CRIU update TimerTask.nextExecutionTime with checkpointRestoreTimeDelta

Author: tajila

closed/GensrcJ9JCL.gmk

@@ -52,6 +52,8 @@ $(eval $(call SetupCopyFiles,COPY_OVERLAY_FILES, \
 	DEST := $(SUPPORT_OUTPUTDIR)/overlay, \
 	FILES := \
 		src/java.base/share/classes/java/security/Security.java \
+		src/java.base/share/classes/java/util/Timer.java \
+		src/java.base/share/classes/java/util/TimerTask.java \
 		src/java.base/unix/classes/java/lang/ProcessEnvironment.java \
 	))
 

src/java.base/share/classes/java/util/Timer.java

@@ -23,12 +23,22 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
+ * ===========================================================================
+ */
+
 package java.util;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.lang.ref.Cleaner.Cleanable;
 import jdk.internal.ref.CleanerFactory;
 
+/*[IF CRIU_SUPPORT]*/
+import openj9.internal.criu.InternalCRIUSupport;
+/*[ENDIF] CRIU_SUPPORT*/
+
 /**
  * A facility for threads to schedule tasks for future execution in a
  * background thread.  Tasks may be scheduled for one-time execution, or for
@@ -202,6 +212,12 @@ public Timer(String name, boolean isDaemon) {
     public void schedule(TimerTask task, long delay) {
         if (delay < 0)
             throw new IllegalArgumentException("Negative delay.");
+        /*[IF CRIU_SUPPORT]*/
+        // only tasks scheduled before Checkpoint to be adjusted
+        if (InternalCRIUSupport.getCheckpointRestoreNanoTimeDelta() == 0) {
+            task.criuAdjustRequired = true;
+        }
+        /*[ENDIF] CRIU_SUPPORT*/
         sched(task, System.currentTimeMillis()+delay, 0);
     }
 
@@ -257,6 +273,12 @@ public void schedule(TimerTask task, long delay, long period) {
             throw new IllegalArgumentException("Negative delay.");
         if (period <= 0)
             throw new IllegalArgumentException("Non-positive period.");
+        /*[IF CRIU_SUPPORT]*/
+        // only tasks scheduled before Checkpoint to be adjusted
+        if (InternalCRIUSupport.getCheckpointRestoreNanoTimeDelta() == 0) {
+            task.criuAdjustRequired = true;
+        }
+        /*[ENDIF] CRIU_SUPPORT*/
         sched(task, System.currentTimeMillis()+delay, -period);
     }
 
@@ -337,6 +359,12 @@ public void scheduleAtFixedRate(TimerTask task, long delay, long period) {
             throw new IllegalArgumentException("Negative delay.");
         if (period <= 0)
             throw new IllegalArgumentException("Non-positive period.");
+        /*[IF CRIU_SUPPORT]*/
+        // only tasks scheduled before Checkpoint to be adjusted
+        if (InternalCRIUSupport.getCheckpointRestoreNanoTimeDelta() == 0) {
+            task.criuAdjustRequired = true;
+        }
+        /*[ENDIF] CRIU_SUPPORT*/
         sched(task, System.currentTimeMillis()+delay, period);
     }
 
@@ -547,6 +575,18 @@ private void mainLoop() {
                             continue;  // No action required, poll queue again
                         }
                         currentTime = System.currentTimeMillis();
+                        /*[IF CRIU_SUPPORT]*/
+                        if (task.criuAdjustRequired) {
+                            long checkpointRestoreTimeDelta = InternalCRIUSupport.getCheckpointRestoreNanoTimeDelta();
+                            // A zero checkpointRestoreTimeDelta value indicates no Checkpoint performed yet,
+                            // it can't be negative, otherwise a RestoreException already was thrown.
+                            if (checkpointRestoreTimeDelta > 0) {
+                                task.nextExecutionTime += (checkpointRestoreTimeDelta / 1000000);
+                                // clear the flag - only one time adjustment required
+                                task.criuAdjustRequired = false;
+                            }
+                        }
+                        /*[ENDIF] CRIU_SUPPORT*/
                         executionTime = task.nextExecutionTime;
                         if (taskFired = (executionTime<=currentTime)) {
                             if (task.period == 0) { // Non-repeating, remove

src/java.base/share/classes/java/util/TimerTask.java

@@ -23,6 +23,12 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
+ * ===========================================================================
+ */
+
 package java.util;
 
 /**
@@ -84,6 +90,13 @@ public abstract class TimerTask implements Runnable {
      */
     long period = 0;
 
+    /*[IF CRIU_SUPPORT]*/
+    /**
+     * Determine if the nextExecutionTime is to be adjusted.
+     */
+    boolean criuAdjustRequired;
+    /*[ENDIF] CRIU_SUPPORT*/
+
     /**
      * Creates a new timer task.
      */