* fix zeromq#207: poller.remove(raw_fd) in handler

pavel-orekhov · Jan 31, 2018 · 23d979e · 23d979e
1 parent b6632bf
commit 23d979e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/src/tests/test_loop.cpp b/src/tests/test_loop.cpp
@@ -269,6 +269,8 @@ BOOST_AUTO_TEST_CASE(remove_fd_in_handler)
 
     int test1 = 0;
     loop.add(pipefd[0], [&](){
+        char buffer[10];
+        BOOST_CHECK_EQUAL(4, read(pipefd[0],buffer,10));
         test1 = 1;
         loop.remove(pipefd[0]);
         return true;
@@ -294,7 +296,9 @@ BOOST_AUTO_TEST_CASE(remove_invalid_fd_in_handler)
     BOOST_CHECK_EQUAL(0, pipe(pipefd));
 
     int test1 = 0;
-    loop.add(pipefd[0], [&test1,&loop](){
+    loop.add(pipefd[0], [&](){
+        char buffer[10];
+        BOOST_CHECK_EQUAL(4, read(pipefd[0],buffer,10));
         test1 = 1;
         loop.remove(STDIN_FILENO);
         return true;

diff --git a/src/zmqpp/poller.cpp b/src/zmqpp/poller.cpp
@@ -109,9 +109,26 @@ void poller::remove(socket_t const& socket)
 
 void poller::remove(raw_socket_t const descriptor)
 {
-	zmq_pollitem_t const item{ nullptr, descriptor, 0, 0 };
-	if (descriptor != invalid_fd)
-		remove(item);
+	if (descriptor == invalid_fd)
+		return;
+
+	auto found = _fdindex.find(descriptor);
+	if (_fdindex.end() == found) { return; }
+
+	if ( _items.size() - 1 == found->second )
+	{
+		_items.pop_back();
+		_fdindex.erase(found);
+		return;
+	}
+
+	std::swap(_items[found->second], _items.back());
+	_items.pop_back();
+
+	auto index = found->second;
+	_fdindex.erase(found);
+
+	reindex( index );
 }
 
 void poller::remove(zmq_pollitem_t const& item)