generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2024-12-13 10:52:57 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #190 from sigiesec/fix-poller-api-error-handling

Browse Source 
Fix copy/move constructors of poller_t, and make error handling consistent with rest of API
This commit is contained in:
Luca Boccassi 2018-03-26 16:21:42 +01:00 committed by GitHub
commit 52c606ed86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
zmq.hpp
View File

@ -990,25 +990,45 @@ namespace zmq
~poller_t ()
{
zmq_poller_destroy (&poller_ptr);
if (poller_ptr)
{
int rc = zmq_poller_destroy (&poller_ptr);
assert(rc == 0);
}
}
poller_t(const poller_t&) = delete;
poller_t &operator=(const poller_t&) = delete;
poller_t(poller_t&& src)
: poller_ptr(src.poller_ptr)
, poller_events(std::move (src.poller_events))
{
src.poller_ptr = NULL;
}
poller_t &operator=(poller_t&& src)
{
poller_ptr = src.poller_ptr;
poller_events = std::move (src.poller_events);
src.poller_ptr = NULL;
return *this;
}
bool add (zmq::socket_t &socket, short events, std::function<void(void)> &handler)
void add (zmq::socket_t &socket, short events, std::function<void(void)> &handler)
{
if (0 == zmq_poller_add (poller_ptr, socket.ptr, handler ? &handler : NULL, events)) {
poller_events.emplace_back (zmq_poller_event_t ());
return true;
return;
}
return false;
throw error_t ();
}
bool remove (zmq::socket_t &socket)
void remove (zmq::socket_t &socket)
{
if (0 == zmq_poller_remove (poller_ptr, socket.ptr)) {
poller_events.pop_back ();
return true;
return;
}
return false;
throw error_t ();
}
bool wait (std::chrono::milliseconds timeout)