fix(event): 解决select中遇到失效了fd退出循环的问题

Author: hevake

modules/event/engines/select/loop.cpp

@@ -18,6 +18,7 @@
  * of the source tree.
  */
 #include <sys/select.h>
+#include <fcntl.h>
 
 #include <cstring>
 #include <algorithm>
@@ -75,8 +76,16 @@ void SelectLoop::runLoop(Mode mode)
                 }
             }
         } else if (select_ret == -1) {
-            LogErrno(errno, "select error");
-            break;
+            if (errno == EBADF) {
+                removeInvalidFds();
+
+            } else if (errno != EINTR) {
+                LogErrno(errno, "select error");
+                break;
+
+            } else {
+                LogNotice("select errno:%d(%s)", errno, strerror(errno));
+            }
         }
 
         //handleRunInLoopFunc();
@@ -126,6 +135,28 @@ int SelectLoop::fillFdSets(fd_set &read_set, fd_set &write_set, fd_set &except_s
     return max_fd + 1;
 }
 
+bool IsFdValid(int fd)
+{
+    if (fd < 0)
+        return false;
+
+    return ::fcntl(fd, F_GETFD) != -1 || errno != EBADF;
+}
+
+void SelectLoop::removeInvalidFds()
+{
+    for (auto item : fd_data_map_) {
+        auto fd = item.first;
+        if (!IsFdValid(fd)) {
+            LogWarn("fd:%d is invalid", fd);
+            SelectFdSharedData *data = item.second;
+            for (auto event : data->fd_events) {
+                event->disable();
+            }
+        }
+    }
+}
+
 SelectFdSharedData* SelectLoop::refFdSharedData(int fd)
 {
     SelectFdSharedData *fd_shared_data = nullptr;

modules/event/engines/select/loop.h

@@ -46,6 +46,7 @@ class SelectLoop : public CommonLoop {
   protected:
     virtual void stopLoop() override { keep_running_ = false; }
     int fillFdSets(fd_set &read_set, fd_set &write_set, fd_set &except_set);
+    void removeInvalidFds();  //! 清除失效了的fd
 
   private:
     bool keep_running_ = true;

modules/event/fd_event_test.cpp

@@ -371,7 +371,7 @@ TEST(FdEvent, Exception)
         EXPECT_TRUE(read_fd_event->initialize(read_fd, FdEvent::kReadEvent | FdEvent::kHupEvent, Event::Mode::kPersist));
         read_fd_event->setCallback([&](short events){
             if (events & FdEvent::kReadEvent) {
-                char data[100] = { 0};
+                char data[100] = { 0 };
                 ssize_t len = read(read_fd, data, sizeof(data));
                 EXPECT_EQ(len, sizeof(int));
             }
@@ -396,6 +396,7 @@ TEST(FdEvent, Exception)
 
         write_fd_event->enable();
 
+        loop->exitLoop(std::chrono::milliseconds(10));
         loop->runLoop();
 
         EXPECT_EQ(run_time, 1);