Ignore --starlark_cpu_profile on Windows.

andrewkatson · copybara-github · commit 2255ce4165f9 · 2021-11-05T09:46:43.000-07:00
Closes #14196. PiperOrigin-RevId: 407843471
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
@@ -351,6 +351,7 @@ private BlazeCommandResult execExclusively(
     storedEventHandler.post(profilerStartedEvent);
 
     // Enable Starlark CPU profiling (--starlark_cpu_profile=/tmp/foo.pprof.gz)
+    boolean success = false;
     if (!commonOptions.starlarkCpuProfile.isEmpty()) {
       FileOutputStream out;
       try {
@@ -362,7 +363,7 @@ private BlazeCommandResult execExclusively(
             message, FailureDetails.Command.Code.STARLARK_CPU_PROFILE_FILE_INITIALIZATION_FAILURE);
       }
       try {
-        Starlark.startCpuProfile(out, Duration.ofMillis(10));
+        success = Starlark.startCpuProfile(out, Duration.ofMillis(10));
       } catch (IllegalStateException ex) { // e.g. SIGPROF in use
         String message = Strings.nullToEmpty(ex.getMessage());
         outErr.printErrLn(message);
@@ -591,7 +592,7 @@ private BlazeCommandResult execExclusively(
       }
 
       // Finalize the Starlark CPU profile.
-      if (!commonOptions.starlarkCpuProfile.isEmpty()) {
+      if (!commonOptions.starlarkCpuProfile.isEmpty() && success) {
         try {
           Starlark.stopCpuProfile();
         } catch (IOException ex) {
diff --git a/src/main/java/net/starlark/java/eval/BUILD b/src/main/java/net/starlark/java/eval/BUILD
@@ -57,6 +57,7 @@ java_library(
         "//src/main/java/net/starlark/java/spelling",
         "//src/main/java/net/starlark/java/syntax",
         "//third_party:error_prone_annotations",
+        "//third_party:flogger",
         "//third_party:guava",
         "//third_party:jsr305",
     ],
diff --git a/src/main/java/net/starlark/java/eval/CpuProfiler.java b/src/main/java/net/starlark/java/eval/CpuProfiler.java
@@ -17,6 +17,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.flogger.GoogleLogger;
 import java.io.ByteArrayOutputStream;
 import java.io.FileDescriptor;
 import java.io.FileInputStream;
@@ -93,6 +94,8 @@ final class CpuProfiler {
     JNI.load();
   }
 
+  private static final GoogleLogger logger = GoogleLogger.forEnclosingClass();
+
   private final PprofWriter pprof;
 
   private CpuProfiler(OutputStream out, Duration period) {
@@ -126,9 +129,10 @@ static StarlarkThread setStarlarkThread(StarlarkThread thread) {
   }
 
   /** Start the profiler. */
-  static void start(OutputStream out, Duration period) {
+  static boolean start(OutputStream out, Duration period) {
     if (!supported()) {
-      throw new UnsupportedOperationException("this platform does not support Starlark profiling");
+      logger.atWarning().log("--starlark_cpu_profile is unsupported on this platform");
+      return false;
     }
     if (instance != null) {
       throw new IllegalStateException("profiler started twice without intervening stop");
@@ -140,6 +144,7 @@ static void start(OutputStream out, Duration period) {
     }
 
     instance = new CpuProfiler(out, period);
+    return true;
   }
 
   /** Stop the profiler and wait for the log to be written. */
diff --git a/src/main/java/net/starlark/java/eval/Starlark.java b/src/main/java/net/starlark/java/eval/Starlark.java
@@ -959,8 +959,8 @@ private static StarlarkFunction newExprFunction(
    * @throws IllegalStateException exception if the Starlark profiler is already running or if the
    *     operating system's profiling resources for this process are already in use.
    */
-  public static void startCpuProfile(OutputStream out, Duration period) {
-    CpuProfiler.start(out, period);
+  public static boolean startCpuProfile(OutputStream out, Duration period) {
+    return CpuProfiler.start(out, period);
   }
 
   /**
diff --git a/src/test/java/net/starlark/java/eval/CpuProfilerTest.java b/src/test/java/net/starlark/java/eval/CpuProfilerTest.java
@@ -45,7 +45,12 @@ public static void main(String[] args) throws Exception {
     // Start writing profile to temporary file.
     File profile = java.io.File.createTempFile("pprof", ".gz", null);
     OutputStream prof = new FileOutputStream(profile);
-    Starlark.startCpuProfile(prof, Duration.ofMillis(10));
+    boolean success = Starlark.startCpuProfile(prof, Duration.ofMillis(10));
+
+    if (!success) {
+      System.err.println("Failed to start cpu profiler");
+      System.exit(1);
+    }
 
     // This program consumes about 3s of CPU.
     ParserInput input =

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`import static java.nio.charset.StandardCharsets.UTF_8;`
`18`	`18`
`19`	`19`	`import com.google.common.collect.ImmutableList;`
	`20`	`+import com.google.common.flogger.GoogleLogger;`
`20`	`21`	`import java.io.ByteArrayOutputStream;`
`21`	`22`	`import java.io.FileDescriptor;`
`22`	`23`	`import java.io.FileInputStream;`
`@@ -93,6 +94,8 @@ final class CpuProfiler {`
`93`	`94`	`JNI.load();`
`94`	`95`	`}`
`95`	`96`
	`97`	`+ private static final GoogleLogger logger = GoogleLogger.forEnclosingClass();`
	`98`	`+`
`96`	`99`	`private final PprofWriter pprof;`
`97`	`100`
`98`	`101`	`private CpuProfiler(OutputStream out, Duration period) {`
`@@ -126,9 +129,10 @@ static StarlarkThread setStarlarkThread(StarlarkThread thread) {`
`126`	`129`	`}`
`127`	`130`
`128`	`131`	`/** Start the profiler. */`
`129`		`- static void start(OutputStream out, Duration period) {`
	`132`	`+ static boolean start(OutputStream out, Duration period) {`
`130`	`133`	`if (!supported()) {`
`131`		`- throw new UnsupportedOperationException("this platform does not support Starlark profiling");`
	`134`	`+ logger.atWarning().log("--starlark_cpu_profile is unsupported on this platform");`
	`135`	`+ return false;`
`132`	`136`	`}`
`133`	`137`	`if (instance != null) {`
`134`	`138`	`throw new IllegalStateException("profiler started twice without intervening stop");`
`@@ -140,6 +144,7 @@ static void start(OutputStream out, Duration period) {`
`140`	`144`	`}`
`141`	`145`
`142`	`146`	`instance = new CpuProfiler(out, period);`
	`147`	`+ return true;`
`143`	`148`	`}`
`144`	`149`
`145`	`150`	`/** Stop the profiler and wait for the log to be written. */`