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/05/23 22:17:13 UTC
[1/4] mesos git commit: CMake: Added build targets for Mesos
executables.
Repository: mesos
Updated Branches:
refs/heads/master 028480bec -> 448708826
CMake: Added build targets for Mesos executables.
Review: https://reviews.apache.org/r/47410/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/44870882
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/44870882
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/44870882
Branch: refs/heads/master
Commit: 448708826a511db4bb0a5cc441426d5aeb2f5c75
Parents: d78f272
Author: Alex Clemmer <cl...@gmail.com>
Authored: Fri May 20 14:01:41 2016 -0700
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Mon May 23 15:16:58 2016 -0700
----------------------------------------------------------------------
.../cmake/Process3rdpartyConfigure.cmake | 41 +++++++++++++++++++-
1 file changed, 39 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/44870882/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake b/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
index 2c4d2e0..22ae4ac 100644
--- a/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
+++ b/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
@@ -125,8 +125,45 @@ endif (NOT WIN32)
include(StoutConfigure)
include(ProcessConfigure)
-# Define target for AGENT.
-##########################
+# DEFINE MESOS BUILD TARGETS.
+#############################
+
+# Define target for agent.
set(
AGENT_TARGET mesos-agent
CACHE STRING "Target we use to refer to agent executable")
+
+# Define target for containerizer.
+set(
+ MESOS_CONTAINERIZER mesos-containerizer
+ CACHE STRING "Target for containerizer")
+
+# Define target for executor.
+set(
+ MESOS_EXECUTOR mesos-executor
+ CACHE STRING "Target for executor")
+
+# Define target for fetcher.
+set(
+ MESOS_FETCHER mesos-fetcher
+ CACHE STRING "Target for fetcher")
+
+# Define target for health-check.
+set(
+ MESOS_HEALTH_CHECK mesos-health-check
+ CACHE STRING "Target for healt-check")
+
+# Define target for health-master.
+set(
+ MESOS_MASTER mesos-master
+ CACHE STRING "Target for master")
+
+# Define target for usage.
+set(
+ MESOS_USAGE mesos-usage
+ CACHE STRING "Target for usage")
+
+# Define target for docker.
+set(
+ MESOS_DOCKER_EXECUTOR mesos-docker-executor
+ CACHE STRING "Target for docker executor")
[3/4] mesos git commit: Stout: Removed implicit conversions in
`permissions.hpp` on Windows.
Posted by jo...@apache.org.
Stout: Removed implicit conversions in `permissions.hpp` on Windows.
Review: https://reviews.apache.org/r/47390/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d78f2721
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d78f2721
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d78f2721
Branch: refs/heads/master
Commit: d78f2721590c49ec65d00cc506ca551235741429
Parents: a05cb3d
Author: Alex Clemmer <cl...@gmail.com>
Authored: Fri May 20 13:58:43 2016 -0700
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Mon May 23 15:16:58 2016 -0700
----------------------------------------------------------------------
3rdparty/stout/include/stout/os/permissions.hpp | 30 ++++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/d78f2721/3rdparty/stout/include/stout/os/permissions.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/os/permissions.hpp b/3rdparty/stout/include/stout/os/permissions.hpp
index 16b5bca..1fa7614 100644
--- a/3rdparty/stout/include/stout/os/permissions.hpp
+++ b/3rdparty/stout/include/stout/os/permissions.hpp
@@ -24,21 +24,21 @@ struct Permissions
{
explicit Permissions(mode_t mode)
{
- owner.r = mode & S_IRUSR;
- owner.w = mode & S_IWUSR;
- owner.x = mode & S_IXUSR;
- owner.rwx = mode & S_IRWXU;
- group.r = mode & S_IRGRP;
- group.w = mode & S_IWGRP;
- group.x = mode & S_IXGRP;
- group.rwx = mode & S_IRWXG;
- others.r = mode & S_IROTH;
- others.w = mode & S_IWOTH;
- others.x = mode & S_IXOTH;
- others.rwx = mode & S_IRWXO;
- setuid = mode & S_ISUID;
- setgid = mode & S_ISGID;
- sticky = mode & S_ISVTX;
+ owner.r = (mode & S_IRUSR) != 0;
+ owner.w = (mode & S_IWUSR) != 0;
+ owner.x = (mode & S_IXUSR) != 0;
+ owner.rwx = (mode & S_IRWXU) != 0;
+ group.r = (mode & S_IRGRP) != 0;
+ group.w = (mode & S_IWGRP) != 0;
+ group.x = (mode & S_IXGRP) != 0;
+ group.rwx = (mode & S_IRWXG) != 0;
+ others.r = (mode & S_IROTH) != 0;
+ others.w = (mode & S_IWOTH) != 0;
+ others.x = (mode & S_IXOTH) != 0;
+ others.rwx = (mode & S_IRWXO) != 0;
+ setuid = (mode & S_ISUID) != 0;
+ setgid = (mode & S_ISGID) != 0;
+ sticky = (mode & S_ISVTX) != 0;
}
struct
[4/4] mesos git commit: Stout: Implemented `setHostname` on Windows.
Posted by jo...@apache.org.
Stout: Implemented `setHostname` on Windows.
Review: https://reviews.apache.org/r/47386/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a50bb26a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a50bb26a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a50bb26a
Branch: refs/heads/master
Commit: a50bb26a496d565bf44631eacbb4e59b896a83c4
Parents: 028480b
Author: Alex Clemmer <cl...@gmail.com>
Authored: Fri May 20 13:55:15 2016 -0700
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Mon May 23 15:16:58 2016 -0700
----------------------------------------------------------------------
3rdparty/stout/include/Makefile.am | 2 ++
3rdparty/stout/include/stout/net.hpp | 16 +++-------
3rdparty/stout/include/stout/posix/net.hpp | 39 +++++++++++++++++++++++
3rdparty/stout/include/stout/windows/net.hpp | 38 ++++++++++++++++++++++
4 files changed, 84 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a50bb26a/3rdparty/stout/include/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/Makefile.am b/3rdparty/stout/include/Makefile.am
index 23d1497..51d6659 100644
--- a/3rdparty/stout/include/Makefile.am
+++ b/3rdparty/stout/include/Makefile.am
@@ -155,6 +155,7 @@ nobase_include_HEADERS = \
stout/protobuf.hpp \
stout/posix/dynamiclibrary.hpp \
stout/posix/fs.hpp \
+ stout/posix/net.hpp \
stout/posix/os.hpp \
stout/recordio.hpp \
stout/representation.hpp \
@@ -181,4 +182,5 @@ nobase_include_HEADERS = \
stout/windows/error.hpp \
stout/windows/format.hpp \
stout/windows/fs.hpp \
+ stout/windows/net.hpp \
stout/windows/os.hpp
http://git-wip-us.apache.org/repos/asf/mesos/blob/a50bb26a/3rdparty/stout/include/stout/net.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/net.hpp b/3rdparty/stout/include/stout/net.hpp
index 1c99d89..341d8ec 100644
--- a/3rdparty/stout/include/stout/net.hpp
+++ b/3rdparty/stout/include/stout/net.hpp
@@ -50,6 +50,11 @@
#include <stout/bytes.hpp>
#include <stout/error.hpp>
#include <stout/ip.hpp>
+#ifdef __WINDOWS__
+#include <stout/windows/net.hpp>
+#else
+#include <stout/posix/net.hpp>
+#endif // __WINDOWS__
#include <stout/option.hpp>
#include <stout/stringify.hpp>
#include <stout/try.hpp>
@@ -273,17 +278,6 @@ inline Try<std::string> getHostname(const IP& ip)
}
-// Returns a `Try` of the result of attempting to set the `hostname`.
-inline Try<Nothing> setHostname(const std::string& hostname)
-{
- if (sethostname(hostname.c_str(), hostname.size()) != 0) {
- return ErrnoError();
- }
-
- return Nothing();
-}
-
-
// Returns the names of all the link devices in the system.
inline Try<std::set<std::string>> links()
{
http://git-wip-us.apache.org/repos/asf/mesos/blob/a50bb26a/3rdparty/stout/include/stout/posix/net.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/posix/net.hpp b/3rdparty/stout/include/stout/posix/net.hpp
new file mode 100644
index 0000000..39b8982
--- /dev/null
+++ b/3rdparty/stout/include/stout/posix/net.hpp
@@ -0,0 +1,39 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef __STOUT_POSIX_NET_HPP__
+#define __STOUT_POSIX_NET_HPP__
+
+#include <unistd.h>
+
+#include <string>
+
+#include <stout/error.hpp>
+#include <stout/nothing.hpp>
+#include <stout/try.hpp>
+
+
+namespace net {
+
+// Returns a `Try` of the result of attempting to set the `hostname`.
+inline Try<Nothing> setHostname(const std::string& hostname)
+{
+ if (sethostname(hostname.c_str(), hostname.size()) != 0) {
+ return ErrnoError();
+ }
+
+ return Nothing();
+}
+
+} // namespace net {
+
+#endif // __STOUT_POSIX_NET_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/a50bb26a/3rdparty/stout/include/stout/windows/net.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/windows/net.hpp b/3rdparty/stout/include/stout/windows/net.hpp
new file mode 100644
index 0000000..1bed115
--- /dev/null
+++ b/3rdparty/stout/include/stout/windows/net.hpp
@@ -0,0 +1,38 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef __STOUT_WINDOWS_NET_HPP__
+#define __STOUT_WINDOWS_NET_HPP__
+
+#include <string>
+
+#include <stout/error.hpp>
+#include <stout/nothing.hpp>
+#include <stout/try.hpp>
+#include <stout/windows.hpp>
+
+
+namespace net {
+
+// Returns a `Try` of the result of attempting to set the `hostname`.
+inline Try<Nothing> setHostname(const std::string& hostname)
+{
+ if (SetComputerName(hostname.c_str()) == 0) {
+ return WindowsError();
+ }
+
+ return Nothing();
+}
+
+} // namespace net {
+
+#endif // __STOUT_WINDOWS_NET_HPP__
[2/4] mesos git commit: Stout: Included missing headers in some files.
Posted by jo...@apache.org.
Stout: Included missing headers in some files.
Review: https://reviews.apache.org/r/47388/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a05cb3d9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a05cb3d9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a05cb3d9
Branch: refs/heads/master
Commit: a05cb3d934af2e0bb988963182e1276baf64a5ec
Parents: a50bb26
Author: Alex Clemmer <cl...@gmail.com>
Authored: Fri May 20 13:56:35 2016 -0700
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Mon May 23 15:16:58 2016 -0700
----------------------------------------------------------------------
3rdparty/stout/include/stout/os/posix/fork.hpp | 1 +
3rdparty/stout/include/stout/os/windows/killtree.hpp | 2 ++
3rdparty/stout/include/stout/windows.hpp | 1 +
3 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a05cb3d9/3rdparty/stout/include/stout/os/posix/fork.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/os/posix/fork.hpp b/3rdparty/stout/include/stout/os/posix/fork.hpp
index 695fe66..a906e4e 100644
--- a/3rdparty/stout/include/stout/os/posix/fork.hpp
+++ b/3rdparty/stout/include/stout/os/posix/fork.hpp
@@ -30,6 +30,7 @@
#include <string>
#include <stout/abort.hpp>
+#include <stout/check.hpp>
#include <stout/error.hpp>
#include <stout/exit.hpp>
#include <stout/foreach.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/a05cb3d9/3rdparty/stout/include/stout/os/windows/killtree.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/os/windows/killtree.hpp b/3rdparty/stout/include/stout/os/windows/killtree.hpp
index f0139a5..2be2f8c 100644
--- a/3rdparty/stout/include/stout/os/windows/killtree.hpp
+++ b/3rdparty/stout/include/stout/os/windows/killtree.hpp
@@ -15,6 +15,8 @@
#include <stdlib.h>
+#include <stout/os.hpp>
+
#include <stout/os/pstree.hpp>
namespace os {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a05cb3d9/3rdparty/stout/include/stout/windows.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/windows.hpp b/3rdparty/stout/include/stout/windows.hpp
index 1ee457c..a71e2f4 100644
--- a/3rdparty/stout/include/stout/windows.hpp
+++ b/3rdparty/stout/include/stout/windows.hpp
@@ -28,6 +28,7 @@
#include <WS2tcpip.h>
#include <Winsock2.h>
#include <mswsock.h>
+#include <winioctl.h>
#include <Windows.h>
#include <memory>