aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java123
1 files changed, 61 insertions, 62 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
index c28bcad28d..000f21f015 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
@@ -21,11 +21,9 @@ import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSetMultimap;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
import com.google.devtools.build.lib.analysis.BlazeDirectories;
import com.google.devtools.build.lib.analysis.BuildView;
@@ -41,6 +39,9 @@ import com.google.devtools.build.lib.packages.Preprocessor;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.profiler.Profiler;
+import com.google.devtools.build.lib.skyframe.DirtinessCheckerUtils.BasicFilesystemDirtinessChecker;
+import com.google.devtools.build.lib.skyframe.DirtinessCheckerUtils.MissingDiffDirtinessChecker;
+import com.google.devtools.build.lib.skyframe.DirtinessCheckerUtils.UnionDirtinessChecker;
import com.google.devtools.build.lib.util.AbruptExitException;
import com.google.devtools.build.lib.util.Pair;
import com.google.devtools.build.lib.util.ResourceUsage;
@@ -48,7 +49,6 @@ import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
import com.google.devtools.build.lib.vfs.ModifiedFileSet;
import com.google.devtools.build.lib.vfs.Path;
import com.google.devtools.build.lib.vfs.PathFragment;
-import com.google.devtools.build.lib.vfs.RootedPath;
import com.google.devtools.build.skyframe.BuildDriver;
import com.google.devtools.build.skyframe.Differencer;
import com.google.devtools.build.skyframe.ImmutableDiff;
@@ -65,7 +65,7 @@ import com.google.devtools.build.skyframe.SkyValue;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.List;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
@@ -93,22 +93,39 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor {
private RecordingDifferencer recordingDiffer;
private final DiffAwarenessManager diffAwarenessManager;
+ private final Iterable<SkyValueDirtinessChecker> customDirtinessCheckers;
- private SequencedSkyframeExecutor(Reporter reporter, EvaluatorSupplier evaluatorSupplier,
- PackageFactory pkgFactory, TimestampGranularityMonitor tsgm,
- BlazeDirectories directories, Factory workspaceStatusActionFactory,
+ private SequencedSkyframeExecutor(
+ Reporter reporter,
+ EvaluatorSupplier evaluatorSupplier,
+ PackageFactory pkgFactory,
+ TimestampGranularityMonitor tsgm,
+ BlazeDirectories directories,
+ Factory workspaceStatusActionFactory,
ImmutableList<BuildInfoFactory> buildInfoFactories,
Set<Path> immutableDirectories,
Iterable<? extends DiffAwareness.Factory> diffAwarenessFactories,
Predicate<PathFragment> allowedMissingInputs,
Preprocessor.Factory.Supplier preprocessorFactorySupplier,
ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions,
- ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues) {
- super(reporter, evaluatorSupplier, pkgFactory, tsgm, directories,
- workspaceStatusActionFactory, buildInfoFactories, immutableDirectories,
- allowedMissingInputs, preprocessorFactorySupplier,
- extraSkyFunctions, extraPrecomputedValues, /*errorOnExternalFiles=*/false);
+ ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues,
+ Iterable<SkyValueDirtinessChecker> customDirtinessCheckers) {
+ super(
+ reporter,
+ evaluatorSupplier,
+ pkgFactory,
+ tsgm,
+ directories,
+ workspaceStatusActionFactory,
+ buildInfoFactories,
+ immutableDirectories,
+ allowedMissingInputs,
+ preprocessorFactorySupplier,
+ extraSkyFunctions,
+ extraPrecomputedValues, /*errorOnExternalFiles=*/
+ false);
this.diffAwarenessManager = new DiffAwarenessManager(diffAwarenessFactories, reporter);
+ this.customDirtinessCheckers = customDirtinessCheckers;
}
public static SequencedSkyframeExecutor create(
@@ -123,7 +140,8 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor {
Predicate<PathFragment> allowedMissingInputs,
Preprocessor.Factory.Supplier preprocessorFactorySupplier,
ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions,
- ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues) {
+ ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues,
+ Iterable<SkyValueDirtinessChecker> customDirtinessCheckers) {
SequencedSkyframeExecutor skyframeExecutor =
new SequencedSkyframeExecutor(
reporter,
@@ -138,7 +156,8 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor {
allowedMissingInputs,
preprocessorFactorySupplier,
extraSkyFunctions,
- extraPrecomputedValues);
+ extraPrecomputedValues,
+ customDirtinessCheckers);
skyframeExecutor.init();
return skyframeExecutor;
}
@@ -150,12 +169,20 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor {
ImmutableList<BuildInfoFactory> buildInfoFactories,
Set<Path> immutableDirectories,
Iterable<? extends DiffAwareness.Factory> diffAwarenessFactories) {
- return create(reporter, pkgFactory, tsgm, directories, workspaceStatusActionFactory,
- buildInfoFactories, immutableDirectories, diffAwarenessFactories,
+ return create(
+ reporter,
+ pkgFactory,
+ tsgm,
+ directories,
+ workspaceStatusActionFactory,
+ buildInfoFactories,
+ immutableDirectories,
+ diffAwarenessFactories,
Predicates.<PathFragment>alwaysFalse(),
Preprocessor.Factory.Supplier.NullSupplier.INSTANCE,
ImmutableMap.<SkyFunctionName, SkyFunction>of(),
- ImmutableList.<PrecomputedValue.Injected>of());
+ ImmutableList.<PrecomputedValue.Injected>of(),
+ ImmutableList.<SkyValueDirtinessChecker>of());
}
@Override
@@ -207,7 +234,8 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor {
* it via an explicit Skyframe dependency. They need to be invalidated if the package locator
* changes.
*/
- private static final Set<SkyFunctionName> PACKAGE_LOCATOR_DEPENDENT_VALUES = ImmutableSet.of(
+ private static final Set<SkyFunctionName> PACKAGE_LOCATOR_DEPENDENT_VALUES =
+ ImmutableSet.of(
SkyFunctions.AST_FILE_LOOKUP,
SkyFunctions.FILE_STATE,
SkyFunctions.FILE,
@@ -305,7 +333,7 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor {
private void handleDiffsWithMissingDiffInformation(
Set<Pair<Path, DiffAwarenessManager.ProcessableModifiedFileSet>>
pathEntriesWithoutDiffInformation) throws InterruptedException {
- if (pathEntriesWithoutDiffInformation.isEmpty()) {
+ if (pathEntriesWithoutDiffInformation.isEmpty() && Iterables.isEmpty(customDirtinessCheckers)) {
return;
}
@@ -319,26 +347,20 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor {
// We need to manually check for changes to known files. This entails finding all dirty file
// system values under package roots for which we don't have diff information. If at least
// one path entry doesn't have diff information, then we're going to have to iterate over
- // the skyframe values at least once no matter what so we might as well do so now and avoid
- // doing so more than once.
- Iterable<SkyKey> filesystemSkyKeys = fsnc.getFilesystemSkyKeys();
- // Partition by package path entry.
- Multimap<Path, SkyKey> skyKeysByPathEntry = partitionSkyKeysByPackagePathEntry(
- ImmutableSet.copyOf(pkgLocator.get().getPathEntries()), filesystemSkyKeys);
-
- // Contains all file system values that we need to check for dirtiness.
- List<Path> pathEntriesChecked =
- Lists.newArrayListWithCapacity(pathEntriesWithoutDiffInformation.size());
- List<Iterable<SkyKey>> valuesToCheckManually = Lists.newArrayList();
+ // the skyframe values at least once no matter what.
+ Set<Path> pathEntries = new HashSet<>();
for (Pair<Path, DiffAwarenessManager.ProcessableModifiedFileSet> pair :
pathEntriesWithoutDiffInformation) {
- Path pathEntry = pair.getFirst();
- valuesToCheckManually.add(skyKeysByPathEntry.get(pathEntry));
- pathEntriesChecked.add(pathEntry);
+ pathEntries.add(pair.getFirst());
}
-
- Differencer.Diff diff = fsnc.getDirtyFilesystemValues(Iterables.concat(valuesToCheckManually));
- handleChangedFiles(pathEntriesChecked, diff);
+ Differencer.Diff diff =
+ fsnc.getDirtyKeys(
+ new UnionDirtinessChecker(
+ Iterables.concat(
+ customDirtinessCheckers,
+ ImmutableList.<SkyValueDirtinessChecker>of(
+ new MissingDiffDirtinessChecker(pathEntries)))));
+ handleChangedFiles(pathEntries, diff);
for (Pair<Path, DiffAwarenessManager.ProcessableModifiedFileSet> pair :
pathEntriesWithoutDiffInformation) {
@@ -346,31 +368,7 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor {
}
}
- /**
- * Partitions the given filesystem values based on which package path root they are under.
- * Returns a {@link Multimap} {@code m} such that {@code m.containsEntry(k, pe)} is true for
- * each filesystem valuekey {@code k} under a package path root {@code pe}. Note that values not
- * under a package path root are not present in the returned {@link Multimap}; these values are
- * unconditionally checked for changes on each incremental build.
- */
- private static Multimap<Path, SkyKey> partitionSkyKeysByPackagePathEntry(
- Set<Path> pkgRoots, Iterable<SkyKey> filesystemSkyKeys) {
- ImmutableSetMultimap.Builder<Path, SkyKey> multimapBuilder =
- ImmutableSetMultimap.builder();
- for (SkyKey key : filesystemSkyKeys) {
- Preconditions.checkState(key.functionName() == SkyFunctions.FILE_STATE
- || key.functionName() == SkyFunctions.DIRECTORY_LISTING_STATE, key);
- Path root = ((RootedPath) key.argument()).getRoot();
- if (pkgRoots.contains(root)) {
- multimapBuilder.put(root, key);
- }
- // We don't need to worry about FileStateValues for external files because they have a
- // dependency on the build_id and so they get invalidated each build.
- }
- return multimapBuilder.build();
- }
-
- private void handleChangedFiles(List<Path> pathEntries, Differencer.Diff diff) {
+ private void handleChangedFiles(Collection<Path> pathEntries, Differencer.Diff diff) {
Collection<SkyKey> changedKeysWithoutNewValues = diff.changedKeysWithoutNewValues();
Map<SkyKey, ? extends SkyValue> changedKeysWithNewValues = diff.changedKeysWithNewValues();
@@ -449,7 +447,8 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor {
Iterable<SkyKey> keys;
if (modifiedFileSet.treatEverythingAsModified()) {
Differencer.Diff diff =
- new FilesystemValueChecker(memoizingEvaluator, tsgm, null).getDirtyFilesystemSkyKeys();
+ new FilesystemValueChecker(memoizingEvaluator, tsgm, null)
+ .getDirtyKeys(new BasicFilesystemDirtinessChecker());
keys = diff.changedKeysWithoutNewValues();
recordingDiffer.inject(diff.changedKeysWithNewValues());
} else {
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-11 13:04:53 +0000