Provide NativeImageSystemIOWrappers output sink customization

Author: olpaw

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/GraalFeature.java

@@ -42,7 +42,6 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
-import com.oracle.graal.pointsto.meta.PointsToAnalysisMethod;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.api.runtime.GraalRuntime;
 import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
@@ -90,6 +89,7 @@
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.graal.pointsto.meta.HostedProviders;
+import com.oracle.graal.pointsto.meta.PointsToAnalysisMethod;
 import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.ParsingReason;
 import com.oracle.svm.core.SubstrateOptions;
@@ -121,6 +121,7 @@
 import com.oracle.svm.hosted.FeatureImpl.DuringAnalysisAccessImpl;
 import com.oracle.svm.hosted.FeatureImpl.DuringSetupAccessImpl;
 import com.oracle.svm.hosted.NativeImageGenerator;
+import com.oracle.svm.hosted.ProgressReporter;
 import com.oracle.svm.hosted.analysis.Inflation;
 import com.oracle.svm.hosted.classinitialization.ClassInitializationSupport;
 import com.oracle.svm.hosted.code.CompilationInfoSupport;
@@ -133,7 +134,6 @@
 import com.oracle.svm.hosted.phases.StrengthenStampsPhase;
 import com.oracle.svm.hosted.phases.SubstrateClassInitializationPlugin;
 import com.oracle.svm.hosted.phases.SubstrateGraphBuilderPhase;
-import com.oracle.svm.hosted.reporting.ProgressReporter;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 
 import jdk.vm.ci.meta.DeoptimizationAction;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java

@@ -56,9 +56,6 @@
 import java.util.function.BooleanSupplier;
 import java.util.stream.Collectors;
 
-import com.oracle.graal.pointsto.PointsToAnalysis;
-import com.oracle.graal.pointsto.meta.PointsToAnalysisFactory;
-import com.oracle.graal.pointsto.meta.PointsToAnalysisMethod;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Pair;
 import org.graalvm.compiler.api.replacements.Fold;
@@ -135,6 +132,7 @@
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.BytecodeSensitiveAnalysisPolicy;
 import com.oracle.graal.pointsto.DefaultAnalysisPolicy;
+import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.api.PointstoOptions;
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatureException;
 import com.oracle.graal.pointsto.infrastructure.SubstitutionProcessor;
@@ -146,6 +144,8 @@
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.graal.pointsto.meta.AnalysisUniverse;
 import com.oracle.graal.pointsto.meta.HostedProviders;
+import com.oracle.graal.pointsto.meta.PointsToAnalysisFactory;
+import com.oracle.graal.pointsto.meta.PointsToAnalysisMethod;
 import com.oracle.graal.pointsto.reports.AnalysisReporter;
 import com.oracle.graal.pointsto.typestate.TypeState;
 import com.oracle.graal.pointsto.util.AnalysisError;
@@ -220,6 +220,7 @@
 import com.oracle.svm.hosted.FeatureImpl.BeforeUniverseBuildingAccessImpl;
 import com.oracle.svm.hosted.FeatureImpl.DuringAnalysisAccessImpl;
 import com.oracle.svm.hosted.FeatureImpl.OnAnalysisExitAccessImpl;
+import com.oracle.svm.hosted.ProgressReporter.ReporterClosable;
 import com.oracle.svm.hosted.ameta.AnalysisConstantFieldProvider;
 import com.oracle.svm.hosted.ameta.AnalysisConstantReflectionProvider;
 import com.oracle.svm.hosted.analysis.Inflation;
@@ -270,8 +271,6 @@
 import com.oracle.svm.hosted.phases.SubstrateClassInitializationPlugin;
 import com.oracle.svm.hosted.phases.VerifyDeoptFrameStatesLIRPhase;
 import com.oracle.svm.hosted.phases.VerifyNoGuardsPhase;
-import com.oracle.svm.hosted.reporting.ProgressReporter;
-import com.oracle.svm.hosted.reporting.ProgressReporter.ReporterClosable;
 import com.oracle.svm.hosted.snippets.SubstrateGraphBuilderPlugins;
 import com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor;
 import com.oracle.svm.hosted.substitute.DeletedFieldsPlugin;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java

@@ -72,7 +72,6 @@
 import com.oracle.svm.hosted.code.CEntryPointData;
 import com.oracle.svm.hosted.image.AbstractImage.NativeImageKind;
 import com.oracle.svm.hosted.option.HostedOptionParser;
-import com.oracle.svm.hosted.reporting.ProgressReporter;
 import com.oracle.svm.util.ClassUtil;
 import com.oracle.svm.util.ModuleSupport;
 import com.oracle.svm.util.ReflectionUtil;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageSystemClassLoader.java

