diff options
10 files changed, 21 insertions, 26 deletions
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 3c764fabe2..a45a907e30 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 @@ public final class BuildTool { 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 4f42c0fe8d..315d2437f5 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.base.Preconditions; 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 cb1936e062..39397513f0 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 @@ package com.google.devtools.build.lib.pkgcache; 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 @@ public abstract class LoadingPhaseRunner { /** 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 72009fd320..64e7e02c03 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 8ba76ffbbf..b2e4b5efb3 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 @@ package com.google.devtools.build.lib.skyframe; 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 @@ public final class LegacyLoadingPhaseRunner extends LoadingPhaseRunner { 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 @@ public final class LegacyLoadingPhaseRunner extends LoadingPhaseRunner { @Override public LoadingResult execute( ExtendedEventHandler eventHandler, - EventBus eventBus, List<String> targetPatterns, PathFragment relativeWorkingDirectory, LoadingOptions options, @@ -133,7 +129,7 @@ public final class LegacyLoadingPhaseRunner extends LoadingPhaseRunner { targetPatternEvaluator.updateOffset(relativeWorkingDirectory); ExtendedEventHandler parseFailureListener = - new ParseFailureListenerImpl(eventHandler, eventBus); + new ParseFailureListenerImpl(eventHandler); // Determine targets to build: ResolvedTargets<Target> targets = getTargetsToBuild( @@ -232,7 +228,7 @@ public final class LegacyLoadingPhaseRunner extends LoadingPhaseRunner { getWorkspaceName(eventHandler)); // This is the same code as SkyframeLoadingPhaseRunner. - eventBus.post( + eventHandler.post( new TargetParsingCompleteEvent( patternParsingValue.getOriginalTargets(), patternParsingValue.getFilteredTargets(), @@ -243,7 +239,7 @@ public final class LegacyLoadingPhaseRunner extends LoadingPhaseRunner { 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 88bb44bfa9..9923215b11 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 bf7a64fcaf..b54b32daf9 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 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { @Override public LoadingResult execute( ExtendedEventHandler eventHandler, - EventBus eventBus, List<String> targetPatterns, PathFragment relativeWorkingDirectory, LoadingOptions options, @@ -1874,7 +1873,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { 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 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { 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 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { 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(); diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java index 98a91b8378..d877c41fdb 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java @@ -331,7 +331,6 @@ public abstract class AnalysisTestCase extends FoundationTestCase { LoadingResult loadingResult = loadingPhaseRunner.execute( reporter, - eventBus, ImmutableList.copyOf(labels), PathFragment.EMPTY_FRAGMENT, loadingOptions, diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java index 5d475a20be..42b0ca0dc0 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java @@ -1486,7 +1486,6 @@ public abstract class BuildViewTestCase extends FoundationTestCase { LoadingResult loadingResult = runner.execute( reporter, - eventBus, targets, PathFragment.EMPTY_FRAGMENT, loadingOptions, diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java index bd06f06a22..9b1b4dc214 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java @@ -38,6 +38,7 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.TargetParsingException; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventKind; +import com.google.devtools.build.lib.events.Reporter; import com.google.devtools.build.lib.events.StoredEventHandler; import com.google.devtools.build.lib.packages.ConstantRuleVisibility; import com.google.devtools.build.lib.packages.PackageFactory; @@ -671,8 +672,7 @@ public class LoadingPhaseRunnerTest { eventBus.register(listener); result = loadingPhaseRunner.execute( - storedErrors, - eventBus, + new Reporter(eventBus, storedErrors), ImmutableList.copyOf(patterns), PathFragment.EMPTY_FRAGMENT, options, |