Prevent Poller from spinning on socket EOF

gbitzes · Nov 17, 2016 · 450e356 · 450e356
1 parent 3ae3c6d
commit 450e356
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/Poller.cc b/src/Poller.cc
@@ -24,6 +24,7 @@
 #include "Poller.hh"
 #include "RedisParser.hh"
 #include <sys/socket.h>
+#include <sys/ioctl.h>
 #include <poll.h>
 
 #include <sys/types.h>
@@ -115,6 +116,15 @@ void Poller::worker(int fd, Dispatcher *dispatcher) {
     // time to quit?
     if(shutdown) break;
 
+    // EOF?
+    if(polls[0].revents & POLLIN) {
+      int count = -1;
+      ioctl(fd, FIONREAD, &count);
+      if(count == 0) {
+        break;
+      }
+    }
+
     while(true) {
       LinkStatus status = parser.fetch(currentRequest);
       if(status <= 0) break;