Resolved review comments.

Author: tzezula

sdk/CHANGELOG.md

@@ -9,6 +9,7 @@ This changelog summarizes major changes between GraalVM SDK versions. The main f
 * GR-66817 Make `--polyglot` the default for language launchers, so there is no need to specify it anymore to use other languages in standalones. As a result, `AbstractLanguageLauncher#getDefaultLanguages()` and `Launcher#canPolyglot()` have been deprecated.
 * GR-65404 Remove `PolyglotLauncher` as it is no longer used.
 * GR-68613: JavaScript polyglot isolate now includes support for the WebAssembly (Wasm) language.
+* GR-69590: Closing a garbage-collected engine or context now logs only the first failure by default. To log all failures, use `engine.CloseOnGCFailureAction.PrintAll`.
 
 ## Version 25.0.0
 * GR-60636 Truffle now stops compiling when the code cache fills up on HotSpot. A warning is printed when that happens.

truffle/mx.truffle/mx_truffle.py

@@ -321,8 +321,6 @@ def apply(self, config):
 
         # Disable VirtualThread warning
         vmArgs = vmArgs + ['-Dpolyglot.engine.WarnVirtualThreadSupport=false']
-        # Print only a single close on context collected error
-        vmArgs = vmArgs + ['-Dpolyglot.engine.CloseOnGCFailureAction=PrintOnce']
         enable_truffle_native_access(vmArgs)
         enable_sun_misc_unsafe(vmArgs)
         return (vmArgs, mainClass, mainClassArgs)

truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/EngineAccessor.java

@@ -1439,40 +1439,32 @@ public boolean isKnownLoggerId(Object loggerCache, String id) {
             if (PolyglotLoggers.getInternalIds().contains(id)) {
                 return true;
             }
-            PolyglotEngineImpl polyglotEngine = lookupPolyglotEngineForLoggerCache(loggerCache);
-            if (polyglotEngine != null) {
-                return polyglotEngine.idToLanguage.containsKey(id) || polyglotEngine.idToInstrument.containsKey(id);
-            } else {
+            if (loggerCache == PolyglotLoggers.LoggerCache.DEFAULT) {
                 /*
                  * TruffleLogger#getLogger() is invoked from a static initializer, no vmObject
                  * anchor is available at this point.
                  */
                 return LanguageCache.languages().containsKey(id) || InstrumentCache.load().containsKey(id);
+            } else {
+                PolyglotEngineImpl polyglotEngine = ((PolyglotLoggers.LoggerCache) loggerCache).getOwner().getEngine();
+                return polyglotEngine.idToLanguage.containsKey(id) || polyglotEngine.idToInstrument.containsKey(id);
             }
         }
 
-        private static PolyglotEngineImpl lookupPolyglotEngineForLoggerCache(Object loggerCache) {
-            VMObject vmObject = ((PolyglotLoggers.LoggerCache) loggerCache).getOwner();
-            if (vmObject == null) {
-                vmObject = PolyglotFastThreadLocals.getContext(null);
-            }
-            return vmObject != null ? vmObject.getEngine() : null;
-        }
-
         @Override
         public Collection<String> getKnownLoggerIds(Object loggerCache) {
             List<String> ids = new ArrayList<>(PolyglotLoggers.getInternalIds());
-            PolyglotEngineImpl polyglotEngine = lookupPolyglotEngineForLoggerCache(loggerCache);
-            if (polyglotEngine != null) {
-                ids.addAll(polyglotEngine.idToLanguage.keySet());
-                ids.addAll(polyglotEngine.idToInstrument.keySet());
-            } else {
+            if (loggerCache == PolyglotLoggers.LoggerCache.DEFAULT) {
                 /*
                  * TruffleLogger#getLogger() is invoked from a static initializer, no vmObject
                  * anchor is available at this point.
                  */
                 ids.addAll(LanguageCache.languages().keySet());
                 ids.addAll(InstrumentCache.load().keySet());
+            } else {
+                PolyglotEngineImpl polyglotEngine = ((PolyglotLoggers.LoggerCache) loggerCache).getOwner().getEngine();
+                ids.addAll(polyglotEngine.idToLanguage.keySet());
+                ids.addAll(polyglotEngine.idToInstrument.keySet());
             }
             Collections.sort(ids);
             return ids;

truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineImpl.java

@@ -2445,12 +2445,12 @@ static void logCloseOnCollectedError(PolyglotEngineImpl engine, String reason, T
         switch (engine.getEngineOptionValues().get(PolyglotEngineOptions.CloseOnGCFailureAction)) {
             case Ignore -> {
             }
-            case PrintOnce -> {
+            case Print -> {
                 if (closeOnCollectedErrorLogged.compareAndSet(false, true)) {
                     logCloseOnCollectedError(reason, exception);
                 }
             }
-            case Print -> logCloseOnCollectedError(reason, exception);
+            case PrintAll -> logCloseOnCollectedError(reason, exception);
             case Throw -> throw new RuntimeException(reason, exception);
         }
     }
@@ -2465,8 +2465,8 @@ private static void logCloseOnCollectedError(String reason, Throwable exception)
                             To customize the behavior of this warning, use 'engine.CloseOnGCFailureAction' option or the 'polyglot.engine.CloseOnGCFailureAction' system property.
                             The accepted values are:
                               - Ignore:    Do not print this warning.
-                              - PrintOnce: Print this warning only for the first occurrence; suppress subsequent ones.
-                              - Print:     Print this warning (default value).
+                              - Print:     Print this warning only for the first occurrence; suppress subsequent ones (default value).
+                              - PrintAll:  Print this warning.
                               - Throw:     Throw an exception instead of printing this warning.
                             """, reason);
             exception.printStackTrace(errWriter);

truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineOptions.java

@@ -191,15 +191,15 @@ public StaticObjectStorageStrategies apply(String s) {
 
     enum CloseOnGCExceptionAction {
         Ignore,
-        PrintOnce,
         Print,
+        PrintAll,
         Throw;
 
         private static final String HELP = "Specifies the action to take when closing a garbage-collected engine or context fails.%n" +
                         "The accepted values are:%n" +
                         "    Ignore:     Ignore the exception that occurs during close.%n" +
-                        "    PrintOnce:  Log the failure only for the first occurrence; suppress subsequent ones.%n" +
-                        "    Print:      Log each failure (default value).%n" +
+                        "    Print:      Log the failure only for the first occurrence; suppress subsequent ones (default value).%n" +
+                        "    PrintAll:   Log each failure.%n" +
                         "    Throw:      Throw an exception instead of logging the failure.";
     }
 }