JBR-8276: fixed CPlaformWindow.flushBuffers() to use LWCTooolkit.invokeAndWait() discarded when CGDisplayRegisterReconfigurationCallback() is in progress (ThreadUtilities.blockingThread + removed isWithinPowerTransition code)

- fixed CVDisplayLink management on wake-ups/sleep and display reconfiguration
- restored opengl changes

Author: bourgesl

src/java.desktop/macosx/classes/sun/awt/CGraphicsEnvironment.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,7 @@
 
 import sun.java2d.MacOSFlags;
 import sun.java2d.SunGraphicsEnvironment;
+import sun.java2d.metal.MTLGraphicsConfig;
 import sun.util.logging.PlatformLogger;
 
 /**
@@ -152,7 +153,7 @@ public CGraphicsEnvironment() {
         }
 
         /* Populate the device table */
-        rebuildDevices();
+        initDevices();
 
         if (LogDisplay.ENABLED) {
             for (CGraphicsDevice gd : devices.values()) {
@@ -171,11 +172,7 @@ public static String getMtlShadersLibPath() {
         return mtlShadersLib;
     }
 
-    /**
-     * Updates the list of devices and notify listeners.
-     */
-    private void rebuildDevices() {
-        initDevices();
+    private void doNotifyListeners() {
         // Do not notify devices, this was already done in initDevices.
         displayChanger.notifyListeners();
     }
@@ -184,7 +181,7 @@ private void rebuildDevices() {
      * Called by the CoreGraphics Display Reconfiguration Callback.
      *
      * @param displayId CoreGraphics displayId
-     * @param removed   true if displayId was removed, false otherwise.
+     * @param flags CGDisplayChangeSummaryFlags flags as integer
      */
     void _displayReconfiguration(int displayId, int flags) {
         // See CGDisplayChangeSummaryFlags
@@ -200,13 +197,35 @@ void _displayReconfiguration(int displayId, int flags) {
         // monitors are not added nor removed, but when the video card is
         // switched to/from the discrete video card, so we should try to map the
         // old to the new devices.
-        rebuildDevices();
+        initDevices();
         if (log != null && log != LogDisplay.REMOVED) {
             CGraphicsDevice gd = devices.get(displayId);
             log.log(displayId, gd != null ? gd.getBounds() : "UNKNOWN", gd != null ? gd.getScaleFactor() : Double.NaN);
         }
     }
 
+    /**
+     * Called by the CoreGraphics Display Reconfiguration Callback (once all displays processed = finished)
+     */
+    void _displayReconfigurationFinished() {
+        if (logger.isLoggable(PlatformLogger.Level.FINE)) {
+            logger.fine("CGraphicsEnvironment._displayReconfigurationFinished(): enter");
+        }
+        try {
+            doNotifyListeners();
+        } catch (Exception e) {
+            logger.severe("CGraphicsEnvironment._displayReconfigurationFinished: exception occurred: ", e);
+        } finally {
+            // notify the metal pipeline after processing listeners:
+            if (CGraphicsEnvironment.usingMetalPipeline()) {
+                MTLGraphicsConfig.displayReconfigurationDone();
+            }
+        }
+        if (logger.isLoggable(PlatformLogger.Level.FINE)) {
+            logger.fine("_displayReconfigurationFinished(): exit");
+        }
+    }
+
     @Override
     @SuppressWarnings("removal")
     protected void finalize() throws Throwable {

src/java.desktop/macosx/classes/sun/java2d/metal/MTLGraphicsConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,6 +82,8 @@ public final class MTLGraphicsConfig extends CGraphicsConfig
     private final Object disposerReferent = new Object();
     private final int maxTextureSize;
 
+    public static native void displayReconfigurationDone();
+
     private static native long getMTLConfigInfo(int displayID, String mtlShadersLib);
 
     /**

src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java

@@ -1224,8 +1224,8 @@ private static int getInvokeLaterMode() {
         final String invokeLaterArg = System.getProperty(invokeLaterKey);
         final int result;
         if (invokeLaterArg == null) {
-            // default = 'enabled' to avoid any potential freeze (safe) until better solution:
-            result = INVOKE_LATER_ENABLED;
+            // default = 'false':
+            result = INVOKE_LATER_DISABLED;
         } else {
             switch (invokeLaterArg.toLowerCase()) {
                 default:
@@ -1247,51 +1247,46 @@ private static int getInvokeLaterMode() {
         return result;
     }
 
-    @SuppressWarnings("removal")
-    private final static boolean INVOKE_LATER_USE_PWM = getInvokeLaterUsePWM();
-
-    private static boolean getInvokeLaterUsePWM() {
-        final String usePwmKey = "awt.mac.flushBuffers.pwm";
-        final String usePwmArg = System.getProperty(usePwmKey);
-        final boolean result;
-        if (usePwmArg == null) {
-            // default = 'false':
-            result = false;
-        } else {
-            result = "true".equalsIgnoreCase(usePwmArg);
-            logger.info("CPlatformWindow: property \"{0}={1}\", using usePWM={2}.",
-                    usePwmKey, usePwmArg, result);
-        }
-        return result;
-    }
-
+    private final static long NANOS_PER_SEC = 1000000000L;
     /* 10s period arround reference times (sleep/wake-up...)
      * to ensure all displays are awaken properly */
-    private final static long NANOS_PER_SEC = 1000000000L;
     private final static long STATE_CHANGE_PERIOD = 10L * NANOS_PER_SEC;
 
     private final AtomicBoolean mirroringState = new AtomicBoolean(false);
     /** per window timestamp of disabling mirroring */
     private final AtomicLong mirroringDisablingTime = new AtomicLong(0L);
 
     // Specific class needed to get obvious stack traces:
-    private final class EmptyRunnable implements Runnable {
+    private final static class EmptyRunnable implements Runnable {
+
+        private final String identifier;
+
+        EmptyRunnable(final String identifier) {
+            this.identifier = identifier;
+        }
+
         @Override
         public void run() {
             // Posting an empty to flush the EventQueue without blocking the main thread
             if (logger.isLoggable(PlatformLogger.Level.FINE)) {
-                logger.fine("CPlatformWindow.flushBuffers: run() invoked on {0}",
-                        getIdentifier(target));
+                logger.fine("CPlatformWindow.flushBuffers: run() invoked on target: {0}", identifier);
             }
         }
     };
-    private final EmptyRunnable emptyTask = new EmptyRunnable();
 
     void flushBuffers() {
         // Only 1 usage by deliverMoveResizeEvent():
         //                          System-dependent appearance optimization.
         //                          May be blocking so postpone this event processing:
 
+        // Test only to validate LWCToolkit self-defense against freezes:
+        final boolean checkLWCToolkitBlockingMainGuard = false;
+
+        if (!checkLWCToolkitBlockingMainGuard && LWCToolkit.isBlockingMainThread()) {
+            logger.fine("Blocked main thread, skip flushBuffers().");
+            return;
+        }
+
         if (isVisible() && !nativeBounds.isEmpty() && !isFullScreenMode) {
             // use the system property 'awt.mac.flushBuffers.invokeLater' to true/auto (default: auto)
             // to avoid deadlocks caused by the LWCToolkit.invokeAndWait() call below:
@@ -1307,7 +1302,6 @@ void flushBuffers() {
 
                     // JBR-5497: force using invokeLater() when computer returns from sleep or displayChanged()
                     // (mirroring case especially) to avoid deadlocks until solved definitely:
-
                     boolean mirroring = false;
                     if (peer != null) {
                         final GraphicsDevice device = peer.getGraphicsConfiguration().getDevice();
@@ -1357,39 +1351,30 @@ void flushBuffers() {
                     useInvokeLater = true;
                     break;
             }
-            if (!useInvokeLater && INVOKE_LATER_USE_PWM) {
-                // If the system property 'awt.mac.flushBuffers.pwm' is true,
-                // invokeLater is enforced during power transitions.
-                final boolean inTransition = LWCToolkit.isWithinPowerTransition();
-                if (inTransition) {
-                    logger.fine("CPlatformWindow.flushBuffers[pwm]: inTransition = true");
-                    useInvokeLater = true;
-                }
-            }
             try {
+                final String identifier = logger.isLoggable(PlatformLogger.Level.FINE) ? getIdentifier(target) : null;
+                final EmptyRunnable emptyTask = new EmptyRunnable(identifier);
+
                 // check invokeAndWait: KO (operations require AWTLock and main thread)
-                // => use invokeLater as it is an empty event to force refresh ASAP
+                // => use invokeLater as it is an empty event to force refresh
                 if (useInvokeLater) {
                     LWCToolkit.invokeLater(emptyTask, target);
                 } else {
+                    /* Ensure >3000ms = 3.666ms timeout to avoid any deadlock among
+                     * appkit, EDT, Flusher & a11y threads, locks
+                     * and various synchronization patterns... */
+                    final double timeoutSeconds = 3.666; // seconds
+
                     if (logger.isLoggable(PlatformLogger.Level.FINE)) {
                         logger.fine("CPlatformWindow.flushBuffers: enter " +
-                                "LWCToolkit.invokeAndWait(emptyTask) on target = {0}",
-                                getIdentifier(target));
+                                        "LWCToolkit.invokeAndWait(emptyTask) on target = {0}", identifier);
                     }
 
-                    /* Ensure >500ms = 666ms timeout to avoid any deadlock among
-                     * appkit, EDT, Flusher & a11y threads, locks
-                     * and various synchronization patterns... */
-                    final double timeoutSeconds = 0.666; // seconds
-
-                    // FUCK: appKit is calling this method !
                     LWCToolkit.invokeAndWait(emptyTask, target, timeoutSeconds);
 
                     if (logger.isLoggable(PlatformLogger.Level.FINE)) {
                         logger.fine("CPlatformWindow.flushBuffers: exit  " +
-                                "LWCToolkit.invokeAndWait(emptyTask) on target = {0}",
-                                getIdentifier(target));
+                                        "LWCToolkit.invokeAndWait(emptyTask) on target = {0}", identifier);
                     }
                 }
             } catch (InvocationTargetException ite) {
@@ -1442,6 +1427,10 @@ public void doDeliverMoveResizeEvent() {
     /* native call by AWTWindow._deliverMoveResizeEvent() */
     protected void deliverMoveResizeEvent(int x, int y, int width, int height,
                                         boolean byUser) {
+
+        /* Test only to generate more appkit freezes */
+        final boolean bypassToHaveMoreFreezes = false;
+
         AtomicBoolean ref = new AtomicBoolean();
         execute(ptr -> {
             ref.set(CWrapper.NSWindow.isZoomed(ptr));
@@ -1460,10 +1449,9 @@ protected void deliverMoveResizeEvent(int x, int y, int width, int height,
             }
 
             // System-dependent appearance optimization.
-            if ((byUser && !oldB.getSize().equals(nativeBounds.getSize()))
+            if (bypassToHaveMoreFreezes
+                    || (byUser && !oldB.getSize().equals(nativeBounds.getSize()))
                     || isFullScreenAnimationOn) {
-
-                // May be blocking so postpone this event processing:
                 flushBuffers();
             }
         }

src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java

@@ -733,7 +733,7 @@ public void run() {
 
     public static <T> T invokeAndWait(final Callable<T> callable,
                                       Component component) throws Exception {
-        return invokeAndWait(callable, component, -1);
+        return invokeAndWait(callable, component, 0);
     }
 
     public static <T> T invokeAndWait(final Callable<T> callable, Component component, int timeoutSeconds) throws Exception {
@@ -785,7 +785,7 @@ public static void invokeAndWait(Runnable runnable, Component component)
         invokeAndWait(runnable, component, false, 0.0);
     }
 
-    /* 25.01.25: keep public methods with (int timeoutSeconds) */
+    /* 25.04: keep public methods with (int timeoutSeconds) */
     @Deprecated(since = "25")
     public static void invokeAndWait(Runnable runnable, Component component, int timeoutSeconds)
             throws InvocationTargetException
@@ -800,7 +800,7 @@ public static void invokeAndWait(Runnable runnable, Component component, boolean
         invokeAndWait(runnable, component, processEvents, timeout);
     }
 
-    /* 25.01.25: added public methods with (double timeoutSeconds) to have timeouts between 0.0 and 1.0 */
+    /* 25.04: added public methods with (double timeoutSeconds) to have more precise timeouts */
 
     public static void invokeAndWait(Runnable runnable, Component component, double timeoutSeconds)
             throws InvocationTargetException
@@ -872,9 +872,9 @@ public static void invokeAndWait(Runnable runnable, Component component, boolean
 
     private static native boolean isBlockingEventDispatchThread();
 
-    static native String getThreadTraceContexts();
+    public static native boolean isBlockingMainThread();
 
-    static native boolean isWithinPowerTransition();
+    static native String getThreadTraceContexts();
 
     public static void invokeLater(Runnable event, Component component)
             throws InvocationTargetException {
@@ -1051,7 +1051,7 @@ public boolean canPopupOverlapTaskBar() {
     static native long createAWTRunLoopMediator();
     /**
      * Method to run a nested run-loop. The nested loop is spinned in the javaRunLoop mode, so selectors sent
-     * by [JNFRunLoop performOnMainThreadWaiting] are processed.
+     * by [ThreadUtilities performOnMainThreadWaiting] are processed.
      * @param mediator a native pointer to the mediator object created by createAWTRunLoopMediator
      * @param processEvents if true - dispatches event while in the nested loop. Used in DnD.
      *                      Additional attention is needed when using this feature as we short-circuit normal event
@@ -1065,7 +1065,7 @@ static void doAWTRunLoop(long mediator, boolean processEvents) {
     }
 
     /**
-     * Starts run-loop with the provided timeout. Use (<=0.0) for the infinite value.
+     * Starts run-loop with the provided timeout. Use (<= 0.0) for the infinite value.
      */
     static boolean doAWTRunLoop(long mediator, boolean processEvents, double timeoutSeconds) {
         if (log.isLoggable(PlatformLogger.Level.FINE)) {