You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2016/06/17 21:18:06 UTC
[1/4] mesos git commit: Clarified comments on socket data structures
in SocketManager.
Repository: mesos
Updated Branches:
refs/heads/master 74820f7a9 -> d2d5c409f
Clarified comments on socket data structures in SocketManager.
Review: https://reviews.apache.org/r/46025/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/19730ee8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/19730ee8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/19730ee8
Branch: refs/heads/master
Commit: 19730ee8f9fb3a686c7879645acda231fe9c17a7
Parents: 74820f7
Author: Neil Conway <ne...@gmail.com>
Authored: Fri Jun 17 12:10:27 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Fri Jun 17 14:16:55 2016 -0700
----------------------------------------------------------------------
3rdparty/libprocess/src/process.cpp | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/19730ee8/3rdparty/libprocess/src/process.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp
index 9eaa7dd..703f673 100644
--- a/3rdparty/libprocess/src/process.cpp
+++ b/3rdparty/libprocess/src/process.cpp
@@ -358,29 +358,29 @@ private:
Socket* socket,
Message* message);
- // Collection of all active sockets.
+ // Collection of all active sockets (both inbound and outbound).
map<int, Socket*> sockets;
// Collection of sockets that should be disposed when they are
// finished being used (e.g., when there is no more data to send on
- // them).
+ // them). Can contain both inbound and outbound sockets.
set<int> dispose;
- // Map from socket to socket address (ip, port).
+ // Map from socket to socket address for outbound sockets.
map<int, Address> addresses;
- // Maps from socket address (ip, port) to temporary sockets (i.e.,
- // they will get closed once there is no more data to send on them).
+ // Map from socket address to temporary sockets (outbound sockets
+ // that will be closed once there is no more data to send on them).
map<Address, int> temps;
- // Maps from socket address (ip, port) to persistent sockets (i.e., they will
- // remain open even if there is no more data to send on them). We
- // distinguish these from the 'temps' collection so we can tell when
- // a persistent socket has been lost (and thus generate
- // ExitedEvents).
+ // Map from socket address (ip, port) to persistent sockets
+ // (outbound sockets that will remain open even if there is no more
+ // data to send on them). We distinguish these from the 'temps'
+ // collection so we can tell when a persistent socket has been lost
+ // (and thus generate ExitedEvents).
map<Address, int> persists;
- // Map from socket to outgoing queue.
+ // Map from outbound socket to outgoing queue.
map<int, queue<Encoder*>> outgoing;
// HTTP proxies.
[3/4] mesos git commit: Fixed Cmake build for Nvidia GPU support on
Linux in stout.
Posted by bm...@apache.org.
Fixed Cmake build for Nvidia GPU support on Linux in stout.
Review: https://reviews.apache.org/r/48882/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1f65937b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1f65937b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1f65937b
Branch: refs/heads/master
Commit: 1f65937ba38eca54247447ceafd6ccdd93163cdc
Parents: da61043
Author: Kevin Klues <kl...@gmail.com>
Authored: Fri Jun 17 14:17:15 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Fri Jun 17 14:17:15 2016 -0700
----------------------------------------------------------------------
3rdparty/stout/cmake/StoutConfigure.cmake | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/1f65937b/3rdparty/stout/cmake/StoutConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/stout/cmake/StoutConfigure.cmake b/3rdparty/stout/cmake/StoutConfigure.cmake
index aa28c1b..e4e3217 100644
--- a/3rdparty/stout/cmake/StoutConfigure.cmake
+++ b/3rdparty/stout/cmake/StoutConfigure.cmake
@@ -34,6 +34,7 @@ set(STOUT_DEPENDENCIES
${STOUT_DEPENDENCIES}
${BOOST_TARGET}
${GLOG_TARGET}
+ ${NVML_TARGET}
${PROTOBUF_TARGET}
${PICOJSON_TARGET}
)
@@ -55,6 +56,7 @@ set(STOUT_INCLUDE_DIRS
${APR_INCLUDE_DIR}
${BOOST_INCLUDE_DIR}
${GLOG_INCLUDE_DIR}
+ ${NVML_INCLUDE_DIR}
${PICOJSON_INCLUDE_DIR}
${PROTOBUF_INCLUDE_DIR}
${SVN_INCLUDE_DIR}
[2/4] mesos git commit: Fixed Cmake build for Nvidia GPU support on
Linux.
Posted by bm...@apache.org.
Fixed Cmake build for Nvidia GPU support on Linux.
Review: https://reviews.apache.org/r/48881/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/da610431
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/da610431
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/da610431
Branch: refs/heads/master
Commit: da610431162e738615a59cb04fb69766b9a847d5
Parents: 19730ee
Author: Kevin Klues <kl...@gmail.com>
Authored: Fri Jun 17 14:17:07 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Fri Jun 17 14:17:07 2016 -0700
----------------------------------------------------------------------
3rdparty/CMakeLists.txt | 2 +-
src/CMakeLists.txt | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/da610431/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index bcb8c71..15f3171 100755
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -37,7 +37,7 @@ else (REBUNDLED)
set(BOOST_URL ${UPSTREAM_URL}/boost-${BOOST_VERSION}.tar.gz)
set(GLOG_URL ${UPSTREAM_URL}/glog-${GLOG_VERSION}.tar.gz)
set(PICOJSON_URL ${UPSTREAM_URL}/picojson-${PICOJSON_VERSION}.tar.gz)
- set(NVML_URL ${UPSTREAM_URREBUNDLED_DIRL}/nvml-${NVML_VERSION}.tar.gz)
+ set(NVML_URL ${UPSTREAM_URL}/nvml-${NVML_VERSION}.tar.gz)
set(HTTP_PARSER_URL ${UPSTREAM_URL}/http-parser-${HTTP_PARSER_VERSION}.tar.gz)
set(LIBEV_URL ${UPSTREAM_URL}/libev-${LIBEV_VERSION}.tar.gz)
endif (REBUNDLED)
http://git-wip-us.apache.org/repos/asf/mesos/blob/da610431/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 59246e7..d661862 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -167,6 +167,8 @@ set(LINUX_SRC
slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
slave/containerizer/mesos/isolators/filesystem/linux.cpp
slave/containerizer/mesos/isolators/filesystem/shared.cpp
+ slave/containerizer/mesos/isolators/gpu/nvidia.cpp
+ slave/containerizer/mesos/isolators/gpu/nvml.cpp
slave/containerizer/mesos/isolators/namespaces/pid.cpp
slave/containerizer/mesos/isolators/network/cni/cni.cpp
slave/containerizer/mesos/provisioner/backends/aufs.cpp
[4/4] mesos git commit: Fixed Cmake build for Nvidia GPU support on
Linux in libprocess.
Posted by bm...@apache.org.
Fixed Cmake build for Nvidia GPU support on Linux in libprocess.
Review: https://reviews.apache.org/r/48883/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d2d5c409
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d2d5c409
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d2d5c409
Branch: refs/heads/master
Commit: d2d5c409f51f689f523137b502f553225d3474ae
Parents: 1f65937
Author: Kevin Klues <kl...@gmail.com>
Authored: Fri Jun 17 14:17:20 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Fri Jun 17 14:17:20 2016 -0700
----------------------------------------------------------------------
3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/d2d5c409/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake b/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
index 22ae4ac..fa84e7c 100644
--- a/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
+++ b/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
@@ -24,6 +24,7 @@ EXTERNAL("http_parser" ${HTTP_PARSER_VERSION} "${MESOS_3RDPARTY_BIN}")
EXTERNAL("libev" ${LIBEV_VERSION} "${MESOS_3RDPARTY_BIN}")
EXTERNAL("libevent" ${LIBEVENT_VERSION} "${MESOS_3RDPARTY_BIN}")
EXTERNAL("libapr" ${LIBAPR_VERSION} "${MESOS_3RDPARTY_BIN}")
+EXTERNAL("nvml" ${NVML_VERSION} "${MESOS_3RDPARTY_BIN}")
EXTERNAL("protobuf" ${PROTOBUF_VERSION} "${MESOS_3RDPARTY_BIN}")
if (NOT WIN32)
@@ -55,6 +56,7 @@ set(BOOST_INCLUDE_DIR ${BOOST_ROOT})
set(GPERFTOOLS_INCLUDE_DIR ${GPERFTOOLS}/src)
set(HTTP_PARSER_INCLUDE_DIR ${HTTP_PARSER_ROOT})
set(LIBEV_INCLUDE_DIR ${LIBEV_ROOT})
+set(NVML_INCLUDE_DIR ${NVML_ROOT})
set(PICOJSON_INCLUDE_DIR ${PICOJSON_ROOT})
if (WIN32)