Merge branches 'master' and 'master' of github.com:simgrid/simgrid

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

diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp
index 94b8590..13c284a 100644 (file)
--- a/src/kernel/activity/ActivityImpl.hpp
+++ b/src/kernel/activity/ActivityImpl.hpp
@@ -12,6 +12,7 @@
 #include <xbt/base.h>
 #include "simgrid/forward.h"
 
+#include <atomic>
 #include <simgrid/simix.hpp>
 
 namespace simgrid {
@@ -30,9 +31,30 @@ namespace activity {
     virtual void resume()=0;
     virtual void post() =0; // What to do when a simcall terminates
 
+    // boost::intrusive_ptr<Activity> support:
+    friend void intrusive_ptr_add_ref(ActivityImpl * activity)
+    {
+      // Atomic operation! Do not split in two instructions!
+      auto previous = (activity->refcount_)++;
+      xbt_assert(previous != 0);
+      (void)previous;
+    }
+
+    friend void intrusive_ptr_release(ActivityImpl * activity)
+    {
+      // Atomic operation! Do not split in two instructions!
+      auto count = --(activity->refcount_);
+      if (count == 0)
+        delete activity;
+    }
+
+    /** @brief Increase the refcount */
     void ref();
-    void unref();
+    /** @brief Reduce the refcount; returns true if the object was destroyed */
+    bool unref();
+
   private:
+    std::atomic_int_fast32_t refcount_{1};
     int refcount = 1;
   };
 }}} // namespace simgrid::kernel::activity