diff options
| author |  Janak Ramakrishnan <janakr@google.com> | 2016-09-27 14:58:26 +0000 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2016-09-27 16:24:55 +0000 |
| commit | 326c698dbab89fde97a234586efef75c5f8b7111 (patch) | |
| tree | 6dee789d6e88484d8a58c7d19d428f6f1e683a70 /src/main/java/com/google/devtools/build | |
| parent | a5b226942bd8e7667e8da7067ec9bf55d1d62508 (diff) | |
Refactor SkyframeExecutor#preparePackageLoading to pass all PackageCacheOptions as a bundle.
This will allow me to thread a new flag through more easily in the future.
--
MOS_MIGRATED_REVID=134406676
Diffstat (limited to 'src/main/java/com/google/devtools/build')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java | 16 |
1 files changed, 6 insertions, 10 deletions
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 3bc3a2a340..5b805b39f2 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 @@ -899,9 +899,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { @VisibleForTesting // productionVisibility = Visibility.PRIVATE public void preparePackageLoading( PathPackageLocator pkgLocator, - RuleVisibility defaultVisibility, - boolean showLoadingProgress, - int globbingThreads, + PackageCacheOptions packageCacheOptions, String defaultsPackageContents, UUID commandId, Map<String, String> clientEnv, @@ -915,13 +913,13 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { setCommandId(commandId); setPrecomputedClientEnv(clientEnv); setBlacklistedPackagePrefixesFile(getBlacklistedPackagePrefixesFile()); - setShowLoadingProgress(showLoadingProgress); - setDefaultVisibility(defaultVisibility); + setShowLoadingProgress(packageCacheOptions.showLoadingProgress); + setDefaultVisibility(packageCacheOptions.defaultVisibility); setupDefaultPackage(defaultsPackageContents); setPackageLocator(pkgLocator); - syscalls.set(newPerBuildSyscallCache(globbingThreads)); - this.pkgFactory.setGlobbingThreads(globbingThreads); + syscalls.set(newPerBuildSyscallCache(packageCacheOptions.globbingThreads)); + this.pkgFactory.setGlobbingThreads(packageCacheOptions.globbingThreads); checkPreprocessorFactory(); emittedEventState.clear(); @@ -1690,9 +1688,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { outputBase, directories.getWorkspace(), workingDirectory), - packageCacheOptions.defaultVisibility, - packageCacheOptions.showLoadingProgress, - packageCacheOptions.globbingThreads, + packageCacheOptions, defaultsPackageContents, commandId, clientEnv, |