commit 777b30d06700f76ba580715429f3663de3fa0529
author Klaus Aehlig <aehlig@google.com> Fri Feb 24 16:30:15 2017 +0000
committer Yue Gan <yueg@google.com> Mon Feb 27 15:05:00 2017 +0000
tree d3abdc6f42d04256c486270add24e5b0c5d3abbd
parent 25aa033ad5657a5cfa16e8307464648b9374be2d

Provide more reporting options to SkyFunctions 

With more specific information to be reported by Skyfunctions, e.g.,
to inform the build-event protocol on missing files, the EventHandler
interface is no longer enough. Therefore, provide an enriched context
for reporting events.

--
Change-Id: I2d06166fe4d5b9054e24ad8c752fafc039e3f9f8
Reviewed-on: https://cr.bazel.build/8794
PiperOrigin-RevId: 148463437
MOS_MIGRATED_REVID=148463437

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

diff --git a/src/main/java/com/google/devtools/build/skyframe/CyclesReporter.java b/src/main/java/com/google/devtools/build/skyframe/CyclesReporter.java
index c7aa46e..2a4e999 100644
--- a/src/main/java/com/google/devtools/build/skyframe/CyclesReporter.java
+++ b/src/main/java/com/google/devtools/build/skyframe/CyclesReporter.java
@@ -14,7 +14,7 @@
 package com.google.devtools.build.skyframe;
 
 import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.events.EventHandler;
+import com.google.devtools.build.lib.events.ExtendedEventHandler;
 import com.google.devtools.build.lib.util.Preconditions;
 
 /**
@@ -33,17 +33,20 @@
   public interface SingleCycleReporter {
 
     /**
-     * Reports the given cycle and returns {@code true}, or return {@code false} if this
-     * {@link SingleCycleReporter} doesn't know how to report the cycle.
+     * Reports the given cycle and returns {@code true}, or return {@code false} if this {@link
+     * SingleCycleReporter} doesn't know how to report the cycle.
      *
      * @param topLevelKey the top level key that transitively depended on the cycle
      * @param cycleInfo the cycle
-     * @param alreadyReported whether the cycle has already been reported to the
-     *        {@link CyclesReporter}.
+     * @param alreadyReported whether the cycle has already been reported to the {@link
+     *     CyclesReporter}.
      * @param eventHandler the eventHandler to which to report the error
      */
-    boolean maybeReportCycle(SkyKey topLevelKey, CycleInfo cycleInfo, boolean alreadyReported,
-        EventHandler eventHandler);
+    boolean maybeReportCycle(
+        SkyKey topLevelKey,
+        CycleInfo cycleInfo,
+        boolean alreadyReported,
+        ExtendedEventHandler eventHandler);
   }
 
   private final ImmutableList<SingleCycleReporter> cycleReporters;
@@ -64,8 +67,8 @@
    * @param topLevelKey This key represents the top level value key that returned cycle errors.
    * @param eventHandler the eventHandler to which to report the error
    */
-  public void reportCycles(Iterable<CycleInfo> cycles, SkyKey topLevelKey,
-      EventHandler eventHandler) {
+  public void reportCycles(
+      Iterable<CycleInfo> cycles, SkyKey topLevelKey, ExtendedEventHandler eventHandler) {
     Preconditions.checkNotNull(eventHandler);
     for (CycleInfo cycleInfo : cycles) {
       boolean alreadyReported = false;