Merge pull request kokkos#4144 from masterleinad/host_shared_ptr_clea…

…nup_fence Add memory fence for HostSharedPtr::cleanup()
CExA-project · Jul 7, 2021 · 7b5ffcc · 7b5ffcc
2 parents a877c9e + 1381db3
commit 7b5ffcc
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/core/src/impl/Kokkos_HostSharedPtr.hpp b/core/src/impl/Kokkos_HostSharedPtr.hpp
@@ -155,6 +155,9 @@ class HostSharedPtr {
     // object pointed to by m_counter and m_element_ptr.
     if (m_control) {
       int const count = Kokkos::atomic_fetch_sub(&(m_control->m_counter), 1);
+      // atomic_fetch_sub might have memory order relaxed so we need to force
+      // synchronization to avoid multiple threads doing the cleanup.
+      Kokkos::memory_fence();
       if (count == 1) {
         (m_control->m_deleter)(m_element_ptr);
         m_element_ptr = nullptr;