[GR-59492] System.out/err usage in PolyglotLoggers.

PullRequest: graal/19455

Author: tzezula

substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java

@@ -62,6 +62,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
+import com.oracle.svm.core.log.Log;
 import org.graalvm.collections.Pair;
 import org.graalvm.home.HomeFinder;
 import org.graalvm.home.Version;
@@ -1477,6 +1478,17 @@ public Object transform(Object receiver, Object originalValue) {
     }
 }
 
+@TargetClass(className = "com.oracle.truffle.polyglot.PolyglotEngineImpl", onlyWith = TruffleBaseFeature.IsEnabled.class)
+final class Target_com_oracle_truffle_polyglot_PolyglotEngineImpl {
+    @Substitute
+    static void logFallback(String message) {
+        try (Log log = Log.log()) {
+            log.string(message.getBytes(StandardCharsets.UTF_8));
+            log.flush();
+        }
+    }
+}
+
 @TargetClass(className = "com.oracle.truffle.object.CoreLocations$DynamicObjectFieldLocation", onlyWith = TruffleBaseFeature.IsEnabled.class)
 final class Target_com_oracle_truffle_object_CoreLocations_DynamicObjectFieldLocation {
     @Alias @RecomputeFieldValue(kind = Kind.AtomicFieldUpdaterOffset) //

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

@@ -40,7 +40,6 @@
  */
 package com.oracle.truffle.polyglot;
 
-import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -291,7 +290,6 @@ SandboxPolicy getSandboxPolicy() {
     }
 
     private static void emitWarning(String message, Object... args) {
-        PrintStream out = System.err;
-        out.printf(message + "%n", args);
+        PolyglotEngineImpl.logFallback(String.format(message + "%n", args));
     }
 }

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

@@ -47,7 +47,6 @@
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.ProcessProperties;
 
-import java.io.PrintStream;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -333,14 +332,12 @@ static boolean isTraceInternalResourceEvents() {
 
     static void logInternalResourceEvent(String message, Object... args) {
         if (isTraceInternalResourceEvents()) {
-            PrintStream out = System.err;
-            out.printf("[engine][resource] " + message + "%n", args);
+            PolyglotEngineImpl.logFallback(String.format("[engine][resource] " + message + "%n", args));
         }
     }
 
     private static void emitWarning(String message, Object... args) {
-        PrintStream out = System.err;
-        out.printf(message + "%n", args);
+        PolyglotEngineImpl.logFallback(String.format(message + "%n", args));
     }
 
     record Root(Path path, Kind kind, List<InternalResourceCache> caches) {

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

@@ -41,7 +41,8 @@
 package com.oracle.truffle.polyglot;
 
 import java.io.IOException;
-import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -155,13 +156,15 @@ private static void performTruffleAttachLoadFailureAction(String reason, Throwab
             case "ignore" -> {
             }
             case "warn" -> {
-                PrintStream err = System.err;
-                err.println(formatErrorMessage(reason));
+                PolyglotEngineImpl.logFallback(formatErrorMessage(reason));
             }
             case "diagnose" -> {
-                PrintStream err = System.err;
-                err.println(formatErrorMessage(reason));
-                t.printStackTrace(err);
+                StringWriter message = new StringWriter();
+                try (PrintWriter err = new PrintWriter(message)) {
+                    err.println(formatErrorMessage(reason));
+                    t.printStackTrace(err);
+                }
+                PolyglotEngineImpl.logFallback(message.toString());
             }
             case "throw" -> throw new InternalError(formatErrorMessage(reason), t);
             default -> throw new IllegalArgumentException("Invalid polyglotimpl.AttachLibraryFailureAction system property value. Supported values are ignore, warn, diagnose, throw");

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

@@ -41,7 +41,6 @@
 package com.oracle.truffle.polyglot;
 
 import java.io.IOException;
-import java.io.PrintStream;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.nio.file.NoSuchFileException;
@@ -657,8 +656,7 @@ SandboxPolicy getSandboxPolicy() {
     }
 
     private static void emitWarning(String message, Object... args) {
-        PrintStream out = System.err;
-        out.printf(message + "%n", args);
+        PolyglotEngineImpl.logFallback(String.format(message + "%n", args));
     }
 
     private static final class HostLanguageProvider extends TruffleLanguageProvider {

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

@@ -2361,16 +2361,19 @@ static void logCloseOnCollectedError(PolyglotEngineImpl engine, String reason, T
             case Ignore -> {
             }
             case Print -> {
-                PrintStream errStream = System.err;
-                errStream.printf("""
-                                [engine] WARNING: %s
-                                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.
-                                  - Print:     Print this warning (default value).
-                                  - Throw:     Throw an exception instead of printing this warning.
-                                """, reason);
-                exception.printStackTrace(errStream);
+                StringWriter message = new StringWriter();
+                try (PrintWriter errWriter = new PrintWriter(message)) {
+                    errWriter.printf("""
+                                    [engine] WARNING: %s
+                                    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.
+                                      - Print:     Print this warning (default value).
+                                      - Throw:     Throw an exception instead of printing this warning.
+                                    """, reason);
+                    exception.printStackTrace(errWriter);
+                }
+                logFallback(message.toString());
             }
             case Throw -> throw new RuntimeException(reason, exception);
         }
@@ -2475,4 +2478,19 @@ or use the default runtime (no JIT compilation of polyglot code) by passing -Dtr
         impl.getRootImpl().validateVirtualThreadCreation(getEngineOptionValues());
     }
 
+    /**
+     * Logs a message when other logging mechanisms, such as {@link TruffleLogger} or the context's
+     * error stream, are unavailable. This can occur, for instance, in the event of a log handler
+     * failure.
+     * <p>
+     * On HotSpot, this method writes the message to {@code System.err}. When running on a native
+     * image, this method is substituted to delegate logging to the native image's
+     * {@link org.graalvm.nativeimage.LogHandler}.
+     *
+     * @param message the message to log
+     */
+    static void logFallback(String message) {
+        PrintStream err = System.err;
+        err.println(message);
+    }
 }

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

@@ -59,6 +59,7 @@
 import java.util.Objects;
 import java.util.ResourceBundle;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 import java.util.logging.ErrorManager;
 import java.util.logging.Formatter;
@@ -300,7 +301,7 @@ final void checkClosed() {
 
         final synchronized void reportHandlerError(int errorKind, Throwable t) {
             if (errorManager == null) {
-                errorManager = new ErrorManager();
+                errorManager = new PolyglotErrorManager();
             }
             Exception exception;
             if (t instanceof Exception) {
@@ -785,4 +786,31 @@ public TruffleLogger apply(String loggerId) {
             return EngineAccessor.LANGUAGE.getLogger(loggerId, null, loggersCache);
         }
     }
+
+    private static final class PolyglotErrorManager extends ErrorManager {
+
+        private final AtomicBoolean reported = new AtomicBoolean();
+
+        PolyglotErrorManager() {
+        }
+
+        @Override
+        public void error(String msg, Exception ex, int code) {
+            if (reported.getAndSet(true)) {
+                return;
+            }
+            StringWriter content = new StringWriter();
+            try (PrintWriter out = new PrintWriter(content)) {
+                String text = "java.util.logging.ErrorManager: " + code;
+                if (msg != null) {
+                    text = text + ": " + msg;
+                }
+                out.println(text);
+                if (ex != null) {
+                    ex.printStackTrace(out);
+                }
+            }
+            PolyglotEngineImpl.logFallback(content.toString());
+        }
+    }
 }