diff options
author | janakr <janakr@google.com> | 2017-11-21 07:35:05 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2017-11-21 07:36:51 -0800 |
commit | 3b5b55b37be37d8acb6f0d5573d09a9625c9d7fb (patch) | |
tree | d3136a33ce303c72225290c9512f1f814e4b968d /src/main/java | |
parent | 2d5035685a6180e6abfa7e93d7ee4b7ec0632510 (diff) |
Allow InMemoryNodeEntry subclasses to change which reverse dep operation to store bare.
PiperOrigin-RevId: 176505963
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java | 2 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/skyframe/KeyToConsolidate.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java b/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java index 130738db91..ee80c29637 100644 --- a/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java +++ b/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java @@ -351,7 +351,7 @@ public class InMemoryNodeEntry implements NodeEntry { reverseDepsDataToConsolidate.add(KeyToConsolidate.create(reverseDep, op, getOpToStoreBare())); } - private OpToStoreBare getOpToStoreBare() { + protected OpToStoreBare getOpToStoreBare() { return isDirty() ? OpToStoreBare.CHECK : OpToStoreBare.ADD; } diff --git a/src/main/java/com/google/devtools/build/skyframe/KeyToConsolidate.java b/src/main/java/com/google/devtools/build/skyframe/KeyToConsolidate.java index 5b18e61f6a..d8970c9b0b 100644 --- a/src/main/java/com/google/devtools/build/skyframe/KeyToConsolidate.java +++ b/src/main/java/com/google/devtools/build/skyframe/KeyToConsolidate.java @@ -31,7 +31,7 @@ import com.google.devtools.build.lib.concurrent.BlazeInterners; * entry during this evaluation (and will thus need to be signaled when this entry finishes * evaluating). */ -abstract class KeyToConsolidate { +public abstract class KeyToConsolidate { enum Op { /** * Assert that the reverse dep is already present in the set of reverse deps. If the entry is @@ -58,7 +58,8 @@ abstract class KeyToConsolidate { REMOVE_OLD } - enum OpToStoreBare { + /** The operation {@link ReverseDepsUtility} should store bare in pending reverse dep ops. */ + public enum OpToStoreBare { ADD(Op.ADD), CHECK(Op.CHECK); |