Merge branch 'master' of gitee.com:cpp-master/cpp-tbox

Author: hevake

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();
+                }
             }
         }
     );

examples/terminal/tcp_rpc/main.cpp

@@ -50,7 +50,7 @@ int main(int argc, char **argv)
     auto sp_loop = Loop::New();
     SetScopeExitAction([sp_loop] { delete sp_loop; });
 
-    Terminal term;
+    Terminal term(sp_loop);
     term.setWelcomeText("Welcome to Terminal TcpRPC demo! \r\n");
     TcpRpc rpc(sp_loop, &term);
     if (!rpc.initialize(bind_addr)) {

examples/terminal/telnetd/main.cpp

@@ -50,7 +50,7 @@ int main(int argc, char **argv)
     auto sp_loop = Loop::New();
     SetScopeExitAction([sp_loop] { delete sp_loop; });
 
-    Terminal term;
+    Terminal term(sp_loop);
     term.setWelcomeText("Welcome to Terminal Telnet demo! \r\n");
     Telnetd telnetd(sp_loop, &term);
     if (!telnetd.initialize(bind_addr)) {

modules/base/Makefile

@@ -26,6 +26,8 @@ LIB_VERSION_X = 1
 LIB_VERSION_Y = 0
 LIB_VERSION_Z = 1
 
+HAVE_EXECINFO_H ?= yes
+
 HEAD_FILES = \
 	version.h \
 	log.h \
@@ -58,7 +60,11 @@ CPP_SRC_FILES = \
 pre_build:
 	touch version.cpp
 
-CXXFLAGS := -DMODULE_ID='"tbox.base"' $(CXXFLAGS)
+CXXFLAGS += -DMODULE_ID='"tbox.base"'
+
+ifeq ($(HAVE_EXECINFO_H),yes)
+CXXFLAGS += -DHAVE_EXECINFO_H=1
+endif
 
 TEST_CPP_SRC_FILES = \
 	$(CPP_SRC_FILES) \

modules/base/backtrace.cpp

@@ -38,6 +38,7 @@
 #endif //HAVE_EXECINFO_H
 
 #include <sstream>
+#include "defines.h"
 
 namespace tbox {
 
@@ -82,6 +83,7 @@ std::string DumpBacktrace(const unsigned int max_frames)
         oss << "[truncated]" << std::endl;
 
 #else
+    UNUSED_VAR(max_frames);
     oss << "not support backtrace" << std::endl;
 #endif //HAVE_EXECINFO_H
 

modules/event/CMakeLists.txt

@@ -49,7 +49,9 @@ set(TBOX_EVENT_SOURCES
             misc.cpp
             stat.cpp
             engines/epoll/loop.cpp
-            engines/epoll/fd_event.cpp)
+            engines/epoll/fd_event.cpp
+            engines/select/loop.cpp
+            engines/select/fd_event.cpp)
 
 set(TBOX_EVENT_TEST_SOURCES
             common_loop_test.cpp

modules/event/Makefile

@@ -21,8 +21,12 @@
 PROJECT = event
 LIB_NAME = event
 LIB_VERSION_X = 1
-LIB_VERSION_Y = 1
-LIB_VERSION_Z = 2
+LIB_VERSION_Y = 2
+LIB_VERSION_Z = 0
+
+HAVE_EPOLL ?= yes
+
+CXXFLAGS += -DMODULE_ID='"tbox.event"'
 
 HEAD_FILES = \
 	forward.h \
@@ -43,8 +47,16 @@ CPP_SRC_FILES = \
 	signal_event_impl.cpp \
 	misc.cpp \
 	stat.cpp \
+	engines/select/loop.cpp \
+	engines/select/fd_event.cpp \
+
+ifeq ($(HAVE_EPOLL),yes)
+CXXFLAGS += -DHAVE_EPOLL=1
+
+CPP_SRC_FILES += \
 	engines/epoll/loop.cpp \
-	engines/epoll/fd_event.cpp \
+	engines/epoll/fd_event.cpp
+endif
 
 TEST_CPP_SRC_FILES = \
 	$(CPP_SRC_FILES) \
@@ -53,7 +65,6 @@ TEST_CPP_SRC_FILES = \
 	timer_event_test.cpp \
 	signal_event_test.cpp \
 
-CXXFLAGS := -DMODULE_ID='"tbox.event"' $(CXXFLAGS)
 
 TEST_LDFLAGS := $(LDFLAGS) -ltbox_base -ldl
 

modules/event/engines/epoll/fd_event.cpp

@@ -79,9 +79,6 @@ bool EpollFdEvent::enable()
     if (events_ & kExceptEvent)
         ++d_->except_event_num;
 
-    if (events_ & kHupEvent)
-        ++d_->hup_event_num;
-
     d_->fd_events.push_back(this);
 
     reloadEpoll();
@@ -104,9 +101,6 @@ bool EpollFdEvent::disable()
     if (events_ & kExceptEvent)
         --d_->except_event_num;
 
-    if (events_ & kHupEvent)
-        --d_->hup_event_num;
-
     auto iter = std::find(d_->fd_events.begin(), d_->fd_events.end(), this);
     d_->fd_events.erase(iter);
 
@@ -136,9 +130,6 @@ void EpollFdEvent::reloadEpoll()
     if (d_->except_event_num > 0)
         new_events |= EPOLLERR;
 
-    if (d_->hup_event_num > 0)
-        new_events |= EPOLLHUP;
-
     d_->ev.events = new_events;
 
     if (old_events == 0) {
@@ -158,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;
@@ -173,29 +165,33 @@ void EpollFdEvent::OnEventCallback(uint32_t events, void *obj)
         tbox_events |= kExceptEvent;
     }
 
+    bool is_got_hup = false;
+
     if (events & EPOLLHUP) {
         events &= ~EPOLLHUP;
-        tbox_events |= kHupEvent;
+        is_got_hup = true;
     }
 
     //! 要先复制一份，因为在for中很可能会改动到d->fd_events，引起迭代器失效问题
     auto tmp = d->fd_events;
-    for (auto event : tmp)
+    for (auto event : tmp) {
         event->onEvent(tbox_events);
 
+        //! 在epoll中，无论有没有监听EPOLLHUP，在对端close了fd时都会触发本端EPOLLHUP事件
+        //! 只要发生了EPOLLHUB事件，只有让上层关闭该事件所有的事件才能停止EPOLLHUP的触发
+        //! 否则它会一直触发事件，导致Loop空跑，CPU占满问题
+        if (is_got_hup) {
+            //! 将HUP事件当成可读事件，上层读到0字节则表示对端已关闭
+            event->onEvent(kReadEvent);
+        }
+    }
+
     if (events)
         LogWarn("unhandle events:%08X, fd:%d", events, d->fd);
 }
 
 void EpollFdEvent::onEvent(short events)
 {
-    /**
-     * 由于EPOLLHUP会一直触发，所以无论事件有没有监听HupEvent，只要发生了EPOLLHUB事件，
-     * 对应fd所有的事件都要强制disable()。否则会导致Loop空跑问题。
-     */
-    if (events & kHupEvent)
-        disable();
-
     if (events_ & events) {
         if (is_stop_after_trigger_)
             disable();

modules/event/engines/epoll/types.h

@@ -37,7 +37,6 @@ struct EpollFdSharedData {
     int read_event_num = 0;     //!< 监听可读事件的FdEvent个数
     int write_event_num = 0;    //!< 监听可写事件的FdEvent个数
     int except_event_num = 0;   //!< 监听异常事件的FdEvent个数
-    int hup_event_num = 0;      //!< 监听挂起事件的FdEvent个数
 
     std::vector<EpollFdEvent*> fd_events;
 };