From 1ecdc51abf8a52d7e312be6cdad16c7ead68e75a Mon Sep 17 00:00:00 2001 From: Philipp Wollermann Date: Fri, 26 Feb 2016 21:55:31 +0000 Subject: Let ActionContextConsumer#getActionContexts() return a Multimap instead of a Map. This makes it possible to request multiple implementations of the same ActionContext to be available via Executor#getContext(). Currently, specialized SpawnActionContexts like the sandbox or the worker strategy that might have to do a fallback each instantiate their own private copy of e.g. the StandaloneSpawnStrategy. With this change, they can instead get a global instance from the Executor. -- MOS_MIGRATED_REVID=115705811 --- .../devtools/build/lib/worker/WorkerActionContextConsumer.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/worker') diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextConsumer.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextConsumer.java index b0f7084483..fc21beb4ef 100644 --- a/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextConsumer.java +++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextConsumer.java @@ -14,7 +14,9 @@ package com.google.devtools.build.lib.worker; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMap.Builder; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.ImmutableMultimap.Builder; +import com.google.common.collect.Multimap; import com.google.devtools.build.lib.actions.ActionContextConsumer; import com.google.devtools.build.lib.actions.Executor.ActionContext; import com.google.devtools.build.lib.actions.SpawnActionContext; @@ -33,8 +35,8 @@ public class WorkerActionContextConsumer implements ActionContextConsumer { } @Override - public Map, String> getActionContexts() { - Builder, String> contexts = ImmutableMap.builder(); + public Multimap, String> getActionContexts() { + Builder, String> contexts = ImmutableMultimap.builder(); contexts.put(SpawnActionContext.class, "worker"); return contexts.build(); } -- cgit v1.2.3