Add proper memory fences.

cybozu · Nov 15, 2013 · b8d8291 · b8d8291
1 parent 57cf0fc
commit b8d8291
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/worker.cpp b/src/worker.cpp
@@ -840,6 +840,8 @@ void worker::run() {
         // recv returns EAGAIN, or some error happens.
         if( m_buffer.size() > 0 )
             pending.append(m_buffer.data(), m_buffer.size());
+
+        std::atomic_thread_fence(std::memory_order_release);
         m_socket->release();
     }
 }

diff --git a/src/worker.hpp b/src/worker.hpp
@@ -43,6 +43,7 @@ class worker final: public cybozu::thread_base<worker> {
     }
 
     void wait() {
+        std::atomic_thread_fence(std::memory_order_release);
         m_running = false;
         std::uint64_t i;
         ssize_t n = ::read(m_event, &i, sizeof(i));
@@ -76,7 +77,6 @@ class worker final: public cybozu::thread_base<worker> {
     std::vector<cybozu::tcp_socket*> m_slaves;
 
     void notify() {
-        std::atomic_thread_fence(std::memory_order_release);
         std::uint64_t i = 1;
         ssize_t n = ::write(m_event, &i, sizeof(i));
         if( n == -1 )