This is an automated email from the ASF dual-hosted git repository. bmahler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mesos.git
commit dc0577ea97ca675a1dce84fa721f59f842bbd08e Author: Benjamin Mahler <[email protected]> AuthorDate: Fri Mar 27 19:42:13 2020 -0400 Updated libprocess for exec.hpp addition to stout. Review: https://reviews.apache.org/r/72285 --- 3rdparty/libprocess/include/process/subprocess.hpp | 3 ++- 3rdparty/libprocess/src/subprocess.cpp | 3 ++- 3rdparty/libprocess/src/windows/subprocess.hpp | 9 ++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/3rdparty/libprocess/include/process/subprocess.hpp b/3rdparty/libprocess/include/process/subprocess.hpp index 3b2653d..ea66a8e 100644 --- a/3rdparty/libprocess/include/process/subprocess.hpp +++ b/3rdparty/libprocess/include/process/subprocess.hpp @@ -26,6 +26,7 @@ #include <stout/option.hpp> #include <stout/try.hpp> +#include <stout/os/exec.hpp> #include <stout/os/shell.hpp> #include <stout/os/int_fd.hpp> @@ -315,7 +316,7 @@ private: pid_t pid; #ifdef __WINDOWS__ - Option<::internal::windows::ProcessData> process_data; + Option<os::windows::internal::ProcessData> process_data; #endif // __WINDOWS__ // The parent side of the pipe for stdin/stdout/stderr. If the diff --git a/3rdparty/libprocess/src/subprocess.cpp b/3rdparty/libprocess/src/subprocess.cpp index ea812c3..f7781c3 100644 --- a/3rdparty/libprocess/src/subprocess.cpp +++ b/3rdparty/libprocess/src/subprocess.cpp @@ -43,6 +43,7 @@ #include <stout/os/chdir.hpp> #include <stout/os/close.hpp> #include <stout/os/dup.hpp> +#include <stout/os/exec.hpp> #include <stout/os/fcntl.hpp> #include <stout/os/signals.hpp> @@ -416,7 +417,7 @@ Try<Subprocess> subprocess( process.data->pid = pid.get(); #else // TODO(joerg84): Consider using the childHooks and parentHooks here. - Try<::internal::windows::ProcessData> process_data = + Try<os::windows::internal::ProcessData> process_data = internal::createChildProcess( path, argv, diff --git a/3rdparty/libprocess/src/windows/subprocess.hpp b/3rdparty/libprocess/src/windows/subprocess.hpp index 1bbb8af..d88fbde 100644 --- a/3rdparty/libprocess/src/windows/subprocess.hpp +++ b/3rdparty/libprocess/src/windows/subprocess.hpp @@ -26,13 +26,12 @@ #include <stout/foreach.hpp> #include <stout/hashset.hpp> #include <stout/option.hpp> -#include <stout/os.hpp> -#include <stout/os/shell.hpp> #include <stout/try.hpp> #include <stout/windows.hpp> #include <stout/os/close.hpp> #include <stout/os/environment.hpp> +#include <stout/os/exec.hpp> #include <userEnv.h> @@ -44,7 +43,7 @@ namespace internal { // to have been already quoted correctly before we generate `command`. // Incorrectly-quoted command arguments will probably lead the child process // to terminate with an error. See also NOTE on `process::subprocess`. -inline Try<::internal::windows::ProcessData> createChildProcess( +inline Try<os::windows::internal::ProcessData> createChildProcess( const std::string& path, const std::vector<std::string>& argv, const Option<std::map<std::string, std::string>>& environment, @@ -57,8 +56,8 @@ inline Try<::internal::windows::ProcessData> createChildProcess( const std::array<int_fd, 3> fds{ stdinfds.read, stdoutfds.write, stderrfds.write}; - Try<::internal::windows::ProcessData> process_data = - ::internal::windows::create_process( + Try<os::windows::internal::ProcessData> process_data = + os::windows::internal::create_process( path, argv, environment,
