fix(event):修改examples/event/09_named_pipe示例，去除其HupEvent，并修复epoll存在的bug

Author: hevake

config.mk

@@ -45,7 +45,3 @@ THIRDPARTY += nlohmann
 
 ## 编译配置
 CCFLAGS += -DENABLE_TRACE_RECORDER=1
-
-## 其它配置
-export HAVE_EXECINFO_H = yes
-export HAVE_EPOLL = yes

examples/event/09_named_pipe/main.cpp

@@ -41,28 +41,31 @@ using namespace tbox::event;
 
 void PrintUsage(const char *process_name)
 {
-    cout << "Usage:" << process_name << " your_pipefile" << endl;
+    cout << "Usage:" << process_name << " epoll|select your_pipefile" << endl;
 }
 
 int main(int argc, char *argv[])
 {
-    if (argc < 2) {
+    if (argc < 3) {
         PrintUsage(argv[0]);
         return 0;
     }
 
     LogOutput_Enable();
-    Loop* sp_loop = Loop::New();
+    Loop* sp_loop = Loop::New(argv[1]);
+
+    const char* pipe_file = argv[2];
+    ::unlink(pipe_file);
 
-    const char* pipe_file = argv[1];
     int ret = mkfifo(pipe_file, 0666);
     if (ret != 0) {
         LogWarn("mkfifo() ret:%d, errno:%d", ret, errno);
     }
     int fd = open(pipe_file, O_RDONLY|O_NDELAY);
+    LogDbg("fd:%d", fd);
 
     FdEvent* sp_fd_read  = sp_loop->newFdEvent();
-    sp_fd_read->initialize(fd, FdEvent::kReadEvent | FdEvent::kHupEvent, Event::Mode::kPersist);    //! 可读与挂起事件一直有效
+    sp_fd_read->initialize(fd, FdEvent::kReadEvent, Event::Mode::kPersist);    //! 可读与挂起事件一直有效
     sp_fd_read->enable();
 
     sp_fd_read->setCallback(
@@ -75,16 +78,15 @@ int main(int argc, char *argv[])
                     input_buff[rsize - 1] = '\0';
                     LogInfo("read[%d]:%s", rsize, input_buff);
                 } else {
-                    LogInfo("read 0");
-                }
-            }
+                    LogNotice("read 0");
+                    sp_fd_read->disable();
+                    close(fd);
 
-            //! 当管道断开的时候
-            if (event & FdEvent::kHupEvent) {
-                LogNotice("hup");
-                fd = open(pipe_file, O_RDONLY|O_NDELAY);
-                sp_fd_read->initialize(fd, FdEvent::kReadEvent | FdEvent::kHupEvent, Event::Mode::kPersist);
-                sp_fd_read->enable();
+                    fd = open(pipe_file, O_RDONLY|O_NDELAY);
+                    LogDbg("fd:%d", fd);
+                    sp_fd_read->initialize(fd, FdEvent::kReadEvent, Event::Mode::kPersist);
+                    sp_fd_read->enable();
+                }
             }
         }
     );

modules/base/Makefile

@@ -26,6 +26,8 @@ LIB_VERSION_X = 1
 LIB_VERSION_Y = 0
 LIB_VERSION_Z = 1
 
+HAVE_EXECINFO_H ?= yes	# 默认支持execinfo.h
+
 HEAD_FILES = \
 	version.h \
 	log.h \

modules/event/engines/epoll/fd_event.cpp

@@ -149,6 +149,7 @@ void EpollFdEvent::OnEventCallback(uint32_t events, void *obj)
     EpollFdSharedData *d = static_cast<EpollFdSharedData*>(obj);
 
     short tbox_events = 0;
+
     if (events & EPOLLIN) {
         events &= ~EPOLLIN;
         tbox_events |= kReadEvent;
@@ -177,12 +178,11 @@ void EpollFdEvent::OnEventCallback(uint32_t events, void *obj)
         event->onEvent(tbox_events);
 
         //! 在epoll中，无论有没有监听EPOLLHUP，在对端close了fd时都会触发本端EPOLLHUP事件
-        //! 只要发生了EPOLLHUB事件，就无法停止它，得强制disable()所有fd关联FdEvent
+        //! 只要发生了EPOLLHUB事件，只有让上层关闭该事件所有的事件才能停止EPOLLHUP的触发
         //! 否则它会一直触发事件，导致Loop空跑，CPU占满问题
         if (is_got_hup) {
             //! 将HUP事件当成可读事件，上层读到0字节则表示对端已关闭
             event->onEvent(kReadEvent);
-            event->disable();   //! 强制关闭事件
         }
     }
 

modules/event/engines/select/loop.cpp

@@ -109,8 +109,12 @@ int SelectLoop::fillFdSets(fd_set &read_set, fd_set &write_set, fd_set &except_s
     FD_ZERO(&except_set);
 
     for (auto item : fd_data_map_) {
-        bool is_this_fd_used = false;
         auto fd = item.first;
+
+        if (fd < 0)
+            continue;
+
+        bool is_this_fd_used = false;
         auto data = item.second;
 
         if (data->read_event_num > 0) {