Add namespace for currentThreadEventLoop and when there is no worker …

…thread loop, acceptor_loop should also be returned (#568) * when there is no worker thread loop, acceptor_loop should also be returned * add namespace for currentThreadEventLoop --------- Co-authored-by: grass <fuzhufang@163.com>
ithewei · Jun 12, 2024 · c4e3b53 · c4e3b53
1 parent a56fc78
commit c4e3b53
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/evpp/EventLoop.h b/evpp/EventLoop.h
@@ -241,7 +241,7 @@ typedef std::shared_ptr<EventLoop> EventLoopPtr;
 static inline EventLoop* tlsEventLoop() {
     return (EventLoop*)ThreadLocalStorage::get(ThreadLocalStorage::EVENT_LOOP);
 }
-#define currentThreadEventLoop tlsEventLoop()
+#define currentThreadEventLoop ::hv::tlsEventLoop()
 
 static inline TimerID setTimer(int timeout_ms, TimerCallback cb, uint32_t repeat = INFINITE) {
     EventLoop* loop = tlsEventLoop();

diff --git a/evpp/TcpServer.h b/evpp/TcpServer.h
@@ -32,7 +32,11 @@ class TcpServerEventLoopTmpl {
     }
 
     EventLoopPtr loop(int idx = -1) {
-        return worker_threads.loop(idx);
+        EventLoopPtr worker_loop = worker_threads.loop(idx);
+        if (worker_loop == NULL) {
+            worker_loop = acceptor_loop;
+        }
+        return worker_loop;
     }
 
     //@retval >=0 listenfd, <0 error