Repository: mesos Updated Branches: refs/heads/master aff85cf41 -> 39c1da541
Refactored Node class in libprocess. Moved class Node out of process.cpp and into its own header as a part of refactoring process.cpp. Review: https://reviews.apache.org/r/25847 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/39c1da54 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/39c1da54 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/39c1da54 Branch: refs/heads/master Commit: 39c1da541f933c7723b18d028fad6744833e9686 Parents: aff85cf Author: Joris Van Remoortere <[email protected]> Authored: Fri Sep 19 15:26:26 2014 -0700 Committer: Niklas Q. Nielsen <[email protected]> Committed: Fri Sep 19 16:01:07 2014 -0700 ---------------------------------------------------------------------- 3rdparty/libprocess/include/Makefile.am | 1 + 3rdparty/libprocess/include/process/node.hpp | 37 +++++++++++++++++++++++ 3rdparty/libprocess/src/process.cpp | 28 +---------------- 3 files changed, 39 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/39c1da54/3rdparty/libprocess/include/Makefile.am ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/Makefile.am b/3rdparty/libprocess/include/Makefile.am index 09f6e41..542ae1c 100644 --- a/3rdparty/libprocess/include/Makefile.am +++ b/3rdparty/libprocess/include/Makefile.am @@ -31,6 +31,7 @@ nobase_include_HEADERS = \ process/metrics/timer.hpp \ process/mime.hpp \ process/mutex.hpp \ + process/node.hpp \ process/once.hpp \ process/owned.hpp \ process/pid.hpp \ http://git-wip-us.apache.org/repos/asf/mesos/blob/39c1da54/3rdparty/libprocess/include/process/node.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/node.hpp b/3rdparty/libprocess/include/process/node.hpp new file mode 100644 index 0000000..7a96894 --- /dev/null +++ b/3rdparty/libprocess/include/process/node.hpp @@ -0,0 +1,37 @@ +#ifndef __PROCESS_NODE_HPP__ +#define __PROCESS_NODE_HPP__ + +#include <unistd.h> + +#include <sstream> + +namespace process { + +// Represents a remote "node" (encapsulates IP address and port). +class Node +{ +public: + Node(uint32_t _ip = 0, uint16_t _port = 0) : ip(_ip), port(_port) {} + + bool operator < (const Node& that) const + { + if (ip == that.ip) { + return port < that.port; + } else { + return ip < that.ip; + } + } + + std::ostream& operator << (std::ostream& stream) const + { + stream << ip << ":" << port; + return stream; + } + + uint32_t ip; + uint16_t port; +}; + +} // namespace process { + +#endif // __PROCESS_NODE_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/39c1da54/3rdparty/libprocess/src/process.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp index 3ac56c7..8adc809 100644 --- a/3rdparty/libprocess/src/process.cpp +++ b/3rdparty/libprocess/src/process.cpp @@ -56,6 +56,7 @@ #include <process/io.hpp> #include <process/logging.hpp> #include <process/mime.hpp> +#include <process/node.hpp> #include <process/process.hpp> #include <process/profiler.hpp> #include <process/socket.hpp> @@ -109,33 +110,6 @@ using std::string; using std::stringstream; using std::vector; -// Represents a remote "node" (encapsulates IP address and port). -class Node -{ -public: - Node(uint32_t _ip = 0, uint16_t _port = 0) - : ip(_ip), port(_port) {} - - bool operator < (const Node& that) const - { - if (ip == that.ip) { - return port < that.port; - } else { - return ip < that.ip; - } - } - - ostream& operator << (ostream& stream) const - { - stream << ip << ":" << port; - return stream; - } - - uint32_t ip; - uint16_t port; -}; - - namespace process { namespace ID {
