fix(eventx):解决在禁了epoll之后TimerFd单元测试不过问题

cpp-main · Nov 26, 2024 · 11ee715 · 11ee715
1 parent 7a9022c
commit 11ee715
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/modules/base/Makefile b/modules/base/Makefile
@@ -26,7 +26,7 @@ LIB_VERSION_X = 1
 LIB_VERSION_Y = 0
 LIB_VERSION_Z = 1
 
-HAVE_EXECINFO_H ?= yes	# 默认支持execinfo.h
+HAVE_EXECINFO_H ?= yes
 
 HEAD_FILES = \
 	version.h \

diff --git a/modules/event/Makefile b/modules/event/Makefile
@@ -24,7 +24,7 @@ LIB_VERSION_X = 1
 LIB_VERSION_Y = 2
 LIB_VERSION_Z = 0
 
-HAVE_EPOLL ?= yes	# 默认支持epoll
+HAVE_EPOLL ?= yes
 
 CXXFLAGS += -DMODULE_ID='"tbox.event"'
 

diff --git a/modules/eventx/timer_fd_test.cpp b/modules/eventx/timer_fd_test.cpp
@@ -37,7 +37,7 @@ const int kAcceptableError = 1;
 
 TEST(TimerFd, Oneshot)
 {
-    auto sp_loop = Loop::New("epoll");
+    auto sp_loop = Loop::New();
     auto timer_event = new TimerFd(sp_loop, "10");
     SetScopeExitAction([=] { delete timer_event; delete sp_loop; });
 
@@ -58,7 +58,7 @@ TEST(TimerFd, Oneshot)
 
 TEST(TimerFd, Persist)
 {
-    auto sp_loop = Loop::New("epoll");
+    auto sp_loop = Loop::New();
     auto timer_event = new TimerFd(sp_loop, "10");
     SetScopeExitAction([=] { delete timer_event; delete sp_loop; });
 
@@ -68,7 +68,7 @@ TEST(TimerFd, Persist)
     int run_time = 0;
     timer_event->setCallback([&run_time]() { ++run_time; });
 
-    sp_loop->exitLoop(std::chrono::milliseconds(100));
+    sp_loop->exitLoop(std::chrono::milliseconds(101));  //! 多等1ms
     sp_loop->runLoop();
 
     EXPECT_EQ(run_time, 10);
@@ -77,7 +77,7 @@ TEST(TimerFd, Persist)
 
 TEST(TimerFd, DisableSelfInCallback)
 {
-    auto sp_loop = Loop::New("epoll");
+    auto sp_loop = Loop::New();
     auto timer_event = new TimerFd(sp_loop, "10");
     SetScopeExitAction([=] { delete timer_event; delete sp_loop; });
 
@@ -100,7 +100,7 @@ TEST(TimerFd, DisableSelfInCallback)
 
 TEST(TimerFd, Precision)
 {
-    auto sp_loop = Loop::New("epoll");
+    auto sp_loop = Loop::New();
     auto timer_event = new TimerFd(sp_loop, "100");
     SetScopeExitAction([=] { delete timer_event; delete sp_loop; });
 
@@ -137,7 +137,7 @@ TEST(TimerFd, NanoSeconds)
     auto min_interval_ns = ns - prev_ns;
     printf("Elapsed nanoseconds since last second: %ld\n", min_interval_ns);
 
-    auto sp_loop = Loop::New("epoll");
+    auto sp_loop = Loop::New();
     auto timer_event = new TimerFd(sp_loop, std::to_string(min_interval_ns));
     SetScopeExitAction([=] { delete timer_event; delete sp_loop; });
 
@@ -166,7 +166,7 @@ TEST(TimerFd, NanoSeconds)
 //! 检查单次触发后，状态是否自动变成disable
 TEST(TimerFd, OneshotCheckIsEnabled)
 {
-    auto sp_loop = Loop::New("epoll");
+    auto sp_loop = Loop::New();
     auto timer_event = new TimerFd(sp_loop, "101");
     auto check_before_timer = sp_loop->newTimerEvent();
     auto check_after_timer = sp_loop->newTimerEvent();