Replaces Hook::None() by {} in Mesos [2/2].
Review: https://reviews.apache.org/r/52016/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1db3bbb1
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1db3bbb1
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1db3bbb1
Branch: refs/heads/master
Commit: 1db3bbb1692406f6395a21624d2041f220eca744
Parents: 2af7e5e
Author: Joerg Schad <jo...@mesosphere.io>
Authored: Wed Sep 21 09:50:30 2016 -0700
Committer: Jie Yu <yujie....@gmail.com>
Committed: Wed Sep 21 09:50:30 2016 -0700
----------------------------------------------------------------------
src/launcher/posix/executor.cpp | 2 +-
src/linux/perf.cpp | 4 ++--
.../containerizer/mesos/isolators/docker/volume/driver.cpp | 8 ++++----
src/slave/containerizer/mesos/isolators/posix/disk.cpp | 4 ++--
src/slave/containerizer/mesos/launcher.hpp | 6 ++----
5 files changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/1db3bbb1/src/launcher/posix/executor.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/posix/executor.cpp b/src/launcher/posix/executor.cpp
index a606b13..0f3fed3 100644
--- a/src/launcher/posix/executor.cpp
+++ b/src/launcher/posix/executor.cpp
@@ -117,7 +117,7 @@ pid_t launchTaskPosix(
&launchFlags,
None(),
None(),
- Subprocess::Hook::None(),
+ {},
{Subprocess::ChildHook::SETSID()});
if (s.isError()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/1db3bbb1/src/linux/perf.cpp
----------------------------------------------------------------------
diff --git a/src/linux/perf.cpp b/src/linux/perf.cpp
index d5fa3ff..7aff800 100644
--- a/src/linux/perf.cpp
+++ b/src/linux/perf.cpp
@@ -135,8 +135,8 @@ private:
nullptr,
None(),
None(),
- Subprocess::Hook::None(),
- Subprocess::ChildHook::None(),
+ {},
+ {},
MONITOR);
if (_perf.isError()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/1db3bbb1/src/slave/containerizer/mesos/isolators/docker/volume/driver.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/docker/volume/driver.cpp
b/src/slave/containerizer/mesos/isolators/docker/volume/driver.cpp
index 4d10913..f4b690c 100644
--- a/src/slave/containerizer/mesos/isolators/docker/volume/driver.cpp
+++ b/src/slave/containerizer/mesos/isolators/docker/volume/driver.cpp
@@ -92,8 +92,8 @@ Future<string> DriverClient::mount(
nullptr,
None(),
None(),
- Subprocess::Hook::None(),
- Subprocess::ChildHook::None(),
+ {},
+ {},
MONITOR);
if (s.isError()) {
@@ -177,8 +177,8 @@ Future<Nothing> DriverClient::unmount(
nullptr,
None(),
None(),
- Subprocess::Hook::None(),
- Subprocess::ChildHook::None(),
+ {},
+ {},
MONITOR);
if (s.isError()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/1db3bbb1/src/slave/containerizer/mesos/isolators/posix/disk.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/posix/disk.cpp
b/src/slave/containerizer/mesos/isolators/posix/disk.cpp
index 5c5f7a3..b5a2cb5 100644
--- a/src/slave/containerizer/mesos/isolators/posix/disk.cpp
+++ b/src/slave/containerizer/mesos/isolators/posix/disk.cpp
@@ -549,8 +549,8 @@ private:
nullptr,
None(),
None(),
- Subprocess::Hook::None(),
- Subprocess::ChildHook::None(),
+ {},
+ {},
MONITOR);
if (s.isError()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/1db3bbb1/src/slave/containerizer/mesos/launcher.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/launcher.hpp
b/src/slave/containerizer/mesos/launcher.hpp
index 61c2e84..a3f1364 100644
--- a/src/slave/containerizer/mesos/launcher.hpp
+++ b/src/slave/containerizer/mesos/launcher.hpp
@@ -70,8 +70,7 @@ public:
const flags::FlagsBase* flags,
const Option<std::map<std::string, std::string>>& environment,
const Option<int>& namespaces,
- std::vector<process::Subprocess::Hook> parentHooks =
- process::Subprocess::Hook::None()) = 0;
+ std::vector<process::Subprocess::Hook> parentHooks = {}) = 0;
// Kill all processes in the containerized context.
virtual process::Future<Nothing> destroy(const ContainerID& containerId) = 0;
@@ -122,8 +121,7 @@ public:
const flags::FlagsBase* flags,
const Option<std::map<std::string, std::string>>& environment,
const Option<int>& namespaces,
- std::vector<process::Subprocess::Hook> parentHooks =
- process::Subprocess::Hook::None());
+ std::vector<process::Subprocess::Hook> parentHooks = {});
virtual process::Future<Nothing> destroy(const ContainerID& containerId);
