Simplify intrusive_ptr_release to speed it up and fix a race condition

[simgrid.git] / src / kernel / activity / ActivityImpl.cpp

diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp
index 6a9b6e8..43ed70f 100644 (file)
--- 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<Activity> 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;
 }
 }