Fixed EvaluationProgressReceiver object names
EvaluationProgressReceiver objects have two common naming schemes
currently, and calling them invalidationReceiver is misleading, so to
make the naming convention standard, all object names are based on
"progressReceiver."
--
MOS_MIGRATED_REVID=134411011
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
index 2d95ca3..e9ec6f4 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
@@ -97,8 +97,8 @@
// This hack allows us to see when a configured target has been invalidated, and thus when the set
// of artifact conflicts needs to be recomputed (whenever a configured target has been invalidated
// or newly evaluated).
- private final EvaluationProgressReceiver invalidationReceiver =
- new ConfiguredTargetValueInvalidationReceiver();
+ private final EvaluationProgressReceiver progressReceiver =
+ new ConfiguredTargetValueProgressReceiver();
private final Set<SkyKey> evaluatedConfiguredTargets = Sets.newConcurrentHashSet();
// Used to see if checks of graph consistency need to be done after analysis.
private volatile boolean someConfiguredTargetEvaluated = false;
@@ -545,8 +545,8 @@
* Hack to invalidate actions in legacy action graph when their values are invalidated in
* skyframe.
*/
- EvaluationProgressReceiver getInvalidationReceiver() {
- return invalidationReceiver;
+ EvaluationProgressReceiver getProgressReceiver() {
+ return progressReceiver;
}
/** Clear the invalidated configured targets detected during loading and analysis phases. */
@@ -589,7 +589,7 @@
this.enableAnalysis = enable;
}
- private class ConfiguredTargetValueInvalidationReceiver implements EvaluationProgressReceiver {
+ private class ConfiguredTargetValueProgressReceiver implements EvaluationProgressReceiver {
@Override
public void invalidated(SkyKey skyKey, InvalidationState state) {
if (skyKey.functionName().equals(SkyFunctions.CONFIGURED_TARGET)) {
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 5b805b3..8f91b50 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
@@ -1885,7 +1885,7 @@
if (ignoreInvalidations) {
return;
}
- skyframeBuildView.getInvalidationReceiver().invalidated(skyKey, state);
+ skyframeBuildView.getProgressReceiver().invalidated(skyKey, state);
}
@Override
@@ -1893,7 +1893,7 @@
if (ignoreInvalidations) {
return;
}
- skyframeBuildView.getInvalidationReceiver().enqueueing(skyKey);
+ skyframeBuildView.getProgressReceiver().enqueueing(skyKey);
if (executionProgressReceiver != null) {
executionProgressReceiver.enqueueing(skyKey);
}
@@ -1907,7 +1907,7 @@
if (ignoreInvalidations) {
return;
}
- skyframeBuildView.getInvalidationReceiver().evaluated(skyKey, valueSupplier, state);
+ skyframeBuildView.getProgressReceiver().evaluated(skyKey, valueSupplier, state);
if (executionProgressReceiver != null) {
executionProgressReceiver.evaluated(skyKey, valueSupplier, state);
}
diff --git a/src/main/java/com/google/devtools/build/skyframe/EagerInvalidator.java b/src/main/java/com/google/devtools/build/skyframe/EagerInvalidator.java
index 71537e8..bff6850 100644
--- a/src/main/java/com/google/devtools/build/skyframe/EagerInvalidator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/EagerInvalidator.java
@@ -44,14 +44,14 @@
public static void delete(
InMemoryGraph graph,
Iterable<SkyKey> diff,
- EvaluationProgressReceiver invalidationReceiver,
+ EvaluationProgressReceiver progressReceiver,
InvalidationState state,
boolean traverseGraph,
DirtyKeyTracker dirtyKeyTracker)
throws InterruptedException {
DeletingNodeVisitor visitor =
createDeletingVisitorIfNeeded(
- graph, diff, invalidationReceiver, state, traverseGraph, dirtyKeyTracker);
+ graph, diff, progressReceiver, state, traverseGraph, dirtyKeyTracker);
if (visitor != null) {
visitor.run();
}
@@ -61,13 +61,13 @@
static DeletingNodeVisitor createDeletingVisitorIfNeeded(
InMemoryGraph graph,
Iterable<SkyKey> diff,
- EvaluationProgressReceiver invalidationReceiver,
+ EvaluationProgressReceiver progressReceiver,
InvalidationState state,
boolean traverseGraph,
DirtyKeyTracker dirtyKeyTracker) {
state.update(diff);
return state.isEmpty() ? null
- : new DeletingNodeVisitor(graph, invalidationReceiver, state, traverseGraph,
+ : new DeletingNodeVisitor(graph, progressReceiver, state, traverseGraph,
dirtyKeyTracker);
}
@@ -75,13 +75,13 @@
static DirtyingNodeVisitor createInvalidatingVisitorIfNeeded(
QueryableGraph graph,
Iterable<SkyKey> diff,
- EvaluationProgressReceiver invalidationReceiver,
+ EvaluationProgressReceiver progressReceiver,
InvalidationState state,
DirtyKeyTracker dirtyKeyTracker,
Function<ExecutorParams, ? extends ExecutorService> executorFactory) {
state.update(diff);
return state.isEmpty() ? null
- : new DirtyingNodeVisitor(graph, invalidationReceiver, state, dirtyKeyTracker,
+ : new DirtyingNodeVisitor(graph, progressReceiver, state, dirtyKeyTracker,
executorFactory);
}
@@ -89,7 +89,7 @@
private static DirtyingNodeVisitor createInvalidatingVisitorIfNeeded(
QueryableGraph graph,
Iterable<SkyKey> diff,
- EvaluationProgressReceiver invalidationReceiver,
+ EvaluationProgressReceiver progressReceiver,
InvalidationState state,
DirtyKeyTracker dirtyKeyTracker,
ForkJoinPool forkJoinPool,
@@ -100,7 +100,7 @@
? null
: new DirtyingNodeVisitor(
graph,
- invalidationReceiver,
+ progressReceiver,
state,
dirtyKeyTracker,
forkJoinPool,
@@ -114,14 +114,14 @@
public static void invalidate(
QueryableGraph graph,
Iterable<SkyKey> diff,
- EvaluationProgressReceiver invalidationReceiver,
+ EvaluationProgressReceiver progressReceiver,
InvalidationState state,
DirtyKeyTracker dirtyKeyTracker,
Function<ExecutorParams, ? extends ExecutorService> executorFactory)
throws InterruptedException {
DirtyingNodeVisitor visitor =
createInvalidatingVisitorIfNeeded(
- graph, diff, invalidationReceiver, state, dirtyKeyTracker, executorFactory);
+ graph, diff, progressReceiver, state, dirtyKeyTracker, executorFactory);
if (visitor != null) {
visitor.run();
}
@@ -134,7 +134,7 @@
public static void invalidate(
QueryableGraph graph,
Iterable<SkyKey> diff,
- EvaluationProgressReceiver invalidationReceiver,
+ EvaluationProgressReceiver progressReceiver,
InvalidationState state,
DirtyKeyTracker dirtyKeyTracker,
ForkJoinPool forkJoinPool,
@@ -144,7 +144,7 @@
createInvalidatingVisitorIfNeeded(
graph,
diff,
- invalidationReceiver,
+ progressReceiver,
state,
dirtyKeyTracker,
forkJoinPool,
@@ -159,11 +159,11 @@
public static void invalidate(
QueryableGraph graph,
Iterable<SkyKey> diff,
- EvaluationProgressReceiver invalidationReceiver,
+ EvaluationProgressReceiver progressReceiver,
InvalidationState state,
DirtyKeyTracker dirtyKeyTracker)
throws InterruptedException {
- invalidate(graph, diff, invalidationReceiver, state, dirtyKeyTracker,
+ invalidate(graph, diff, progressReceiver, state, dirtyKeyTracker,
AbstractQueueVisitor.EXECUTOR_FACTORY);
}
diff --git a/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java
index 2545487..317c631 100644
--- a/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java
@@ -85,19 +85,19 @@
public InMemoryMemoizingEvaluator(
Map<SkyFunctionName, ? extends SkyFunction> skyFunctions,
Differencer differencer,
- @Nullable EvaluationProgressReceiver invalidationReceiver) {
- this(skyFunctions, differencer, invalidationReceiver, new EmittedEventState(), true);
+ @Nullable EvaluationProgressReceiver progressReceiver) {
+ this(skyFunctions, differencer, progressReceiver, new EmittedEventState(), true);
}
public InMemoryMemoizingEvaluator(
Map<SkyFunctionName, ? extends SkyFunction> skyFunctions,
Differencer differencer,
- @Nullable EvaluationProgressReceiver invalidationReceiver,
+ @Nullable EvaluationProgressReceiver progressReceiver,
EmittedEventState emittedEventState,
boolean keepEdges) {
this.skyFunctions = ImmutableMap.copyOf(skyFunctions);
this.differencer = Preconditions.checkNotNull(differencer);
- this.progressReceiver = invalidationReceiver;
+ this.progressReceiver = progressReceiver;
this.graph = new InMemoryGraphImpl(keepEdges);
this.emittedEventState = emittedEventState;
this.keepEdges = keepEdges;
@@ -388,11 +388,11 @@
public MemoizingEvaluator create(
ImmutableMap<SkyFunctionName, ? extends SkyFunction> skyFunctions,
Differencer differencer,
- @Nullable EvaluationProgressReceiver invalidationReceiver,
+ @Nullable EvaluationProgressReceiver progressReceiver,
EmittedEventState emittedEventState,
boolean keepEdges) {
return new InMemoryMemoizingEvaluator(
- skyFunctions, differencer, invalidationReceiver, emittedEventState, keepEdges);
+ skyFunctions, differencer, progressReceiver, emittedEventState, keepEdges);
}
};
}
diff --git a/src/main/java/com/google/devtools/build/skyframe/InvalidatingNodeVisitor.java b/src/main/java/com/google/devtools/build/skyframe/InvalidatingNodeVisitor.java
index 075274d..5a7f989 100644
--- a/src/main/java/com/google/devtools/build/skyframe/InvalidatingNodeVisitor.java
+++ b/src/main/java/com/google/devtools/build/skyframe/InvalidatingNodeVisitor.java
@@ -80,7 +80,7 @@
};
protected final TGraph graph;
- @Nullable protected final EvaluationProgressReceiver invalidationReceiver;
+ @Nullable protected final EvaluationProgressReceiver progressReceiver;
protected final DirtyKeyTracker dirtyKeyTracker;
// Aliased to InvalidationState.pendingVisitations.
protected final Set<Pair<SkyKey, InvalidationType>> pendingVisitations;
@@ -88,16 +88,16 @@
protected InvalidatingNodeVisitor(
TGraph graph,
- @Nullable EvaluationProgressReceiver invalidationReceiver,
+ @Nullable EvaluationProgressReceiver progressReceiver,
InvalidationState state,
DirtyKeyTracker dirtyKeyTracker) {
this(
- graph, invalidationReceiver, state, dirtyKeyTracker, AbstractQueueVisitor.EXECUTOR_FACTORY);
+ graph, progressReceiver, state, dirtyKeyTracker, AbstractQueueVisitor.EXECUTOR_FACTORY);
}
protected InvalidatingNodeVisitor(
TGraph graph,
- @Nullable EvaluationProgressReceiver invalidationReceiver,
+ @Nullable EvaluationProgressReceiver progressReceiver,
InvalidationState state,
DirtyKeyTracker dirtyKeyTracker,
Function<ExecutorParams, ? extends ExecutorService> executorFactory) {
@@ -112,14 +112,14 @@
executorFactory,
errorClassifier);
this.graph = Preconditions.checkNotNull(graph);
- this.invalidationReceiver = invalidationReceiver;
+ this.progressReceiver = progressReceiver;
this.dirtyKeyTracker = Preconditions.checkNotNull(dirtyKeyTracker);
this.pendingVisitations = state.pendingValues;
}
protected InvalidatingNodeVisitor(
TGraph graph,
- @Nullable EvaluationProgressReceiver invalidationReceiver,
+ @Nullable EvaluationProgressReceiver progressReceiver,
InvalidationState state,
DirtyKeyTracker dirtyKeyTracker,
ForkJoinPool forkJoinPool) {
@@ -128,7 +128,7 @@
.setErrorClassifier(errorClassifier)
.build();
this.graph = Preconditions.checkNotNull(graph);
- this.invalidationReceiver = invalidationReceiver;
+ this.progressReceiver = progressReceiver;
this.dirtyKeyTracker = Preconditions.checkNotNull(dirtyKeyTracker);
this.pendingVisitations = state.pendingValues;
}
@@ -162,10 +162,10 @@
return executor.getInterruptionLatchForTestingOnly();
}
- protected void informInvalidationReceiver(SkyKey key,
+ protected void informProgressReceiver(SkyKey key,
EvaluationProgressReceiver.InvalidationState state) {
- if (invalidationReceiver != null) {
- invalidationReceiver.invalidated(key, state);
+ if (progressReceiver != null) {
+ progressReceiver.invalidated(key, state);
}
}
@@ -242,11 +242,11 @@
DeletingNodeVisitor(
InMemoryGraph graph,
- EvaluationProgressReceiver invalidationReceiver,
+ EvaluationProgressReceiver progressReceiver,
InvalidationState state,
boolean traverseGraph,
DirtyKeyTracker dirtyKeyTracker) {
- super(graph, invalidationReceiver, state, dirtyKeyTracker);
+ super(graph, progressReceiver, state, dirtyKeyTracker);
this.traverseGraph = traverseGraph;
}
@@ -353,7 +353,7 @@
}
// Allow custom key-specific logic to update dirtiness status.
- informInvalidationReceiver(
+ informProgressReceiver(
key, EvaluationProgressReceiver.InvalidationState.DELETED);
// Actually remove the node.
graph.remove(key);
@@ -382,11 +382,11 @@
protected DirtyingNodeVisitor(
QueryableGraph graph,
- EvaluationProgressReceiver invalidationReceiver,
+ EvaluationProgressReceiver progressReceiver,
InvalidationState state,
DirtyKeyTracker dirtyKeyTracker,
Function<ExecutorParams, ? extends ExecutorService> executorFactory) {
- super(graph, invalidationReceiver, state, dirtyKeyTracker, executorFactory);
+ super(graph, progressReceiver, state, dirtyKeyTracker, executorFactory);
this.supportInterruptions = true;
}
@@ -396,12 +396,12 @@
*/
protected DirtyingNodeVisitor(
QueryableGraph graph,
- EvaluationProgressReceiver invalidationReceiver,
+ EvaluationProgressReceiver progressReceiver,
InvalidationState state,
DirtyKeyTracker dirtyKeyTracker,
ForkJoinPool forkJoinPool,
boolean supportInterruptions) {
- super(graph, invalidationReceiver, state, dirtyKeyTracker, forkJoinPool);
+ super(graph, progressReceiver, state, dirtyKeyTracker, forkJoinPool);
this.supportInterruptions = supportInterruptions;
}
@@ -526,7 +526,7 @@
// only be marked dirty (because only a dependency of theirs has changed).
visit(markedDirtyResult.getReverseDepsUnsafe(), InvalidationType.DIRTIED, key);
- informInvalidationReceiver(key, EvaluationProgressReceiver.InvalidationState.DIRTY);
+ informProgressReceiver(key, EvaluationProgressReceiver.InvalidationState.DIRTY);
dirtyKeyTracker.dirty(key);
// Remove the node from the set as the last operation.
if (supportInterruptions) {
diff --git a/src/main/java/com/google/devtools/build/skyframe/MemoizingEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/MemoizingEvaluator.java
index 5c8236a..114ccb4 100644
--- a/src/main/java/com/google/devtools/build/skyframe/MemoizingEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/MemoizingEvaluator.java
@@ -148,7 +148,7 @@
MemoizingEvaluator create(
ImmutableMap<SkyFunctionName, ? extends SkyFunction> skyFunctions,
Differencer differencer,
- @Nullable EvaluationProgressReceiver invalidationReceiver,
+ @Nullable EvaluationProgressReceiver progressReceiver,
EmittedEventState emittedEventState,
boolean keepEdges);
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java
index 7f08e04..968406c 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java
@@ -58,12 +58,12 @@
public class SkyframeAwareActionTest extends TimestampBuilderTestCase {
private Builder builder;
private Executor executor;
- private TrackingEvaluationProgressReceiver invalidationReceiver;
+ private TrackingEvaluationProgressReceiver progressReceiver;
@Before
public final void createBuilder() throws Exception {
- invalidationReceiver = new TrackingEvaluationProgressReceiver();
- builder = createBuilder(inMemoryCache, 1, /*keepGoing=*/ false, invalidationReceiver);
+ progressReceiver = new TrackingEvaluationProgressReceiver();
+ builder = createBuilder(inMemoryCache, 1, /*keepGoing=*/ false, progressReceiver);
}
@Before
@@ -396,7 +396,7 @@
// Sanity check that our invalidation receiver is working correctly. We'll rely on it again.
SkyKey actionKey = ActionExecutionValue.key(action);
TrackingEvaluationProgressReceiver.EvaluatedEntry evaluatedAction =
- invalidationReceiver.getEvalutedEntry(actionKey);
+ progressReceiver.getEvalutedEntry(actionKey);
assertThat(evaluatedAction).isNotNull();
SkyValue actionValue = evaluatedAction.value;
@@ -407,7 +407,7 @@
betweenBuilds.call();
// Rebuild the output.
- invalidationReceiver.reset();
+ progressReceiver.reset();
builder.buildArtifacts(
reporter,
ImmutableSet.of(actionOutput),
@@ -422,10 +422,10 @@
null);
if (expectActionIs.dirtied()) {
- assertThat(invalidationReceiver.wasInvalidated(actionKey)).isTrue();
+ assertThat(progressReceiver.wasInvalidated(actionKey)).isTrue();
TrackingEvaluationProgressReceiver.EvaluatedEntry newEntry =
- invalidationReceiver.getEvalutedEntry(actionKey);
+ progressReceiver.getEvalutedEntry(actionKey);
assertThat(newEntry).isNotNull();
if (expectActionIs.actuallyClean()) {
// Action was dirtied but verified clean.
@@ -439,7 +439,7 @@
}
} else {
// Action was not dirtied.
- assertThat(invalidationReceiver.wasInvalidated(actionKey)).isFalse();
+ assertThat(progressReceiver.wasInvalidated(actionKey)).isFalse();
}
// Assert that the action was executed the right number of times. Whether the action execution
diff --git a/src/test/java/com/google/devtools/build/skyframe/BUILD b/src/test/java/com/google/devtools/build/skyframe/BUILD
index 4286728..496678a 100644
--- a/src/test/java/com/google/devtools/build/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/skyframe/BUILD
@@ -9,7 +9,7 @@
"GraphTester.java",
"GenericFunctionException.java",
"SomeErrorException.java",
- "TrackingInvalidationReceiver.java",
+ "TrackingProgressReceiver.java",
"WalkableGraphUtils.java",
# Truth Subject, SubjectFactory, and Graph files.
] + glob(["*Subject.java"]) + glob(["*SubjectFactory.java"]) + glob(["*Graph.java"]) + glob(["*Helper.java"])
diff --git a/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java b/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java
index fb3058c1..63fbee7 100644
--- a/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java
@@ -85,7 +85,7 @@
@SuppressWarnings("unused") // Overridden by subclasses.
void invalidate(
- InMemoryGraph graph, EvaluationProgressReceiver invalidationReceiver, SkyKey... keys)
+ InMemoryGraph graph, EvaluationProgressReceiver progressReceiver, SkyKey... keys)
throws InterruptedException {
throw new UnsupportedOperationException();
}
@@ -164,9 +164,9 @@
return evaluator.eval(ImmutableList.copyOf(keys));
}
- protected void invalidateWithoutError(@Nullable EvaluationProgressReceiver invalidationReceiver,
+ protected void invalidateWithoutError(@Nullable EvaluationProgressReceiver progressReceiver,
SkyKey... keys) throws InterruptedException {
- invalidate(graph, invalidationReceiver, keys);
+ invalidate(graph, progressReceiver, keys);
assertTrue(state.isEmpty());
}
@@ -604,12 +604,12 @@
public static class DeletingInvalidatorTest extends EagerInvalidatorTest {
@Override
protected void invalidate(
- InMemoryGraph graph, EvaluationProgressReceiver invalidationReceiver, SkyKey... keys)
+ InMemoryGraph graph, EvaluationProgressReceiver progressReceiver, SkyKey... keys)
throws InterruptedException {
Iterable<SkyKey> diff = ImmutableList.copyOf(keys);
DeletingNodeVisitor deletingNodeVisitor =
EagerInvalidator.createDeletingVisitorIfNeeded(
- graph, diff, invalidationReceiver, state, true, dirtyKeyTracker);
+ graph, diff, progressReceiver, state, true, dirtyKeyTracker);
if (deletingNodeVisitor != null) {
visitor.set(deletingNodeVisitor);
deletingNodeVisitor.run();
@@ -644,7 +644,7 @@
@Test
public void dirtyKeyTrackerWorksWithDeletingInvalidator() throws Exception {
setupInvalidatableGraph();
- TrackingInvalidationReceiver receiver = new TrackingInvalidationReceiver();
+ TrackingProgressReceiver receiver = new TrackingProgressReceiver();
// Dirty the node, and ensure that the tracker is aware of it:
Iterable<SkyKey> diff1 = ImmutableList.of(skyKey("a"));
@@ -675,14 +675,14 @@
public static class DirtyingInvalidatorTest extends EagerInvalidatorTest {
@Override
protected void invalidate(
- InMemoryGraph graph, EvaluationProgressReceiver invalidationReceiver, SkyKey... keys)
+ InMemoryGraph graph, EvaluationProgressReceiver progressReceiver, SkyKey... keys)
throws InterruptedException {
Iterable<SkyKey> diff = ImmutableList.copyOf(keys);
DirtyingNodeVisitor dirtyingNodeVisitor =
EagerInvalidator.createInvalidatingVisitorIfNeeded(
graph,
diff,
- invalidationReceiver,
+ progressReceiver,
state,
dirtyKeyTracker,
AbstractQueueVisitor.EXECUTOR_FACTORY);
@@ -720,7 +720,7 @@
@Test
public void dirtyKeyTrackerWorksWithDirtyingInvalidator() throws Exception {
setupInvalidatableGraph();
- TrackingInvalidationReceiver receiver = new TrackingInvalidationReceiver();
+ TrackingProgressReceiver receiver = new TrackingProgressReceiver();
// Dirty the node, and ensure that the tracker is aware of it:
invalidate(graph, receiver, skyKey("a"));
diff --git a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
index 704ba33..23200e2 100644
--- a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
@@ -101,11 +101,11 @@
TrackingAwaiter.INSTANCE.assertNoErrors();
}
- private void initializeTester(@Nullable TrackingInvalidationReceiver customInvalidationReceiver) {
+ private void initializeTester(@Nullable TrackingProgressReceiver customProgressReceiver) {
emittedEventState = new MemoizingEvaluator.EmittedEventState();
tester = new MemoizingEvaluatorTester();
- if (customInvalidationReceiver != null) {
- tester.setInvalidationReceiver(customInvalidationReceiver);
+ if (customProgressReceiver != null) {
+ tester.setProgressReceiver(customProgressReceiver);
}
tester.initialize();
}
@@ -113,9 +113,9 @@
protected MemoizingEvaluator getMemoizingEvaluator(
Map<SkyFunctionName, ? extends SkyFunction> functions,
Differencer differencer,
- EvaluationProgressReceiver invalidationReceiver) {
+ EvaluationProgressReceiver progressReceiver) {
return new InMemoryMemoizingEvaluator(
- functions, differencer, invalidationReceiver, emittedEventState, true);
+ functions, differencer, progressReceiver, emittedEventState, true);
}
protected BuildDriver getBuildDriver(MemoizingEvaluator evaluator) {
@@ -749,7 +749,7 @@
tester.getOrCreate(mid).setHasError(true);
tester.eval(/*keepGoing=*/false, top, mid);
assertEquals(0L, valueSet.getCount());
- assertThat(tester.invalidationReceiver.evaluated).containsExactly(mid);
+ assertThat(tester.progressReceiver.evaluated).containsExactly(mid);
}
@Test
@@ -761,12 +761,12 @@
tester.getOrCreate(cycle).addDependency(cycle);
tester.getOrCreate(top).addDependency(leaf).addDependency(cycle);
tester.eval(/*keepGoing=*/true, top);
- assertThat(tester.invalidationReceiver.evaluated).containsExactly(leaf, top, cycle);
- tester.invalidationReceiver.clear();
+ assertThat(tester.progressReceiver.evaluated).containsExactly(leaf, top, cycle);
+ tester.progressReceiver.clear();
tester.getOrCreate(leaf, /*markAsModified=*/true);
tester.invalidate();
tester.eval(/*keepGoing=*/true, top);
- assertThat(tester.invalidationReceiver.evaluated).containsExactly(leaf, top);
+ assertThat(tester.progressReceiver.evaluated).containsExactly(leaf, top);
}
@Test
@@ -2560,7 +2560,7 @@
public void deletingDirtyNodes() throws Exception {
final Thread thread = Thread.currentThread();
final AtomicBoolean interruptInvalidation = new AtomicBoolean(false);
- initializeTester(new TrackingInvalidationReceiver() {
+ initializeTester(new TrackingProgressReceiver() {
private final AtomicBoolean firstInvalidation = new AtomicBoolean(true);
@Override
@@ -3960,9 +3960,9 @@
*/
@Test
public void shutDownBuildOnCachedError_Verified() throws Exception {
- // TrackingInvalidationReceiver does unnecessary examination of node values.
+ // TrackingProgressReceiver does unnecessary examination of node values.
initializeTester(
- new TrackingInvalidationReceiver() {
+ new TrackingProgressReceiver() {
@Override
public void evaluated(
SkyKey skyKey, Supplier<SkyValue> skyValueSupplier, EvaluationState state) {
@@ -4095,9 +4095,9 @@
*/
@Test
public void cachedErrorCausesRestart() throws Exception {
- // TrackingInvalidationReceiver does unnecessary examination of node values.
+ // TrackingProgressReceiver does unnecessary examination of node values.
initializeTester(
- new TrackingInvalidationReceiver() {
+ new TrackingProgressReceiver() {
@Override
public void evaluated(
SkyKey skyKey, Supplier<SkyValue> skyValueSupplier, EvaluationState state) {
@@ -4426,23 +4426,23 @@
private RecordingDifferencer differencer = new RecordingDifferencer();
private MemoizingEvaluator evaluator;
private BuildDriver driver;
- private TrackingInvalidationReceiver invalidationReceiver = new TrackingInvalidationReceiver();
+ private TrackingProgressReceiver progressReceiver = new TrackingProgressReceiver();
public void initialize() {
this.evaluator =
- getMemoizingEvaluator(getSkyFunctionMap(), differencer, invalidationReceiver);
+ getMemoizingEvaluator(getSkyFunctionMap(), differencer, progressReceiver);
this.driver = getBuildDriver(evaluator);
}
- public void setInvalidationReceiver(TrackingInvalidationReceiver customInvalidationReceiver) {
+ public void setProgressReceiver(TrackingProgressReceiver customProgressReceiver) {
Preconditions.checkState(evaluator == null, "evaluator already initialized");
- invalidationReceiver = customInvalidationReceiver;
+ progressReceiver = customProgressReceiver;
}
public void invalidate() {
differencer.invalidate(getModifiedValues());
clearModifiedValues();
- invalidationReceiver.clear();
+ progressReceiver.clear();
}
public void invalidateTransientErrors() {
@@ -4458,15 +4458,15 @@
}
public Set<SkyKey> getDirtyKeys() {
- return invalidationReceiver.dirty;
+ return progressReceiver.dirty;
}
public Set<SkyKey> getDeletedKeys() {
- return invalidationReceiver.deleted;
+ return progressReceiver.deleted;
}
public Set<SkyKey> getEnqueuedValues() {
- return invalidationReceiver.enqueued;
+ return progressReceiver.enqueued;
}
public <T extends SkyValue> EvaluationResult<T> eval(
diff --git a/src/test/java/com/google/devtools/build/skyframe/TrackingInvalidationReceiver.java b/src/test/java/com/google/devtools/build/skyframe/TrackingProgressReceiver.java
similarity index 95%
rename from src/test/java/com/google/devtools/build/skyframe/TrackingInvalidationReceiver.java
rename to src/test/java/com/google/devtools/build/skyframe/TrackingProgressReceiver.java
index b46c8be..ba922f7 100644
--- a/src/test/java/com/google/devtools/build/skyframe/TrackingInvalidationReceiver.java
+++ b/src/test/java/com/google/devtools/build/skyframe/TrackingProgressReceiver.java
@@ -22,7 +22,7 @@
/**
* A testing utility to keep track of evaluation.
*/
-public class TrackingInvalidationReceiver implements EvaluationProgressReceiver {
+public class TrackingProgressReceiver implements EvaluationProgressReceiver {
public final Set<SkyKey> dirty = Sets.newConcurrentHashSet();
public final Set<SkyKey> deleted = Sets.newConcurrentHashSet();
public final Set<SkyKey> enqueued = Sets.newConcurrentHashSet();
