From 83b91c8b7ef97d725874eed2a11a6632079024bd Mon Sep 17 00:00:00 2001 From: Gudmundur Adalsteinsson Date: Tue, 2 Apr 2019 14:01:10 +0000 Subject: [PATCH] Problem: Missing swap functions Solution: Implement for socket_t, context_t, message_t and poller_t Additionally remove dependency on by refactoring poller_t and remove unused include. --- tests/context.cpp | 15 +++++++++++++++ tests/message.cpp | 20 ++++++++++++++++++++ tests/monitor.cpp | 1 + tests/poller.cpp | 13 +++++++++++++ tests/socket.cpp | 14 ++++++++++++++ zmq.hpp | 48 +++++++++++++++++++++++++++++++++++++++-------- zmq_addon.hpp | 6 +++++- 7 files changed, 108 insertions(+), 9 deletions(-) diff --git a/tests/context.cpp b/tests/context.cpp index 135c9bd..c8e8267 100644 --- a/tests/context.cpp +++ b/tests/context.cpp @@ -1,6 +1,11 @@ #include #include +#if (__cplusplus >= 201703L) +static_assert(std::is_nothrow_swappable::value, + "context_t should be nothrow swappable"); +#endif + TEST_CASE("context construct default and destroy", "[context]") { zmq::context_t context; @@ -12,3 +17,13 @@ TEST_CASE("context create, close and destroy", "[context]") context.close(); CHECK(NULL == (void *) context); } + +#ifdef ZMQ_CPP11 +TEST_CASE("context swap", "[context]") +{ + zmq::context_t context1; + zmq::context_t context2; + using std::swap; + swap(context1, context2); +} +#endif diff --git a/tests/message.cpp b/tests/message.cpp index 693e607..2f22bce 100644 --- a/tests/message.cpp +++ b/tests/message.cpp @@ -8,6 +8,10 @@ static_assert(!std::is_copy_constructible::value, static_assert(!std::is_copy_assignable::value, "message_t should not be copy-assignable"); #endif +#if (__cplusplus >= 201703L) +static_assert(std::is_nothrow_swappable::value, + "message_t should be nothrow swappable"); +#endif TEST_CASE("message default constructed", "[message]") { @@ -15,6 +19,22 @@ TEST_CASE("message default constructed", "[message]") CHECK(0u == message.size()); } +#ifdef ZMQ_CPP11 +TEST_CASE("message swap", "[message]") +{ + const std::string data = "foo"; + zmq::message_t message1; + zmq::message_t message2(data.data(), data.size()); + using std::swap; + swap(message1, message2); + CHECK(message1.size() == data.size()); + CHECK(message2.size() == 0); + swap(message1, message2); + CHECK(message1.size() == 0); + CHECK(message2.size() == data.size()); +} +#endif + namespace { const char *const data = "Hi"; } diff --git a/tests/monitor.cpp b/tests/monitor.cpp index 9de1f6b..ef14b23 100644 --- a/tests/monitor.cpp +++ b/tests/monitor.cpp @@ -4,6 +4,7 @@ #include #include #include +#include class mock_monitor_t : public zmq::monitor_t { diff --git a/tests/poller.cpp b/tests/poller.cpp index 47689b3..290582d 100644 --- a/tests/poller.cpp +++ b/tests/poller.cpp @@ -5,6 +5,11 @@ #include #include +#if (__cplusplus >= 201703L) +static_assert(std::is_nothrow_swappable>::value, + "poller_t should be nothrow swappable"); +#endif + TEST_CASE("poller create destroy", "[poller]") { zmq::poller_t<> poller; @@ -28,6 +33,14 @@ TEST_CASE("poller move assign empty", "[poller]") b = std::move(a); } +TEST_CASE("poller swap", "[poller]") +{ + zmq::poller_t<> a; + zmq::poller_t<> b; + using std::swap; + swap(a, b); +} + TEST_CASE("poller move construct non empty", "[poller]") { zmq::context_t context; diff --git a/tests/socket.cpp b/tests/socket.cpp index 569a7cb..1365066 100644 --- a/tests/socket.cpp +++ b/tests/socket.cpp @@ -4,6 +4,11 @@ #include #endif +#if (__cplusplus >= 201703L) +static_assert(std::is_nothrow_swappable::value, + "socket_t should be nothrow swappable"); +#endif + TEST_CASE("socket create destroy", "[socket]") { zmq::context_t context; @@ -16,6 +21,15 @@ TEST_CASE("socket create by enum and destroy", "[socket]") zmq::context_t context; zmq::socket_t socket(context, zmq::socket_type::router); } + +TEST_CASE("socket swap", "[socket]") +{ + zmq::context_t context; + zmq::socket_t socket1(context, zmq::socket_type::router); + zmq::socket_t socket2(context, zmq::socket_type::dealer); + using std::swap; + swap(socket1, socket2); +} #endif TEST_CASE("socket sends and receives const buffer", "[socket]") diff --git a/zmq.hpp b/zmq.hpp index fc3b884..53e7ee6 100644 --- a/zmq.hpp +++ b/zmq.hpp @@ -73,8 +73,6 @@ #ifdef ZMQ_CPP11 #include #include -#include -#include #include #endif @@ -476,6 +474,12 @@ class message_t return os.str(); } + void swap(message_t &other) ZMQ_NOTHROW + { + // this assumes zmq::msg_t from libzmq is trivially relocatable + std::swap(msg, other.msg); + } + private: // The underlying message zmq_msg_t msg; @@ -486,6 +490,11 @@ class message_t void operator=(const message_t &) ZMQ_DELETED_FUNCTION; }; +inline void swap(message_t &a, message_t &b) ZMQ_NOTHROW +{ + a.swap(b); +} + class context_t { public: @@ -554,6 +563,11 @@ class context_t operator bool() const ZMQ_NOTHROW { return ptr != ZMQ_NULLPTR; } + void swap(context_t &other) ZMQ_NOTHROW + { + std::swap(ptr, other.ptr); + } + private: void *ptr; @@ -561,6 +575,10 @@ class context_t void operator=(const context_t &) ZMQ_DELETED_FUNCTION; }; +inline void swap(context_t &a, context_t &b) ZMQ_NOTHROW { + a.swap(b); +} + #ifdef ZMQ_CPP11 enum class socket_type : int { @@ -767,6 +785,12 @@ class socket_t } #endif + void swap(socket_t &other) ZMQ_NOTHROW + { + std::swap(ptr, other.ptr); + std::swap(ctxptr, other.ctxptr); + } + private: void *ptr; void *ctxptr; @@ -775,6 +799,10 @@ class socket_t void operator=(const socket_t &) ZMQ_DELETED_FUNCTION; }; +inline void swap(socket_t &a, socket_t &b) ZMQ_NOTHROW { + a.swap(b); +} + ZMQ_DEPRECATED("from 4.3.1, use proxy taking socket_t objects") inline void proxy(void *frontend, void *backend, void *capture) { @@ -1119,6 +1147,8 @@ class monitor_t template class poller_t { public: + poller_t() = default; + void add(zmq::socket_t &socket, short events, T *user_data) { if (0 @@ -1164,17 +1194,19 @@ template class poller_t } private: - std::unique_ptr> poller_ptr{ + std::unique_ptr poller_ptr{ []() { auto poller_new = zmq_poller_new(); if (poller_new) return poller_new; throw error_t(); - }(), - [](void *ptr) { - int rc = zmq_poller_destroy(&ptr); - ZMQ_ASSERT(rc == 0); - }}; + }(), &destroy_poller}; + + static void destroy_poller(void *ptr) + { + int rc = zmq_poller_destroy(&ptr); + ZMQ_ASSERT(rc == 0); + } }; #endif // defined(ZMQ_BUILD_DRAFT_API) && defined(ZMQ_CPP11) && defined(ZMQ_HAVE_POLLER) diff --git a/zmq_addon.hpp b/zmq_addon.hpp index 6e233bc..90cd32a 100644 --- a/zmq_addon.hpp +++ b/zmq_addon.hpp @@ -30,6 +30,10 @@ #include #include #include +#ifdef ZMQ_CPP11 +#include +#include +#endif namespace zmq { @@ -245,7 +249,7 @@ class multipart_t m_parts.pop_back(); return message; } - + // get message part from front const message_t &front() {