diff options
author | Philipp Wollermann <philwo@google.com> | 2016-02-26 21:55:31 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-02-28 17:04:30 +0000 |
commit | 1ecdc51abf8a52d7e312be6cdad16c7ead68e75a (patch) | |
tree | d7d9cfe39939e78785263be2c1001ea237c4b754 /src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextConsumer.java | |
parent | 64e7a3f3c2de2cd32433fc85f9db754bd473210a (diff) |
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextConsumer.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextConsumer.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextConsumer.java b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextConsumer.java index 9c37c79fcc..4041fd9a4c 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextConsumer.java +++ b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextConsumer.java @@ -14,7 +14,9 @@ package com.google.devtools.build.lib.sandbox; 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; @@ -34,8 +36,8 @@ public class SandboxActionContextConsumer implements ActionContextConsumer { } @Override - public Map<Class<? extends ActionContext>, String> getActionContexts() { - Builder<Class<? extends ActionContext>, String> contexts = ImmutableMap.builder(); + public Multimap<Class<? extends ActionContext>, String> getActionContexts() { + Builder<Class<? extends ActionContext>, String> contexts = ImmutableMultimap.builder(); if (OS.getCurrent() == OS.LINUX) { contexts.put(SpawnActionContext.class, "sandboxed"); |