From 1796a214b5538ff1bd501ff3b8e4850902bc2c5d Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 20 Jun 2017 14:31:23 +0200 Subject: [PATCH] Simplify intrusive_ptr_release to speed it up and fix a race condition --- src/kernel/activity/ActivityImpl.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp index 6a9b6e83df..43ed70fb2d 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,21 +15,12 @@ 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(); } 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_-- == 0) delete activity; } } -- 2.20.1