Skip to content

Commit

Permalink
Make BuildDriverKey non-CPU heavy.
Browse files Browse the repository at this point in the history
Previously, a heavy-lifting part of conflict checking was done in the skyframe pool (collection of the action lookup values), it made sense to limit the concurrency by running it in the CPU-heavy pool. Now that we perform the entire conflict checking in an extra-Skyframe location, BuildDriverKey should no longer be CPU-heavy.

PiperOrigin-RevId: 561649161
Change-Id: Ic76661389d856ef9c492bd7b921649fa4455b583
  • Loading branch information
joeleba authored and copybara-github committed Aug 31, 2023
1 parent 72d5db1 commit f1131dd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion src/main/java/com/google/devtools/build/lib/skyframe/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,6 @@ java_library(
":sky_functions",
"//src/main/java/com/google/devtools/build/lib/actions:action_lookup_key",
"//src/main/java/com/google/devtools/build/lib/analysis:top_level_artifact_context",
"//src/main/java/com/google/devtools/build/skyframe:cpu_heavy_skykey",
"//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
],
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@

import com.google.devtools.build.lib.actions.ActionLookupKey;
import com.google.devtools.build.lib.analysis.TopLevelArtifactContext;
import com.google.devtools.build.skyframe.CPUHeavySkyKey;
import com.google.devtools.build.skyframe.SkyFunctionName;
import com.google.devtools.build.skyframe.SkyKey;
import java.util.Objects;

/**
* Wraps an {@link ActionLookupKey}. The evaluation of this SkyKey is the entry point of analyzing
* the {@link ActionLookupKey} and executing the associated actions.
*/
public final class BuildDriverKey implements CPUHeavySkyKey {
public final class BuildDriverKey implements SkyKey {
private final ActionLookupKey actionLookupKey;
private final TopLevelArtifactContext topLevelArtifactContext;
private final boolean strictActionConflictCheck;
Expand Down

0 comments on commit f1131dd

Please sign in to comment.