commit 6f094bb3573b4fa552223ce17a229a7f1fec9a62
author Nathan Harmata <nharmata@google.com> Thu Sep 03 19:27:38 2015 +0000
committer David Chen <dzc@google.com> Thu Sep 03 22:18:22 2015 +0000
tree 6a0403f63474805b3ae913958ae350c934d31826
parent a39ae267b69c015890aa0a38b04194e68a8ce67a

Add a method to EvaluationProgressReceiver for getting information on SkyFunction#compute calls.

--
MOS_MIGRATED_REVID=102268773

src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java

diff --git a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
index 88bd0ee..991dad6 100644
--- a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
@@ -720,9 +720,8 @@
       Preconditions.checkState(factory != null, "%s %s", functionName, state);
 
       SkyValue value = null;
-      Profiler.instance().startTask(ProfilerTask.SKYFUNCTION, skyKey);
+      long startTime = Profiler.nanoTimeMaybe();
       try {
-        // TODO(bazel-team): count how many of these calls returns null vs. non-null
         value = factory.compute(skyKey, env);
       } catch (final SkyFunctionException builderException) {
         ReifiedSkyFunctionException reifiedBuilderException =
@@ -762,7 +761,14 @@
         throw new RuntimeException(msg, re);
       } finally {
         env.doneBuilding();
-        Profiler.instance().completeTask(ProfilerTask.SKYFUNCTION);
+        long elapsedTimeNanos = Profiler.nanoTimeMaybe() - startTime;
+        if (elapsedTimeNanos > 0)  {
+          if (progressReceiver != null) {
+            progressReceiver.computed(skyKey, elapsedTimeNanos);
+          }
+          Profiler.instance().logSimpleTaskDuration(startTime, elapsedTimeNanos,
+              ProfilerTask.SKYFUNCTION, skyKey);
+        }
       }
 
       GroupedListHelper<SkyKey> newDirectDeps = env.newlyRequestedDeps;