revert loop_once handle read/write in one loop

basenew · Dec 16, 2019 · c0e82e2 · c0e82e2
1 parent 5fa9f91
commit c0e82e2
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/handy/poller.cc b/handy/poller.cc
@@ -92,15 +92,13 @@ void PollerEpoll::loop_once(int waitMs) {
         Channel *ch = (Channel *) activeEvs_[i].data.ptr;
         int events = activeEvs_[i].events;
         if (ch) {
-            if (events & kWriteEvent) {
-                trace("channel %lld fd %d handle write", (long long) ch->id(), ch->fd());
-                ch->handleWrite();
-            }
             if (events & (kReadEvent | POLLERR)) {
                 trace("channel %lld fd %d handle read", (long long) ch->id(), ch->fd());
                 ch->handleRead();
-            }
-            if (!(events & (kReadEvent | kWriteEvent | POLLERR))){
+            } else if (events & kWriteEvent) {
+                trace("channel %lld fd %d handle write", (long long) ch->id(), ch->fd());
+                ch->handleWrite();
+            } else {
                 fatal("unexpected poller events");
             }
         }