scottk/wlan-cloud-lib-poco
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-lib-poco.git synced 2025-11-01 19:17:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(PollSet): wakeup fd is never read (windows portion and some other optimizations) #3708

Browse Source
This commit is contained in:
Alex Fabijanic
2022-07-23 22:28:21 +02:00
parent 3c6fdd0c5f
commit f164cc4bfd
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Net/src/PollSet.cpp
View File

@@ -171,19 +171,23 @@ public:
// calls would round-robin through the remaining ready sockets, but it's better to give // calls would round-robin through the remaining ready sockets, but it's better to give
// the call enough room once we start hitting the boundary // the call enough room once we start hitting the boundary
if (rc >= _events.size()) _events.resize(_events.size()*2); if (rc >= _events.size()) _events.resize(_events.size()*2);
if (rc < 0 && SocketImpl::lastError() == POCO_EINTR) else if (rc < 0)
{ {
Poco::Timestamp end; // if interrupted and there's still time left, keep waiting
Poco::Timespan waited = end - start; if (SocketImpl::lastError() == POCO_EINTR)
if (waited < remainingTime) {
remainingTime -= waited; Poco::Timestamp end;
else break; Poco::Timespan waited = end - start;
if (waited < remainingTime)
{
remainingTime -= waited;
continue;
}
}
else SocketImpl::error();
} }
} }
while (rc < 0 && SocketImpl::lastError() == POCO_EINTR); while (false);
if (rc < 0 && SocketImpl::lastError() != POCO_EINTR)
SocketImpl::error();
for (int i = 0; i < rc; i++) for (int i = 0; i < rc; i++)
{ {
@@ -200,13 +204,15 @@ public:
result[it->second.first] |= PollSet::POLL_ERROR; result[it->second.first] |= PollSet::POLL_ERROR;
} }
} }
#ifndef WEPOLL_H_
else if (_events[i].events & EPOLLIN) // eventfd signaled else if (_events[i].events & EPOLLIN) // eventfd signaled
{ {
uint64_t val; uint64_t val;
#ifdef WEPOLL_H_
if (_pSocket) _pSocket->receiveBytes(&val, sizeof(val));
#else
read(_eventfd, &val, sizeof(val)); read(_eventfd, &val, sizeof(val));
}
#endif #endif
}
} }
return result; return result;
} }
@@ -285,6 +291,7 @@ private:
if (rmFD == 0) if (rmFD == 0)
{ {
_pSocket = new ServerSocket(SocketAddress("127.0.0.1", 0)); _pSocket = new ServerSocket(SocketAddress("127.0.0.1", 0));
_pSocket->setBlocking(false);
port = _pSocket->address().port(); port = _pSocket->address().port();
return static_cast<int>(_pSocket->impl()->sockfd()); return static_cast<int>(_pSocket->impl()->sockfd());
} }