You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2016/03/29 11:56:48 UTC
mesos git commit: Subprocess: Fixed capitalization of Watchdog enum.
Repository: mesos
Updated Branches:
refs/heads/master b2cab0deb -> 380e5c87b
Subprocess: Fixed capitalization of Watchdog enum.
Review: https://reviews.apache.org/r/45399/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/380e5c87
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/380e5c87
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/380e5c87
Branch: refs/heads/master
Commit: 380e5c87bc664ab56b2b2ba3083b7c6f7ce9b4f2
Parents: b2cab0d
Author: Joerg Schad <jo...@mesosphere.io>
Authored: Tue Mar 29 11:29:45 2016 +0200
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Tue Mar 29 11:56:20 2016 +0200
----------------------------------------------------------------------
3rdparty/libprocess/include/process/subprocess.hpp | 11 +++++------
3rdparty/libprocess/src/subprocess.cpp | 4 ++--
2 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/380e5c87/3rdparty/libprocess/include/process/subprocess.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/subprocess.hpp b/3rdparty/libprocess/include/process/subprocess.hpp
index 2e29bed..b1d867b 100644
--- a/3rdparty/libprocess/include/process/subprocess.hpp
+++ b/3rdparty/libprocess/include/process/subprocess.hpp
@@ -44,8 +44,7 @@ enum Setsid
// Flag describing whether a new process should be monitored by a seperate
// watch process and be killed in case the parent process dies.
-enum WATCHDOG
-{
+enum Watchdog {
MONITOR,
NO_MONITOR,
};
@@ -144,7 +143,7 @@ public:
pid_t(const lambda::function<int()>&)>>& clone,
const std::vector<Subprocess::Hook>& parent_hooks,
const Option<std::string>& working_directory,
- const WATCHDOG watchdog);
+ const Watchdog watchdog);
IO(const lambda::function<Try<InputFileDescriptors>()>& _input,
const lambda::function<Try<OutputFileDescriptors>()>& _output)
@@ -247,7 +246,7 @@ private:
pid_t(const lambda::function<int()>&)>>& clone,
const std::vector<Subprocess::Hook>& parent_hooks,
const Option<std::string>& working_directory,
- const WATCHDOG watchdog);
+ const Watchdog watchdog);
struct Data
{
@@ -319,7 +318,7 @@ Try<Subprocess> subprocess(
const std::vector<Subprocess::Hook>& parent_hooks =
Subprocess::Hook::None(),
const Option<std::string>& working_directory = None(),
- const WATCHDOG watchdog = NO_MONITOR);
+ const Watchdog watchdog = NO_MONITOR);
/**
@@ -362,7 +361,7 @@ inline Try<Subprocess> subprocess(
const std::vector<Subprocess::Hook>& parent_hooks =
Subprocess::Hook::None(),
const Option<std::string>& working_directory = None(),
- const WATCHDOG watchdog = NO_MONITOR)
+ const Watchdog watchdog = NO_MONITOR)
{
std::vector<std::string> argv = {"sh", "-c", command};
http://git-wip-us.apache.org/repos/asf/mesos/blob/380e5c87/3rdparty/libprocess/src/subprocess.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/subprocess.cpp b/3rdparty/libprocess/src/subprocess.cpp
index be32962..bb0fcbc 100644
--- a/3rdparty/libprocess/src/subprocess.cpp
+++ b/3rdparty/libprocess/src/subprocess.cpp
@@ -339,7 +339,7 @@ static int childMain(
bool blocking,
int pipes[2],
const Option<string>& working_directory,
- const WATCHDOG watchdog)
+ const Watchdog watchdog)
{
// Close parent's end of the pipes.
if (stdinfds.write.isSome()) {
@@ -447,7 +447,7 @@ Try<Subprocess> subprocess(
pid_t(const lambda::function<int()>&)>>& _clone,
const vector<Subprocess::Hook>& parent_hooks,
const Option<string>& working_directory,
- const WATCHDOG watchdog)
+ const Watchdog watchdog)
{
// File descriptors for redirecting stdin/stdout/stderr.
// These file descriptors are used for different purposes depending