You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2015/03/31 19:02:39 UTC
mesos git commit: Fixed the right angle brackets in subprocess code.
Repository: mesos
Updated Branches:
refs/heads/master 905e6cca7 -> 1d5cc168b
Fixed the right angle brackets in subprocess code.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1d5cc168
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1d5cc168
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1d5cc168
Branch: refs/heads/master
Commit: 1d5cc168b113afaa79dfe7938fcf809737efa84c
Parents: 905e6cc
Author: Jie Yu <yu...@gmail.com>
Authored: Tue Mar 31 10:02:31 2015 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Mar 31 10:02:31 2015 -0700
----------------------------------------------------------------------
.../libprocess/include/process/subprocess.hpp | 40 ++++++++++----------
3rdparty/libprocess/src/subprocess.cpp | 14 +++----
2 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/1d5cc168/3rdparty/libprocess/include/process/subprocess.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/subprocess.hpp b/3rdparty/libprocess/include/process/subprocess.hpp
index 7ff5a10..5cc458a 100644
--- a/3rdparty/libprocess/include/process/subprocess.hpp
+++ b/3rdparty/libprocess/include/process/subprocess.hpp
@@ -54,10 +54,10 @@ public:
const Subprocess::IO& out,
const Subprocess::IO& err,
const Option<flags::FlagsBase>& flags,
- const Option<std::map<std::string, std::string> >& environment,
- const Option<lambda::function<int()> >& setup,
+ const Option<std::map<std::string, std::string>>& environment,
+ const Option<lambda::function<int()>>& setup,
const Option<lambda::function<
- pid_t(const lambda::function<int()>&)> >& clone);
+ pid_t(const lambda::function<int()>&)>>& clone);
enum Mode
{
@@ -100,7 +100,7 @@ public:
// Returns a future from process::reap of this subprocess.
// Discarding this future has no effect on the subprocess.
- Future<Option<int> > status() const { return data->status; }
+ Future<Option<int>> status() const { return data->status; }
private:
friend Try<Subprocess> subprocess(
@@ -110,10 +110,10 @@ private:
const Subprocess::IO& out,
const Subprocess::IO& err,
const Option<flags::FlagsBase>& flags,
- const Option<std::map<std::string, std::string> >& environment,
- const Option<lambda::function<int()> >& setup,
+ const Option<std::map<std::string, std::string>>& environment,
+ const Option<lambda::function<int()>>& setup,
const Option<lambda::function<
- pid_t(const lambda::function<int()>&)> >& clone);
+ pid_t(const lambda::function<int()>&)>>& clone);
struct Data
{
@@ -134,7 +134,7 @@ private:
Option<int> out;
Option<int> err;
- Future<Option<int> > status;
+ Future<Option<int>> status;
};
Subprocess() : data(new Data()) {}
@@ -159,20 +159,20 @@ Try<Subprocess> subprocess(
const Subprocess::IO& out,
const Subprocess::IO& err,
const Option<flags::FlagsBase>& flags = None(),
- const Option<std::map<std::string, std::string> >& environment = None(),
- const Option<lambda::function<int()> >& setup = None(),
+ const Option<std::map<std::string, std::string>>& environment = None(),
+ const Option<lambda::function<int()>>& setup = None(),
const Option<lambda::function<
- pid_t(const lambda::function<int()>&)> >& clone = None());
+ pid_t(const lambda::function<int()>&)>>& clone = None());
inline Try<Subprocess> subprocess(
const std::string& path,
std::vector<std::string> argv,
const Option<flags::FlagsBase>& flags = None(),
- const Option<std::map<std::string, std::string> >& environment = None(),
- const Option<lambda::function<int()> >& setup = None(),
+ const Option<std::map<std::string, std::string>>& environment = None(),
+ const Option<lambda::function<int()>>& setup = None(),
const Option<lambda::function<
- pid_t(const lambda::function<int()>&)> >& clone = None())
+ pid_t(const lambda::function<int()>&)>>& clone = None())
{
return subprocess(
path,
@@ -195,10 +195,10 @@ inline Try<Subprocess> subprocess(
const Subprocess::IO& in,
const Subprocess::IO& out,
const Subprocess::IO& err,
- const Option<std::map<std::string, std::string> >& environment = None(),
- const Option<lambda::function<int()> >& setup = None(),
+ const Option<std::map<std::string, std::string>>& environment = None(),
+ const Option<lambda::function<int()>>& setup = None(),
const Option<lambda::function<
- pid_t(const lambda::function<int()>&)> >& clone = None())
+ pid_t(const lambda::function<int()>&)>>& clone = None())
{
std::vector<std::string> argv(3);
argv[0] = "sh";
@@ -220,10 +220,10 @@ inline Try<Subprocess> subprocess(
inline Try<Subprocess> subprocess(
const std::string& command,
- const Option<std::map<std::string, std::string> >& environment = None(),
- const Option<lambda::function<int()> >& setup = None(),
+ const Option<std::map<std::string, std::string>>& environment = None(),
+ const Option<lambda::function<int()>>& setup = None(),
const Option<lambda::function<
- pid_t(const lambda::function<int()>&)> >& clone = None())
+ pid_t(const lambda::function<int()>&)>>& clone = None())
{
return subprocess(
command,
http://git-wip-us.apache.org/repos/asf/mesos/blob/1d5cc168/3rdparty/libprocess/src/subprocess.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/subprocess.cpp b/3rdparty/libprocess/src/subprocess.cpp
index ab8a343..f41f5e2 100644
--- a/3rdparty/libprocess/src/subprocess.cpp
+++ b/3rdparty/libprocess/src/subprocess.cpp
@@ -31,8 +31,8 @@ namespace internal {
// See the comment below as to why subprocess is passed to cleanup.
static void cleanup(
- const Future<Option<int> >& result,
- Promise<Option<int> >* promise,
+ const Future<Option<int>>& result,
+ Promise<Option<int>>* promise,
const Subprocess& subprocess)
{
CHECK(!result.isPending());
@@ -111,7 +111,7 @@ static int childMain(
const Subprocess::IO& out,
const Subprocess::IO& err,
os::ExecEnv* envp,
- const Option<lambda::function<int()> >& setup,
+ const Option<lambda::function<int()>>& setup,
int stdinFd[2],
int stdoutFd[2],
int stderrFd[2])
@@ -173,10 +173,10 @@ Try<Subprocess> subprocess(
const Subprocess::IO& out,
const Subprocess::IO& err,
const Option<flags::FlagsBase>& flags,
- const Option<map<string, string> >& environment,
- const Option<lambda::function<int()> >& setup,
+ const Option<map<string, string>>& environment,
+ const Option<lambda::function<int()>>& setup,
const Option<lambda::function<
- pid_t(const lambda::function<int()>&)> >& _clone)
+ pid_t(const lambda::function<int()>&)>>& _clone)
{
// File descriptors for redirecting stdin/stdout/stderr. These file
// descriptors are used for different purposes depending on the
@@ -385,7 +385,7 @@ Try<Subprocess> subprocess(
// the termination signal. Otherwise, the caller can discard the
// reap future, and we will not know when it is safe to close the
// file descriptors.
- Promise<Option<int> >* promise = new Promise<Option<int> >();
+ Promise<Option<int>>* promise = new Promise<Option<int>>();
process.data->status = promise->future();
// We need to bind a copy of this Subprocess into the onAny callback