Commit b47179f1 authored by louiz’'s avatar louiz’

Fix the ordering of poll callbacks, with ppoll too

parent b29d9444
......@@ -171,21 +171,22 @@ int Poller::poll(const std::chrono::milliseconds& timeout)
assert(static_cast<unsigned int>(nb_events) <= this->nfds);
for (size_t i = 0; i <= this->nfds && nb_events != 0; ++i)
{
auto socket_handler = this->socket_handlers.at(this->fds[i].fd);
if (this->fds[i].revents == 0)
continue;
else if (this->fds[i].revents & POLLIN)
else if (this->fds[i].revents & POLLIN && socket_handler->is_connected())
{
auto socket_handler = this->socket_handlers.at(this->fds[i].fd);
socket_handler->on_recv();
nb_events--;
}
else if (this->fds[i].revents & POLLOUT)
else if (this->fds[i].revents & POLLOUT && socket_handler->is_connected())
{
auto socket_handler = this->socket_handlers.at(this->fds[i].fd);
if (socket_handler->is_connected())
socket_handler->on_send();
else
socket_handler->connect();
nb_events--;
}
else if (this->fds[i].revents & POLLOUT)
{
socket_handler->connect();
nb_events--;
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment