Do not close env output.

oldcwj · Sep 28, 2021 · badb93d · badb93d
1 parent f5782ff
commit badb93d
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 52 deletions.
diff --git a/...truffle.tools.coverage/src/com/oracle/truffle/tools/coverage/impl/CoverageInstrument.java b/...truffle.tools.coverage/src/com/oracle/truffle/tools/coverage/impl/CoverageInstrument.java
@@ -174,21 +174,20 @@ protected void onDispose(Env env) {
             SourceCoverage[] coverage = tracker.getCoverage();
             final OptionValues options = env.getOptions();
             final boolean strictLines = StrictLines.getValue(options);
-            try (PrintStream out = chooseOutputStream(env, OUTPUT_FILE)) {
-                switch (OUTPUT.getValue(options)) {
-                    case HISTOGRAM:
-                        new CoverageCLI(out, coverage, strictLines).printHistogramOutput();
-                        break;
-                    case DETAILED:
-                        new CoverageCLI(out, coverage, strictLines).printLinesOutput();
-                        break;
-                    case JSON:
-                        new JSONPrinter(out, coverage).print();
-                        break;
-                    case LCOV:
-                        new LCOVPrinter(out, coverage, strictLines).print();
-                        break;
-                }
+            PrintStream out = chooseOutputStream(env, OUTPUT_FILE);
+            switch (OUTPUT.getValue(options)) {
+                case HISTOGRAM:
+                    new CoverageCLI(out, coverage, strictLines).printHistogramOutput();
+                    break;
+                case DETAILED:
+                    new CoverageCLI(out, coverage, strictLines).printLinesOutput();
+                    break;
+                case JSON:
+                    new JSONPrinter(out, coverage).print();
+                    break;
+                case LCOV:
+                    new LCOVPrinter(out, coverage, strictLines).print();
+                    break;
             }
             tracker.close();
         }

diff --git a/...acle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java b/...acle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
@@ -166,24 +166,23 @@ public CPUSampler.Mode apply(String s) {
     static final OptionKey<Boolean> SAMPLE_CONTEXT_INITIALIZATION = new OptionKey<>(false);
 
     static void handleOutput(TruffleInstrument.Env env, CPUSampler sampler) {
-        try (PrintStream out = chooseOutputStream(env, OUTPUT_FILE)) {
-            Map<TruffleContext, CPUSamplerData> data = sampler.getData();
-            OptionValues options = env.getOptions();
-            switch (options.get(OUTPUT)) {
-                case HISTOGRAM:
-                    printWarnings(sampler, out);
-                    printSamplingHistogram(out, options, data);
-                    break;
-                case CALLTREE:
-                    printWarnings(sampler, out);
-                    printSamplingCallTree(out, options, data);
-                    break;
-                case JSON:
-                    printSamplingJson(out, options, data);
-                    break;
-                case FLAMEGRAPH:
-                    SVGSamplerOutput.printSamplingFlameGraph(out, data);
-            }
+        PrintStream out = chooseOutputStream(env, OUTPUT_FILE);
+        Map<TruffleContext, CPUSamplerData> data = sampler.getData();
+        OptionValues options = env.getOptions();
+        switch (options.get(OUTPUT)) {
+            case HISTOGRAM:
+                printWarnings(sampler, out);
+                printSamplingHistogram(out, options, data);
+                break;
+            case CALLTREE:
+                printWarnings(sampler, out);
+                printSamplingCallTree(out, options, data);
+                break;
+            case JSON:
+                printSamplingJson(out, options, data);
+                break;
+            case FLAMEGRAPH:
+                SVGSamplerOutput.printSamplingFlameGraph(out, data);
         }
     }
 

diff --git a/...racle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUTracerCLI.java b/...racle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUTracerCLI.java
@@ -24,23 +24,24 @@
  */
 package com.oracle.truffle.tools.profiler.impl;
 
-import com.oracle.truffle.api.Option;
-import com.oracle.truffle.api.instrumentation.TruffleInstrument;
-import com.oracle.truffle.tools.profiler.CPUTracer;
-import com.oracle.truffle.tools.utils.json.JSONArray;
-import com.oracle.truffle.tools.utils.json.JSONObject;
-import org.graalvm.options.OptionCategory;
-import org.graalvm.options.OptionKey;
-import org.graalvm.options.OptionStability;
-import org.graalvm.options.OptionType;
-
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 import java.util.function.Function;
 
+import org.graalvm.options.OptionCategory;
+import org.graalvm.options.OptionKey;
+import org.graalvm.options.OptionStability;
+import org.graalvm.options.OptionType;
+
+import com.oracle.truffle.api.Option;
+import com.oracle.truffle.api.instrumentation.TruffleInstrument;
+import com.oracle.truffle.tools.profiler.CPUTracer;
+import com.oracle.truffle.tools.utils.json.JSONArray;
+import com.oracle.truffle.tools.utils.json.JSONObject;
+
 @Option.Group(CPUTracerInstrument.ID)
 class CPUTracerCLI extends ProfilerCLI {
 
@@ -95,15 +96,14 @@ public Output apply(String s) {
     static final OptionKey<String> OUTPUT_FILE = new OptionKey<>("");
 
     public static void handleOutput(TruffleInstrument.Env env, CPUTracer tracer) {
-        try (PrintStream out = chooseOutputStream(env, OUTPUT_FILE)) {
-            switch (env.getOptions().get(OUTPUT)) {
-                case HISTOGRAM:
-                    printTracerHistogram(out, tracer);
-                    break;
-                case JSON:
-                    printTracerJson(out, tracer);
-                    break;
-            }
+        PrintStream out = chooseOutputStream(env, OUTPUT_FILE);
+        switch (env.getOptions().get(OUTPUT)) {
+            case HISTOGRAM:
+                printTracerHistogram(out, tracer);
+                break;
+            case JSON:
+                printTracerJson(out, tracer);
+                break;
         }
     }