X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/13cfb5c4733854671750256e92a6aca384d25626..16e27d2a68b9d21536c50eddff53fb68caa30d91:/src/kernel/activity/ActivityImpl.cpp diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp index 6a9b6e83df..0a6880363e 100644 --- a/src/kernel/activity/ActivityImpl.cpp +++ b/src/kernel/activity/ActivityImpl.cpp @@ -5,8 +5,6 @@ #include "src/kernel/activity/ActivityImpl.hpp" -XBT_LOG_EXTERNAL_CATEGORY(simix_process); - namespace simgrid { namespace kernel { namespace activity { @@ -17,22 +15,15 @@ ActivityImpl::~ActivityImpl() = default; // boost::intrusive_ptr support: void intrusive_ptr_add_ref(simgrid::kernel::activity::ActivityImpl* activity) { - xbt_assert(activity->refcount_ >= 0); - activity->refcount_++; - XBT_CDEBUG(simix_process, "%p->refcount++ ~> %d", activity, (int)activity->refcount_); - if (XBT_LOG_ISENABLED(simix_process, xbt_log_priority_trace)) - xbt_backtrace_display_current(); + activity->refcount_.fetch_add(1, std::memory_order_relaxed); } void intrusive_ptr_release(simgrid::kernel::activity::ActivityImpl* activity) { - XBT_CDEBUG(simix_process, "%p->refcount-- ~> %d", activity, ((int)activity->refcount_) - 1); - xbt_assert(activity->refcount_ >= 0); - activity->refcount_--; - if (XBT_LOG_ISENABLED(simix_process, xbt_log_priority_trace)) - xbt_backtrace_display_current(); - if (activity->refcount_ <= 0) + if (activity->refcount_.fetch_sub(1, std::memory_order_release) == 1) { + std::atomic_thread_fence(std::memory_order_acquire); delete activity; + } } } }