Clear dirty output tree counters so that the next build does not get the old counters.

--
MOS_MIGRATED_REVID=90749273

2 files changed, 10 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
index 09a04d4011..77339bf641 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
@@ -414,8 +414,8 @@ public class ExecutionTool {
       }
 
       runtime.getEventBus().post(new ExecutionFinishedEvent(ImmutableMap.<String, Long> of(), 0L,
-          skyframeExecutor.getOutputDirtyFiles(),
-          skyframeExecutor.getModifiedFilesDuringPreviousBuild()));
+          skyframeExecutor.getOutputDirtyFilesAndClear(),
+          skyframeExecutor.getModifiedFilesDuringPreviousBuildAndClear()));
 
       // Disable system load polling (noop if it was not enabled).
       ResourceManager.instance().setAutoSensing(false);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index 3fb2ee87a4..c02e92d897 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -1516,11 +1516,15 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
     }
   }
 
-  public int getOutputDirtyFiles() {
-    return outputDirtyFiles;
+  public int getOutputDirtyFilesAndClear() {
+    int result = outputDirtyFiles;
+    outputDirtyFiles = 0;
+    return result;
   }
 
-  public int getModifiedFilesDuringPreviousBuild() {
-    return modifiedFilesDuringPreviousBuild;
+  public int getModifiedFilesDuringPreviousBuildAndClear() {
+    int result = modifiedFilesDuringPreviousBuild;
+    modifiedFilesDuringPreviousBuild = 0;
+    return result;
   }
 }