generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2025-11-11 18:17:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #208 from kurdybacha/poller-fix

Browse Source 
Problem: poller_t invalid behavior on moved sockets
This commit is contained in:
Simon Giesecke
2018-04-19 17:53:00 +02:00
committed by GitHub
parent e317fc873a f5b9fcc4ef
commit 85a9805f16
2 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/poller.cpp
View File

@@ -228,4 +228,28 @@ TEST(poller, client_server)
ASSERT_TRUE(got_pollout); ASSERT_TRUE(got_pollout);
} }
TEST(poller, poller_add_invalid_socket_throws)
{
zmq::context_t context;
zmq::poller_t poller;
zmq::socket_t a {context, zmq::socket_type::router};
zmq::socket_t b {std::move (a)};
ASSERT_THROW (poller.add (a, ZMQ_POLLIN, zmq::poller_t::handler_t {}),
zmq::error_t);
ASSERT_EQ (0u, poller.size ());
}
TEST(poller, poller_remove_invalid_socket_throws)
{
zmq::context_t context;
zmq::socket_t socket {context, zmq::socket_type::router};
zmq::poller_t poller;
ASSERT_NO_THROW (poller.add (socket, ZMQ_POLLIN, zmq::poller_t::handler_t {}));
ASSERT_EQ (1u, poller.size ());
std::vector<zmq::socket_t> sockets;
sockets.emplace_back (std::move (socket));
ASSERT_THROW (poller.remove (socket), zmq::error_t);
ASSERT_EQ (1u, poller.size ());
}
#endif #endif

27
zmq.hpp
View File

@@ -536,6 +536,11 @@ namespace zmq
{ {
return ptr; return ptr;
} }
inline operator bool() const ZMQ_NOTHROW
{
return ptr != NULL;
}
private: private:
void *ptr; void *ptr;
@@ -1053,26 +1058,24 @@ namespace zmq
void add (zmq::socket_t &socket, short events, handler_t handler) void add (zmq::socket_t &socket, short events, handler_t handler)
{ {
handler_t *handler_ptr = nullptr; auto it = std::end (handlers);
/// \todo is it sensible to allow handler to be empty? doesn't this lead to an error when the event is signalled? (perhaps it should already lead to an error in zmq_poller_add then) auto inserted = false;
if (handler) { if (handler)
auto emplace_res = handlers.emplace(&socket, std::move(handler)); std::tie(it, inserted) = handlers.emplace (socket.ptr, std::move (handler));
handler_ptr = &emplace_res.first->second; if (0 == zmq_poller_add (poller_ptr, socket.ptr, inserted ? &(it->second) : nullptr, events)) {
}
if (0 == zmq_poller_add (poller_ptr, socket.ptr, handler_ptr, events)) {
poller_events.emplace_back (zmq_poller_event_t ()); poller_events.emplace_back (zmq_poller_event_t ());
return; return;
} }
// rollback
if (inserted)
handlers.erase (socket.ptr);
throw error_t (); throw error_t ();
} }
void remove (zmq::socket_t &socket) void remove (zmq::socket_t &socket)
{ {
if (0 == zmq_poller_remove (poller_ptr, socket.ptr)) { if (0 == zmq_poller_remove (poller_ptr, socket.ptr)) {
auto it = handlers.find (&socket); handlers.erase (socket.ptr);
if (it != handlers.end ()) { /// \todo this may only be false if handler was empty on add
handlers.erase (it);
}
poller_events.pop_back (); poller_events.pop_back ();
return; return;
} }
@@ -1108,7 +1111,7 @@ namespace zmq
private: private:
void *poller_ptr; void *poller_ptr;
std::vector<zmq_poller_event_t> poller_events; std::vector<zmq_poller_event_t> poller_events;
std::unordered_map<socket_t*, handler_t> handlers; std::unordered_map<void*, handler_t> handlers;
}; // class poller_t }; // class poller_t
#endif // defined(ZMQ_BUILD_DRAFT_API) && defined(ZMQ_CPP11) && defined(ZMQ_HAVE_POLLER) #endif // defined(ZMQ_BUILD_DRAFT_API) && defined(ZMQ_CPP11) && defined(ZMQ_HAVE_POLLER)