@@ -52,8 +52,7 @@
 public final class NativeImageSystemClassLoader extends SecureClassLoader {
 
     public final ClassLoader defaultSystemClassLoader;
-
-    NativeImageSystemIOWrappers systemIOWrappers;
+    final NativeImageSystemIOWrappers systemIOWrappers;
 
     private volatile ClassLoader nativeImageClassLoader = null;
 
@@ -62,10 +61,6 @@ public final class NativeImageSystemClassLoader extends SecureClassLoader {
     public NativeImageSystemClassLoader(ClassLoader defaultSystemClassLoader) {
         super(defaultSystemClassLoader);
         this.defaultSystemClassLoader = defaultSystemClassLoader;
-        resetSystemIOWrappers();
-    }
-
-    private void resetSystemIOWrappers() {
         systemIOWrappers = new NativeImageSystemIOWrappers();
         /* Image building console output requires custom System.out and System.err */
         systemIOWrappers.replaceSystemOutErr();

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageSystemIOWrappers.java

@@ -27,6 +27,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
+import java.util.Objects;
 
 import com.oracle.svm.core.util.UserError;
 
@@ -35,7 +36,7 @@ public class NativeImageSystemIOWrappers {
     final CapturingStdioWrapper outWrapper;
     final CapturingStdioWrapper errWrapper;
 
-    public boolean useCapturing;
+    boolean useCapturing;
 
     NativeImageSystemIOWrappers() {
         outWrapper = new CapturingStdioWrapper(System.out, new ByteArrayOutputStream(128));
@@ -53,14 +54,22 @@ public void verifySystemOutErrReplacement() {
         UserError.guarantee(System.err == errWrapper, "System.err" + msg);
     }
 
-    public PrintStream originalOut() {
+    public PrintStream getOut() {
         return outWrapper.delegate;
     }
 
-    public PrintStream originalErr() {
+    public void setOut(PrintStream customOut) {
+        outWrapper.delegate = Objects.requireNonNull(customOut);
+    }
+
+    public PrintStream getErr() {
         return errWrapper.delegate;
     }
 
+    public void setErr(PrintStream customErr) {
+        errWrapper.delegate = Objects.requireNonNull(customErr);
+    }
+
     public void flushCapturedContent() {
         outWrapper.flushCapturedContent();
         errWrapper.flushCapturedContent();
@@ -76,7 +85,7 @@ void replaceSystemOutErr() {
      */
     private final class CapturingStdioWrapper extends PrintStream {
         private final ByteArrayOutputStream buffer;
-        private final PrintStream delegate;
+        private PrintStream delegate;
 
         private CapturingStdioWrapper(PrintStream delegate, ByteArrayOutputStream buffer) {
             super(buffer);

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reporting/ProgressReporter.java renamed to substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporter.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.hosted.reporting;
+package com.oracle.svm.hosted;
 
 import java.io.File;
 import java.io.PrintWriter;
@@ -66,9 +66,6 @@
 import com.oracle.svm.core.annotate.AutomaticFeature;
 import com.oracle.svm.core.option.HostedOptionValues;
 import com.oracle.svm.core.reflect.MethodMetadataDecoder;
-import com.oracle.svm.hosted.NativeImageGenerator;
-import com.oracle.svm.hosted.NativeImageSystemIOWrappers;
-import com.oracle.svm.hosted.StringAccess;
 import com.oracle.svm.hosted.code.CompileQueue.CompileTask;
 import com.oracle.svm.hosted.image.NativeImageHeap.ObjectInfo;
 import com.oracle.svm.util.ImageBuildStatistics;
@@ -638,7 +635,7 @@ private void checkForExcessiveGarbageCollection() {
      */
 
     private static void resetANSIMode() {
-        NativeImageSystemIOWrappers.singleton().originalOut().print(ANSIColors.RESET);
+        NativeImageSystemIOWrappers.singleton().getOut().print(ANSIColors.RESET);
     }
 
     private static String stringFilledWith(int size, String fill) {
@@ -838,7 +835,7 @@ private void flush() {
             if (printBuffer != null) {
                 textBuffer.forEach(printBuffer::append);
             } else {
-                textBuffer.forEach(builderIO.originalOut()::print);
+                textBuffer.forEach(builderIO.getOut()::print);
             }
             textBuffer.clear();
         }
@@ -850,7 +847,7 @@ private void printRaw(char value) {
             if (printBuffer != null) {
                 printBuffer.append(value);
             } else {
-                builderIO.originalOut().print(value);
+                builderIO.getOut().print(value);
             }
         }
 
@@ -863,15 +860,15 @@ private void flushln(boolean useOutputPrefix) {
                 return;
             }
             if (useOutputPrefix) {
-                builderIO.originalOut().print(outputPrefix);
+                builderIO.getOut().print(outputPrefix);
             }
             if (printBuffer != null) {
-                builderIO.originalOut().print(printBuffer);
+                builderIO.getOut().print(printBuffer);
                 printBuffer.setLength(0); // Clear buffer.
             }
-            textBuffer.forEach(builderIO.originalOut()::print);
+            textBuffer.forEach(builderIO.getOut()::print);
             textBuffer.clear();
-            builderIO.originalOut().println();
+            builderIO.getOut().println();
         }
 
         private void flushCenteredln() {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reporting/ProgressReporterCHelper.java renamed to substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporterCHelper.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.oracle.svm.hosted.reporting;
+package com.oracle.svm.hosted;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -33,7 +33,7 @@
 
 public final class ProgressReporterCHelper {
     private static final int DEFAULT_CHARACTERS_PER_LINE = 80;
-    public static final int MAX_CHARACTERS_PER_LINE = 120;
+    static final int MAX_CHARACTERS_PER_LINE = 120;
 
     static {
         loadCHelperLibrary();

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompileQueue.java

@@ -157,6 +157,7 @@
 import com.oracle.svm.hosted.FeatureHandler;
 import com.oracle.svm.hosted.NativeImageGenerator;
 import com.oracle.svm.hosted.NativeImageOptions;
+import com.oracle.svm.hosted.ProgressReporter;
 import com.oracle.svm.hosted.meta.HostedField;
 import com.oracle.svm.hosted.meta.HostedMethod;
 import com.oracle.svm.hosted.meta.HostedType;
@@ -166,8 +167,6 @@
 import com.oracle.svm.hosted.phases.ImageBuildStatisticsCounterPhase;
 import com.oracle.svm.hosted.phases.ImplicitAssertionsPhase;
 import com.oracle.svm.hosted.phases.StrengthenStampsPhase;
-import com.oracle.svm.hosted.reporting.ProgressReporter;
-import com.oracle.svm.hosted.reporting.ProgressReporter.ReporterClosable;
 import com.oracle.svm.hosted.substitute.DeletedMethod;
 import com.oracle.svm.util.ImageBuildStatistics;
 
@@ -372,7 +371,7 @@ public void finish(DebugContext debug) {
         ProgressReporter reporter = ProgressReporter.singleton();
         try {
             String imageName = universe.getBigBang().getHostVM().getImageName();
-            try (ReporterClosable ac = reporter.printParsing(new Timer(imageName, "(parse)"))) {
+            try (ProgressReporter.ReporterClosable ac = reporter.printParsing(new Timer(imageName, "(parse)"))) {
                 parseAll();
             }
             // Checking @Uninterruptible annotations does not take long enough to justify a timer.
@@ -391,7 +390,7 @@ public void finish(DebugContext debug) {
             }
 
             if (SubstrateOptions.AOTInline.getValue() && SubstrateOptions.AOTTrivialInline.getValue()) {
-                try (ReporterClosable ac = reporter.printInlining(new Timer(imageName, "(inline)"))) {
+                try (ProgressReporter.ReporterClosable ac = reporter.printInlining(new Timer(imageName, "(inline)"))) {
                     inlineTrivialMethods(debug);
                 }
             } else {
@@ -400,7 +399,7 @@ public void finish(DebugContext debug) {
 
             assert suitesNotCreated();
             createSuites();
-            try (ReporterClosable ac = reporter.printCompiling(new Timer(imageName, "(compile)"))) {
+            try (ProgressReporter.ReporterClosable ac = reporter.printCompiling(new Timer(imageName, "(compile)"))) {
                 compileAll();
             }
         } catch (InterruptedException ie) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java

@@ -102,6 +102,7 @@
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.hosted.FeatureImpl;
 import com.oracle.svm.hosted.NativeImageOptions;
+import com.oracle.svm.hosted.ProgressReporter;
 import com.oracle.svm.hosted.c.CGlobalDataFeature;
 import com.oracle.svm.hosted.c.NativeLibraries;
 import com.oracle.svm.hosted.c.codegen.CSourceCodeWriter;
@@ -114,7 +115,6 @@
 import com.oracle.svm.hosted.meta.HostedMetaAccess;
 import com.oracle.svm.hosted.meta.HostedMethod;
 import com.oracle.svm.hosted.meta.HostedUniverse;
-import com.oracle.svm.hosted.reporting.ProgressReporter;
 import com.oracle.svm.util.ReflectionUtil;
 import com.oracle.svm.util.ReflectionUtil.ReflectionUtilError;
 

substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/access/JNIAccessFeature.java

@@ -60,11 +60,11 @@
 import com.oracle.svm.hosted.FeatureImpl.BeforeAnalysisAccessImpl;
 import com.oracle.svm.hosted.FeatureImpl.CompilationAccessImpl;
 import com.oracle.svm.hosted.FeatureImpl.DuringAnalysisAccessImpl;
+import com.oracle.svm.hosted.ProgressReporter;
 import com.oracle.svm.hosted.c.NativeLibraries;
 import com.oracle.svm.hosted.code.CEntryPointData;
 import com.oracle.svm.hosted.config.ConfigurationParserUtils;
 import com.oracle.svm.hosted.meta.MaterializedConstantFields;
-import com.oracle.svm.hosted.reporting.ProgressReporter;
 import com.oracle.svm.hosted.substitute.SubstitutionReflectivityFilter;
 import com.oracle.svm.jni.JNIJavaCallWrappers;
 import com.oracle.svm.jni.JNISupport;