summaryrefslogtreecommitdiff
path: root/lib/thread.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2017-06-06 17:09:08 +0200
committerGitHub <noreply@github.com>2017-06-06 17:09:08 +0200
commit206c5105e0b7c8a7b87f6cd0d3151c3311616c4b (patch)
tree8056f60c8d6120a30303fb595551238adc91f468 /lib/thread.c
parent90339c9f1f76fe29c9e7b86a485e1032d21ff060 (diff)
parent82fc5591f440ee9810ce2c5d90d41a9f419062c8 (diff)
Merge pull request #676 from qlyoung/fix-fd-poll-block
lib: allow infinite sleep in poll()
Diffstat (limited to 'lib/thread.c')
-rw-r--r--lib/thread.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/thread.c b/lib/thread.c
index 848e39e1ae..2280b96316 100644
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -647,9 +647,6 @@ static int
fd_poll (struct thread_master *m, struct pollfd *pfds, nfds_t pfdsize,
nfds_t count, struct timeval *timer_wait)
{
- if (count == 0)
- return 0;
-
/* If timer_wait is null here, that means poll() should block indefinitely,
* unless the thread_master has overriden it by setting ->selectpoll_timeout.
* If the value is positive, it specifies the maximum number of milliseconds