sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #16412: net: Make poll in InterruptibleRecv only filter for POLLIN events.

Browse Source 
a52818cc5633494992da7d1dc8fdb04b4a1b7c29 net: Make poll in InterruptibleRecv only filter for POLLIN events. poll should block until there is data to be read or the timeout expires. (tecnovert)

Pull request description:

  poll should block until there is data to be read or the timeout expires.

  Filtering for the POLLOUT event causes poll to return immediately which leads to high CPU usage when trying to connect to non-responding peers through tor.

  When USE_POLL is not defined select is used with the writefds parameter set to nullptr.
  Removing POLLOUT causes the behavior of poll to match that of select.

  Fixes: #16004.

ACKs for top commit:
  laanwj:
    code review ACK a52818cc5633494992da7d1dc8fdb04b4a1b7c29
  jonasschnelli:
    utACK a52818cc5633494992da7d1dc8fdb04b4a1b7c29

Tree-SHA512: 69934cc14e3327c7ff7f6c5942af8761e865220b2540d74ea1e176adad326307a73860417dddfd32d601b5c0e9e2ada1848bd7e3d27b0b7a9b42f11129af8eb1
This commit is contained in:
Wladimir J. van der Laan 2019-07-19 17:15:12 +02:00 committed by pasta
parent 2d5e50e6a4
commit c2e52af388
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/netbase.cpp
View File

@ -275,7 +275,7 @@ static IntrRecvError InterruptibleRecv(uint8_t* data, size_t len, int timeout, c
#ifdef USE_POLL #ifdef USE_POLL
struct pollfd pollfd = {}; struct pollfd pollfd = {};
pollfd.fd = hSocket; pollfd.fd = hSocket;
pollfd.events = POLLIN | POLLOUT; pollfd.events = POLLIN;
int nRet = poll(&pollfd, 1, timeout_ms); int nRet = poll(&pollfd, 1, timeout_ms);
#else #else
struct timeval tval = MillisToTimeval(timeout_ms); struct timeval tval = MillisToTimeval(timeout_ms);