Skip to content

Commit

Permalink
Problem: Poller size function missing
Browse files Browse the repository at this point in the history
Solution: Add it to poller_t
  • Loading branch information
gummif committed Oct 10, 2020
1 parent 03243ad commit 2af0c01
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
14 changes: 14 additions & 0 deletions tests/poller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,20 @@ TEST_CASE("poller wait with no handlers throws", "[poller]")
const zmq::error_t&);
}

#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 3, 3)
TEST_CASE("poller add/remove size checks", "[poller]")
{
zmq::context_t context;
zmq::socket_t socket{context, zmq::socket_type::router};
zmq::poller_t<> poller;
CHECK(poller.size() == 0);
poller.add(socket, zmq::event_flags::pollin);
CHECK(poller.size() == 1);
CHECK_NOTHROW(poller.remove(socket));
CHECK(poller.size() == 0);
}
#endif

TEST_CASE("poller remove unregistered throws", "[poller]")
{
zmq::context_t context;
Expand Down
9 changes: 9 additions & 0 deletions zmq.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2653,6 +2653,15 @@ template<typename T = no_user_data> class poller_t
throw error_t();
}

#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 3, 3)
size_t size() const noexcept
{
int rc = zmq_poller_size(const_cast<void *>(poller_ptr.get()));
ZMQ_ASSERT(rc >= 0);
return static_cast<size_t>(std::max(rc, 0));
}
#endif

private:
struct destroy_poller_t
{
Expand Down

0 comments on commit 2af0c01

Please sign in to comment.