X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c1569266ba083158fe700950cf1ab5de790e03da..9fd6cbc6c3b06f4b09e3c3339ffb3cc8a68f9bfa:/src/kernel/activity/ActivityImpl.cpp?ds=sidebyside

diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp
index e6723849ac..7d909d66ad 100644
--- a/src/kernel/activity/ActivityImpl.cpp
+++ b/src/kernel/activity/ActivityImpl.cpp
@@ -1,25 +1,30 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/kernel/activity/ActivityImpl.hpp"
 
-simgrid::kernel::activity::ActivityImpl::ActivityImpl() = default;
-simgrid::kernel::activity::ActivityImpl::~ActivityImpl() = default;
+namespace simgrid {
+namespace kernel {
+namespace activity {
 
-void simgrid::kernel::activity::ActivityImpl::ref()
+ActivityImpl::ActivityImpl()  = default;
+ActivityImpl::~ActivityImpl() = default;
+
+// boost::intrusive_ptr<Activity> support:
+void intrusive_ptr_add_ref(simgrid::kernel::activity::ActivityImpl* activity)
 {
-  refcount++;
+  activity->refcount_.fetch_add(1, std::memory_order_relaxed);
 }
 
-void simgrid::kernel::activity::ActivityImpl::unref()
+void intrusive_ptr_release(simgrid::kernel::activity::ActivityImpl* activity)
 {
-  xbt_assert(refcount > 0,
-      "This activity has a negative refcount! You can only call test() or wait() once per activity.");
-
-  refcount--;
-  if (refcount>0)
-    return;
-  delete this;
+  if (activity->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
+    std::atomic_thread_fence(std::memory_order_acquire);
+    delete activity;
+  }
+}
+}
 }
+} // namespace simgrid::kernel::activity::