Fix data race (#92)

JDRaftKeeper · Jan 5, 2024 · 5c0a447 · 5c0a447
1 parent b5e3c3b
commit 5c0a447
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Common/NIO/PollSet.cpp b/src/Common/NIO/PollSet.cpp
@@ -211,12 +211,12 @@ class PollSetImpl
     {
         struct epoll_event ev;
         ev.events = 0;
-        if (mode & PollSet::POLL_READ)
-            ev.events |= EPOLLIN;
         if (mode & PollSet::POLL_WRITE)
             ev.events |= EPOLLOUT;
         if (mode & PollSet::POLL_ERROR)
             ev.events |= EPOLLERR;
+        if (mode & PollSet::POLL_READ)
+            ev.events |= EPOLLIN;
         ev.data.ptr = ptr;
         return epoll_ctl(_epollfd, EPOLL_CTL_ADD, fd, &ev);
     }

diff --git a/src/Common/NIO/SocketReactor.cpp b/src/Common/NIO/SocketReactor.cpp
@@ -169,16 +169,16 @@ void SocketReactor::addEventHandlers(const Socket& socket, const std::vector<Poc
 {
     NotifierPtr pNotifier = getNotifier(socket, true);
 
+    int mode = 0;
     for (auto * observer : observers)
     {
         if (!pNotifier->hasObserver(*observer)) pNotifier->addObserver(this, *observer);
 
-        int mode = 0;
         if (pNotifier->accepts(_pReadableNotification)) mode |= PollSet::POLL_READ;
         if (pNotifier->accepts(_pWritableNotification)) mode |= PollSet::POLL_WRITE;
         if (pNotifier->accepts(_pErrorNotification))    mode |= PollSet::POLL_ERROR;
-        if (mode) _pollSet.add(socket, mode);
     }
+    if (mode) _pollSet.add(socket, mode);
 }