From 9e948640731e85c3e75b0faa2fefde61ca44d1ac Mon Sep 17 00:00:00 2001 From: Nathan Harmata Date: Sat, 26 Nov 2016 17:33:25 +0000 Subject: Use BlazeInterner's chosen concurrency level in InternerWithPresenceCheck's internal ConcurrentMap. -- MOS_MIGRATED_REVID=140253038 --- .../java/com/google/devtools/build/lib/concurrent/BlazeInterners.java | 4 ++++ .../google/devtools/build/lib/skyframe/InternerWithPresenceCheck.java | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build') diff --git a/src/main/java/com/google/devtools/build/lib/concurrent/BlazeInterners.java b/src/main/java/com/google/devtools/build/lib/concurrent/BlazeInterners.java index b43b09bebd..7c9d6dc794 100644 --- a/src/main/java/com/google/devtools/build/lib/concurrent/BlazeInterners.java +++ b/src/main/java/com/google/devtools/build/lib/concurrent/BlazeInterners.java @@ -27,6 +27,10 @@ public class BlazeInterners { CONCURRENCY_LEVEL = (val == null) ? DEFAULT_CONCURRENCY_LEVEL : Integer.parseInt(val); } + public static int concurrencyLevel() { + return CONCURRENCY_LEVEL; + } + private static InternerBuilder setConcurrencyLevel(InternerBuilder builder) { return builder.concurrencyLevel(CONCURRENCY_LEVEL); } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/InternerWithPresenceCheck.java b/src/main/java/com/google/devtools/build/lib/skyframe/InternerWithPresenceCheck.java index d80b3b5416..ba442362d8 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/InternerWithPresenceCheck.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/InternerWithPresenceCheck.java @@ -17,6 +17,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.collect.Interner; import com.google.common.collect.MapMaker; +import com.google.devtools.build.lib.concurrent.BlazeInterners; import java.util.concurrent.ConcurrentMap; @@ -27,7 +28,8 @@ import javax.annotation.Nullable; * given sample object via {@link #getCanonical}. */ public class InternerWithPresenceCheck implements Interner { - private final ConcurrentMap map = new MapMaker().makeMap(); + private final ConcurrentMap map = + new MapMaker().concurrencyLevel(BlazeInterners.concurrencyLevel()).makeMap(); @Override public T intern(T sample) { -- cgit v1.2.3