diff options
| author |  nharmata <nharmata@google.com> | 2018-03-07 16:25:10 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-03-07 16:26:46 -0800 |
| commit | a2fc4e3488ea4baff083a35a2351d972b8cd12da (patch) | |
| tree | 14fad3812d9be878caae132031225ac54086a50f /src/main/java/com/google/devtools/build/lib/skyframe/packages | |
| parent | 6e233f0b0fb41711872d1efefb599b87d81560de (diff) | |
Fix PackageFunction's call to Package.Builder.Helper#onLoadingComplete to pass
along the wall time of the load, even when the package in question was in PackageFunction's
internal cache (e.g. the current #compute call is a PackageFunction Skyframe restart).
Also clarify the intent of the 'loadTimeMs' param in #onLoadingComplete.
RELNOTES: None
PiperOrigin-RevId: 188253198
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/packages')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java index 5613c87ab1..fa5bbd66dd 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java @@ -54,6 +54,7 @@ import com.google.devtools.build.lib.skyframe.FileSymlinkInfiniteExpansionUnique import com.google.devtools.build.lib.skyframe.PackageFunction; import com.google.devtools.build.lib.skyframe.PackageFunction.ActionOnIOExceptionReadingBuildFile; import com.google.devtools.build.lib.skyframe.PackageFunction.IncrementalityIntent; +import com.google.devtools.build.lib.skyframe.PackageFunction.LoadedPackageCacheEntry; import com.google.devtools.build.lib.skyframe.PackageLookupFunction; import com.google.devtools.build.lib.skyframe.PackageLookupFunction.CrossRepositoryLabelViolationStrategy; import com.google.devtools.build.lib.skyframe.PackageValue; @@ -341,7 +342,7 @@ public abstract class AbstractPackageLoader implements PackageLoader { protected final ImmutableMap<SkyFunctionName, SkyFunction> makeFreshSkyFunctions() { AtomicReference<TimestampGranularityMonitor> tsgm = new AtomicReference<>(new TimestampGranularityMonitor(BlazeClock.instance())); - Cache<PackageIdentifier, PackageFunction.BuilderAndGlobDeps> packageFunctionCache = + Cache<PackageIdentifier, LoadedPackageCacheEntry> packageFunctionCache = CacheBuilder.newBuilder().build(); Cache<PackageIdentifier, AstParseResult> astCache = CacheBuilder.newBuilder().build(); AtomicReference<PerBuildSyscallCache> syscallCacheRef = new AtomicReference<>( |