mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the ordering of poll callbacks, with ppoll too

Browse Source
This commit is contained in:
Florent Le Coz
2016-02-24 09:31:30 +01:00
parent b29d94444d
commit b47179f125
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
louloulibs/network/poller.cpp
+7 -6
View File
@@ -171,20 +171,21 @@ int Poller::poll(const std::chrono::milliseconds& timeout)
assert(static_cast<unsigned int>(nb_events) <= this->nfds); assert(static_cast<unsigned int>(nb_events) <= this->nfds);
for (size_t i = 0; i <= this->nfds && nb_events != 0; ++i) 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) if (this->fds[i].revents == 0)
continue; 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(); socket_handler->on_recv();
nb_events--; nb_events--;
} }
else if (this->fds[i].revents & POLLOUT && socket_handler->is_connected())
{
socket_handler->on_send();
nb_events--;
}
else if (this->fds[i].revents & POLLOUT) else if (this->fds[i].revents & POLLOUT)
{ {
auto socket_handler = this->socket_handlers.at(this->fds[i].fd);
if (socket_handler->is_connected())
socket_handler->on_send();
else
socket_handler->connect(); socket_handler->connect();
nb_events--; nb_events--;
} }