8299419: Thread.sleep(millis) may throw OOME

Reviewed-by: alanb

Author: Viktor Klang

src/java.base/share/classes/java/lang/Thread.java

@@ -457,19 +457,20 @@ public static void yield() {
      * Called before sleeping to create a jdk.ThreadSleep event.
      */
     private static ThreadSleepEvent beforeSleep(long nanos) {
-        ThreadSleepEvent event = null;
-        if (ThreadSleepEvent.isTurnedOn()) {
-            try {
-                event = new ThreadSleepEvent();
+        try {
+            ThreadSleepEvent event = new ThreadSleepEvent();
+            if (event.isEnabled()) {
                 event.time = nanos;
                 event.begin();
-            } catch (OutOfMemoryError e) {
-                event = null;
+                return event;
             }
+        } catch (OutOfMemoryError e) {
+            // ignore
         }
-        return event;
+        return null;
     }
 
+
     /**
      * Called after sleeping to commit the jdk.ThreadSleep event.
      */

src/java.base/share/classes/jdk/internal/event/ThreadSleepEvent.java

@@ -30,14 +30,5 @@
  */
 
 public final class ThreadSleepEvent extends Event {
-    private static final ThreadSleepEvent EVENT = new ThreadSleepEvent();
-
-    /**
-     * Returns {@code true} if event is enabled, {@code false} otherwise.
-     */
-    public static boolean isTurnedOn() {
-        return EVENT.isEnabled();
-    }
-
     public long time;
 }

test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/ThreadController.java

@@ -665,7 +665,6 @@ public SleepingThread(ThreadController controller, String name, Log log, Threads
         // jdk.internal.event.ThreadSleepEvent not accessible
         expectedMethods.add("jdk.internal.event.ThreadSleepEvent.<clinit>");
         expectedMethods.add("jdk.internal.event.ThreadSleepEvent.isEnabled");
-        expectedMethods.add("jdk.internal.event.ThreadSleepEvent.isTurnedOn");
         expectedMethods.add(SleepingThread.class.getName() + ".run");
 
         switch (controller.invocationType) {

test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/SleepingThread.java

@@ -42,7 +42,6 @@ public class SleepingThread extends RecursiveMonitoringThread {
                 "java.lang.Thread.afterSleep",
                 "java.util.concurrent.TimeUnit.toNanos",
                 "jdk.internal.event.ThreadSleepEvent.<clinit>",
-                "jdk.internal.event.ThreadSleepEvent.isTurnedOn",
                 "jdk.internal.event.ThreadSleepEvent.isEnabled",
                 "nsk.monitoring.share.thread.SleepingThread.runInside"
         };

test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace001.java

@@ -151,7 +151,6 @@ private static boolean fillTrace() {
                 "java.util.concurrent.TimeUnit.toNanos",
                 "jdk.internal.event.ThreadSleepEvent.<clinit>",
                 "jdk.internal.event.ThreadSleepEvent.<init>",
-                "jdk.internal.event.ThreadSleepEvent.isTurnedOn",
                 "jdk.internal.event.ThreadSleepEvent.isEnabled"
         };