From 3c0adb26bac6d756fb97e4bcc6d4e5b2cefa5eeb Mon Sep 17 00:00:00 2001 From: Janak Ramakrishnan Date: Mon, 15 Aug 2016 21:54:55 +0000 Subject: Allow Skyframe graph lookups and value retrievals to throw InterruptedException. The only place we now don't handle InterruptedException is in the action graph created after analysis, since I'm not sure that will be around for that much longer. -- MOS_MIGRATED_REVID=130327770 --- .../google/devtools/build/lib/skyframe/AspectFunction.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java') diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java index c1f8c335ec..d94be28632 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java @@ -57,7 +57,6 @@ import com.google.devtools.build.skyframe.SkyFunction; import com.google.devtools.build.skyframe.SkyFunctionException; import com.google.devtools.build.skyframe.SkyKey; import com.google.devtools.build.skyframe.SkyValue; - import javax.annotation.Nullable; /** @@ -93,9 +92,9 @@ public final class AspectFunction implements SkyFunction { * @return {@code null} if dependencies cannot be satisfied. */ @Nullable - public static SkylarkAspect loadSkylarkAspect( + static SkylarkAspect loadSkylarkAspect( Environment env, Label extensionLabel, String skylarkValueName) - throws AspectCreationException { + throws AspectCreationException, InterruptedException { SkyKey importFileKey = SkylarkImportLookupValue.key(extensionLabel, false); try { SkylarkImportLookupValue skylarkImportLookupValue = @@ -275,8 +274,13 @@ public final class AspectFunction implements SkyFunction { } } - private SkyValue createAliasAspect(Environment env, Target originalTarget, Label aliasLabel, - Aspect aspect, AspectKey originalKey) { + private static SkyValue createAliasAspect( + Environment env, + Target originalTarget, + Label aliasLabel, + Aspect aspect, + AspectKey originalKey) + throws InterruptedException { SkyKey depKey = AspectValue.key(aliasLabel, originalKey.getAspectConfiguration(), originalKey.getBaseConfiguration(), -- cgit v1.2.3