[GR-29900] Implement context bound logger

PullRequest: truffleruby/2483

Author: eregon

mx.truffleruby/suite.py

@@ -7,7 +7,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "eb1d9e5a58e016d3284e2df06ca65446b37b61c0",
+                "version": "4df0f40cf23670bcc329b0e1b09a96089ee0d2e8",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -16,7 +16,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "eb1d9e5a58e016d3284e2df06ca65446b37b61c0",
+                "version": "4df0f40cf23670bcc329b0e1b09a96089ee0d2e8",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

src/main/java/org/truffleruby/RubyContext.java

@@ -27,6 +27,7 @@
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.RootCallTarget;
+import com.oracle.truffle.api.TruffleLogger;
 import com.oracle.truffle.api.nodes.EncapsulatingNodeReference;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.utilities.AssumedValue;
@@ -103,6 +104,7 @@ public class RubyContext {
     @CompilationFinal private PrintStream errStream;
     @CompilationFinal private boolean hasOtherPublicLanguages;
 
+    @CompilationFinal public TruffleLogger logger;
     @CompilationFinal private Options options;
     @CompilationFinal private String rubyHome;
     @CompilationFinal private TruffleFile rubyHomeTruffleFile;
@@ -159,6 +161,7 @@ public class RubyContext {
     public RubyContext(RubyLanguage language, TruffleLanguage.Env env) {
         Metrics.printTime("before-context-constructor");
 
+        this.logger = env.getLogger("");
         this.language = language;
         setEnv(env);
         this.preInitialized = preInitializing;
@@ -679,6 +682,10 @@ public PreInitializationManager getPreInitializationManager() {
         return preInitializationManager;
     }
 
+    public TruffleLogger getLogger() {
+        return logger;
+    }
+
     public String getRubyHome() {
         return rubyHome;
     }

src/main/java/org/truffleruby/core/thread/ThreadNodes.java

@@ -591,8 +591,8 @@ private static UnblockingAction makeUnblockingAction(RubyContext context, Object
                         prev = truffleContext.enter(null);
                     } catch (IllegalStateException e) { // Multi threaded access denied from Truffle
                         // Not in a context, so we cannot use TruffleLogger
-                        context.getEnvErrStream().println(
-                                "[ruby] SEVERE: could not unblock thread inside blocking call in C extension because " +
+                        context.getLogger().severe(
+                                "could not unblock thread inside blocking call in C extension because " +
                                         "the context does not allow multithreading (" + e.getMessage() + ")");
                         return;
                     }

src/main/java/org/truffleruby/language/SafepointManager.java

@@ -198,8 +198,8 @@ private void driveArrivalAtPhaser(String reason) {
             } catch (TimeoutException e) {
                 if (System.nanoTime() >= max) {
                     // Possibly not in a context, so we cannot use TruffleLogger
-                    context.getEnvErrStream().println(String.format(
-                            "[ruby] SEVERE: waited %d seconds in the SafepointManager but %d of %d threads did not arrive - a thread is likely making a blocking call - reason for the safepoint: %s",
+                    context.getLogger().severe(String.format(
+                            "waited %d seconds in the SafepointManager but %d of %d threads did not arrive - a thread is likely making a blocking call - reason for the safepoint: %s",
                             waits * WAIT_TIME_IN_SECONDS,
                             phaser.getUnarrivedParties(),
                             phaser.getRegisteredParties(),
@@ -209,8 +209,8 @@ private void driveArrivalAtPhaser(String reason) {
                         restoreDefaultInterruptHandler();
                     }
                     if (max >= exitTime) {
-                        context.getEnvErrStream().println(
-                                "[ruby] SEVERE: waited " + MAX_WAIT_TIME_IN_SECONDS +
+                        context.getLogger().severe(
+                                "waited " + MAX_WAIT_TIME_IN_SECONDS +
                                         " seconds in the SafepointManager, terminating the process as it is unlikely to get unstuck");
                         System.exit(1);
                     }
@@ -256,11 +256,11 @@ private void printStacktracesOfBlockedThreads() {
 
     private void restoreDefaultInterruptHandler() {
         // Possibly not in a context, so we cannot use TruffleLogger
-        context.getEnvErrStream().println("[ruby] WARNING: restoring default interrupt handler");
+        context.getLogger().warning("restoring default interrupt handler");
         try {
             Signals.restoreDefaultHandler("INT");
         } catch (Throwable t) {
-            context.getEnvErrStream().println("[ruby] WARNING: failed to restore default interrupt handler\n" + t);
+            context.getLogger().warning("failed to restore default interrupt handler\n" + t);
         }
     }