feat(base,event): 使用config.mk配置项来选择是否启用epoll与backtrace

Author: hevake

config.mk

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

modules/base/Makefile

@@ -58,7 +58,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/event/Makefile

@@ -24,6 +24,10 @@ LIB_VERSION_X = 1
 LIB_VERSION_Y = 2
 LIB_VERSION_Z = 0
 
+HAVE_EPOLL ?= yes	# 默认支持epoll
+
+CXXFLAGS += -DMODULE_ID='"tbox.event"'
+
 HEAD_FILES = \
 	forward.h \
 	loop.h \
@@ -43,19 +47,24 @@ CPP_SRC_FILES = \
 	signal_event_impl.cpp \
 	misc.cpp \
 	stat.cpp \
-	engines/epoll/loop.cpp \
-	engines/epoll/fd_event.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
+endif
+
 TEST_CPP_SRC_FILES = \
 	$(CPP_SRC_FILES) \
 	common_loop_test.cpp \
 	fd_event_test.cpp \
 	timer_event_test.cpp \
 	signal_event_test.cpp \
 
-CXXFLAGS := -DMODULE_ID='"tbox.event"' $(CXXFLAGS)
 
 TEST_LDFLAGS := $(LDFLAGS) -ltbox_base -ldl
 

modules/event/engines/select/loop.cpp

@@ -19,8 +19,10 @@
  */
 #include <sys/select.h>
 
+#include <cstring>
 #include <algorithm>
 
+#include <tbox/base/log.h>
 #include <tbox/base/assert.h>
 #include <tbox/base/wrapped_recorder.h>
 
@@ -72,6 +74,9 @@ void SelectLoop::runLoop(Mode mode)
                     SelectFdEvent::OnEventCallback(is_readable, is_writable, is_except, data);
                 }
             }
+        } else if (select_ret == -1) {
+            LogErrno(errno, "select error");
+            break;
         }
 
         //handleRunInLoopFunc();

modules/event/fd_event_test.cpp

@@ -23,6 +23,7 @@
 
 #include <errno.h>
 #include <cstring>
+#include <tbox/base/log_output.h>
 
 #include "loop.h"
 #include "fd_event.h"
@@ -348,57 +349,64 @@ TEST(FdEvent, Reinitialize)
 /// Test exception events
 TEST(FdEvent, Exception)
 {
-    int read_fd, write_fd;
-    bool ok = tbox::event::CreateFdPair(read_fd, write_fd);
-    ASSERT_TRUE(ok);
+    LogOutput_Enable();
 
-    auto loop = Loop::New();
-    auto read_fd_event = loop->newFdEvent();
-    auto write_fd_event = loop->newFdEvent();
+    auto engines = Loop::Engines();
+    for (auto e : engines) {
+        cout << "engine: " << e << endl;
 
-    ASSERT_TRUE(read_fd_event != nullptr);
-    ASSERT_TRUE(write_fd_event != nullptr);
+        int read_fd, write_fd;
+        bool ok = tbox::event::CreateFdPair(read_fd, write_fd);
+        ASSERT_TRUE(ok);
 
-    int run_time = 0;
+        auto loop = Loop::New(e);
+        auto read_fd_event = loop->newFdEvent();
+        auto write_fd_event = loop->newFdEvent();
 
-    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};
-            ssize_t len = read(read_fd, data, sizeof(data));
-            EXPECT_EQ(len, sizeof(int));
-        }
+        ASSERT_TRUE(read_fd_event != nullptr);
+        ASSERT_TRUE(write_fd_event != nullptr);
 
-        if (events & FdEvent::kHupEvent) {
-            ++run_time;
-            loop->exitLoop();
-        }
-    });
+        int run_time = 0;
 
-    read_fd_event->enable();
+        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};
+                ssize_t len = read(read_fd, data, sizeof(data));
+                EXPECT_EQ(len, sizeof(int));
+            }
 
-    EXPECT_TRUE(write_fd_event->initialize(write_fd, FdEvent::kWriteEvent, Event::Mode::kPersist));
-    write_fd_event->setCallback([&](short events){
-        if (events & FdEvent::kWriteEvent) {
-            int data = 0;
-            ssize_t ret = write(write_fd, &data, sizeof(data));
-            EXPECT_EQ(ret, sizeof(data));
-            close(write_fd);
-        }
-    });
+            if (events & FdEvent::kHupEvent) {
+                ++run_time;
+                loop->exitLoop();
+            }
+        });
+
+        read_fd_event->enable();
+
+        EXPECT_TRUE(write_fd_event->initialize(write_fd, FdEvent::kWriteEvent, Event::Mode::kPersist));
+        write_fd_event->setCallback([&](short events){
+            if (events & FdEvent::kWriteEvent) {
+                int data = 0;
+                ssize_t ret = write(write_fd, &data, sizeof(data));
+                EXPECT_EQ(ret, sizeof(data));
+                close(write_fd);
+            }
+        });
 
-    write_fd_event->enable();
+        write_fd_event->enable();
 
-    loop->runLoop();
+        loop->runLoop();
 
-    EXPECT_EQ(run_time, 1);
+        EXPECT_EQ(run_time, 1);
 
-    read_fd_event->disable();
-    write_fd_event->disable();
+        read_fd_event->disable();
+        write_fd_event->disable();
 
-    delete read_fd_event;
-    delete write_fd_event;
-    delete loop;
+        delete read_fd_event;
+        delete write_fd_event;
+        delete loop;
+    }
 }
 
 }

modules/event/loop.cpp

@@ -9,7 +9,7 @@
  *    \\     \     \ /
  *     -============'
  *
- * Copyright (c) 2018 Hevake and contributors, all rights reserved.
+ * Copyright (c) 2024 Hevake and contributors, all rights reserved.
  *
  * This file is part of cpp-tbox (https://github.com/cpp-main/cpp-tbox)
  * Use of this source code is governed by MIT license that can be found
@@ -20,23 +20,32 @@
 #include "loop.h"
 #include <tbox/base/log.h>
 
-#include "engines/epoll/loop.h"
 #include "engines/select/loop.h"
 
+#if HAVE_EPOLL
+#include "engines/epoll/loop.h"
+#endif
+
 namespace tbox {
 namespace event {
 
 Loop* Loop::New()
 {
+#if HAVE_EPOLL
     return new EpollLoop;
+#else
+    return new SelectLoop;
+#endif
 }
 
 Loop* Loop::New(const std::string &engine_type)
 {
-    if (engine_type == "epoll")
-        return new EpollLoop;
-    else if (engine_type == "select")
+    if (engine_type == "select")
         return new SelectLoop;
+#if HAVE_EPOLL
+    else if (engine_type == "epoll")
+        return new EpollLoop;
+#endif
 
     return nullptr;
 }
@@ -45,7 +54,9 @@ std::vector<std::string> Loop::Engines()
 {
     std::vector<std::string> types;
 
+#if HAVE_EPOLL
     types.push_back("epoll");
+#endif
     types.push_back("select");
     return types;
 }