Clean up event bus
...now that the ExtendedEventHandler can serve the same purpose.
--
PiperOrigin-RevId: 148640618
MOS_MIGRATED_REVID=148640618
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
index 3c764fa..a45a907 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
@@ -435,7 +435,6 @@
LoadingResult result =
loadingPhaseRunner.execute(
getReporter(),
- env.getEventBus(),
request.getTargets(),
env.getRelativeWorkingDirectory(),
request.getLoadingOptions(),
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseCompleteEvent.java
index 4f42c0f..315d243 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseCompleteEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseCompleteEvent.java
@@ -18,12 +18,13 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.cmdline.Label;
+import com.google.devtools.build.lib.events.ExtendedEventHandler;
import com.google.devtools.build.lib.packages.Target;
/**
* This event is fired after the loading phase is complete.
*/
-public final class LoadingPhaseCompleteEvent {
+public final class LoadingPhaseCompleteEvent implements ExtendedEventHandler.Postable {
private final ImmutableSet<Target> targets;
private final ImmutableSet<Target> filteredTargets;
private final PackageManager.PackageManagerStatistics pkgManagerStats;
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunner.java b/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunner.java
index cb1936e..3939751 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunner.java
@@ -15,7 +15,6 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
-import com.google.common.eventbus.EventBus;
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
import com.google.devtools.build.lib.cmdline.TargetParsingException;
import com.google.devtools.build.lib.events.Event;
@@ -50,7 +49,6 @@
/** Performs target pattern evaluation and test suite expansion (if requested). */
public abstract LoadingResult execute(
ExtendedEventHandler eventHandler,
- EventBus eventBus,
List<String> targetPatterns,
PathFragment relativeWorkingDirectory,
LoadingOptions options,
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/ParsingFailedEvent.java b/src/main/java/com/google/devtools/build/lib/pkgcache/ParsingFailedEvent.java
index 72009fd..64e7e02 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/ParsingFailedEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/ParsingFailedEvent.java
@@ -14,13 +14,15 @@
package com.google.devtools.build.lib.pkgcache;
+import com.google.devtools.build.lib.events.ExtendedEventHandler;
+
/**
* This event is fired when a target or target pattern fails to parse.
* In some cases (not all) this happens before targets are created,
* and thus in these cases there are no status lines.
* Therefore, the parse failure is reported separately.
*/
-public class ParsingFailedEvent {
+public class ParsingFailedEvent implements ExtendedEventHandler.Postable {
private final String targetPattern;
private final String message;
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/LegacyLoadingPhaseRunner.java b/src/main/java/com/google/devtools/build/lib/skyframe/LegacyLoadingPhaseRunner.java
index 8ba76ff..b2e4b5e 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/LegacyLoadingPhaseRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/LegacyLoadingPhaseRunner.java
@@ -16,7 +16,6 @@
import com.google.common.base.Stopwatch;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
-import com.google.common.eventbus.EventBus;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.cmdline.ResolvedTargets;
import com.google.devtools.build.lib.cmdline.TargetParsingException;
@@ -75,23 +74,21 @@
private static final class ParseFailureListenerImpl extends DelegatingEventHandler
implements ParseFailureListener, ExtendedEventHandler {
- private final EventBus eventBus;
+ private final ExtendedEventHandler eventHandler;
- private ParseFailureListenerImpl(ExtendedEventHandler delegate, EventBus eventBus) {
+ private ParseFailureListenerImpl(ExtendedEventHandler delegate) {
super(delegate);
- this.eventBus = eventBus;
+ this.eventHandler = delegate;
}
@Override
public void parsingError(String targetPattern, String message) {
- if (eventBus != null) {
- eventBus.post(new ParsingFailedEvent(targetPattern, message));
- }
+ eventHandler.post(new ParsingFailedEvent(targetPattern, message));
}
@Override
public void post(ExtendedEventHandler.Postable obj) {
- eventBus.post(obj);
+ eventHandler.post(obj);
}
}
@@ -115,7 +112,6 @@
@Override
public LoadingResult execute(
ExtendedEventHandler eventHandler,
- EventBus eventBus,
List<String> targetPatterns,
PathFragment relativeWorkingDirectory,
LoadingOptions options,
@@ -133,7 +129,7 @@
targetPatternEvaluator.updateOffset(relativeWorkingDirectory);
ExtendedEventHandler parseFailureListener =
- new ParseFailureListenerImpl(eventHandler, eventBus);
+ new ParseFailureListenerImpl(eventHandler);
// Determine targets to build:
ResolvedTargets<Target> targets =
getTargetsToBuild(
@@ -232,7 +228,7 @@
getWorkspaceName(eventHandler));
// This is the same code as SkyframeLoadingPhaseRunner.
- eventBus.post(
+ eventHandler.post(
new TargetParsingCompleteEvent(
patternParsingValue.getOriginalTargets(),
patternParsingValue.getFilteredTargets(),
@@ -243,7 +239,7 @@
if (callback != null) {
callback.notifyTargets(patternParsingValue.getTargets());
}
- eventBus.post(
+ eventHandler.post(
new LoadingPhaseCompleteEvent(
patternParsingValue.getTargets(),
patternParsingValue.getTestSuiteTargets(),
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/LoadingPhaseStartedEvent.java b/src/main/java/com/google/devtools/build/lib/skyframe/LoadingPhaseStartedEvent.java
index 88bb44b..9923215 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/LoadingPhaseStartedEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/LoadingPhaseStartedEvent.java
@@ -13,10 +13,12 @@
// limitations under the License.
package com.google.devtools.build.lib.skyframe;
+import com.google.devtools.build.lib.events.ExtendedEventHandler;
+
/**
* This event is fired at the beginning of the loading phase.
*/
-public final class LoadingPhaseStartedEvent {
+public final class LoadingPhaseStartedEvent implements ExtendedEventHandler.Postable {
final PackageProgressReceiver packageProgress;
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 bf7a64f..b54b32d 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
@@ -1859,7 +1859,6 @@
@Override
public LoadingResult execute(
ExtendedEventHandler eventHandler,
- EventBus eventBus,
List<String> targetPatterns,
PathFragment relativeWorkingDirectory,
LoadingOptions options,
@@ -1874,7 +1873,7 @@
ImmutableList.copyOf(options.buildTagFilterList),
TestFilter.forOptions(options, eventHandler, ruleClassNames));
EvaluationResult<TargetPatternPhaseValue> evalResult;
- eventBus.post(new LoadingPhaseStartedEvent(packageProgress));
+ eventHandler.post(new LoadingPhaseStartedEvent(packageProgress));
evalResult =
buildDriver.evaluate(ImmutableList.of(key), keepGoing, /*numThreads=*/ 10, eventHandler);
if (evalResult.hasError()) {
@@ -1900,7 +1899,7 @@
long time = timer.stop().elapsed(TimeUnit.MILLISECONDS);
TargetPatternPhaseValue patternParsingValue = evalResult.get(key);
- eventBus.post(
+ eventHandler.post(
new TargetParsingCompleteEvent(
patternParsingValue.getOriginalTargets(),
patternParsingValue.getFilteredTargets(),
@@ -1911,7 +1910,7 @@
if (callback != null) {
callback.notifyTargets(patternParsingValue.getTargets());
}
- eventBus.post(new LoadingPhaseCompleteEvent(
+ eventHandler.post(new LoadingPhaseCompleteEvent(
patternParsingValue.getTargets(), patternParsingValue.getTestSuiteTargets(),
packageManager.getStatistics(), /*timeInMs=*/0));
return patternParsingValue.toLoadingResult();
