X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/33471128bd0460782d27e69ab365d5f234456a9f..b22d0e4d776668a22f7bc6a680cc999c17fd43d4:/src/kernel/activity/ActivityImpl.cpp

diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp
index 8506c1d1a3..0a6880363e 100644
--- a/src/kernel/activity/ActivityImpl.cpp
+++ b/src/kernel/activity/ActivityImpl.cpp
@@ -1,27 +1,30 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2017. 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)
 {
-  // Atomic operation! Do not split in two instructions!
-  xbt_assert(refcount_ != 0);
-  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.");
-
-  // Atomic operation! Do not split in two instructions!
-  auto count = --refcount_;
-  if (count == 0)
-    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::