X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d8e688dbb6900e672d3d36acea16bb421ea1a50b..8f14731685bc7fea43ca95def23ab2031e7a32eb:/src/s4u/s4u_Barrier.cpp

diff --git a/src/s4u/s4u_Barrier.cpp b/src/s4u/s4u_Barrier.cpp
index 713245c9e1..6402d774ee 100644
--- a/src/s4u/s4u_Barrier.cpp
+++ b/src/s4u/s4u_Barrier.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2018-2019. 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. */
@@ -6,22 +6,28 @@
 #include <exception>
 #include <mutex>
 
-#include <xbt/ex.hpp>
-#include <xbt/log.hpp>
-
+#include "simgrid/Exception.hpp"
 #include "simgrid/barrier.h"
 #include "simgrid/s4u/Barrier.hpp"
 #include "simgrid/simix.h"
+#include "xbt/log.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_barrier, "S4U barrier");
 
 namespace simgrid {
 namespace s4u {
 
-Barrier::Barrier(unsigned int count) : expected_processes_(count)
+Barrier::Barrier(unsigned int expected_processes) : mutex_(Mutex::create()), cond_(ConditionVariable::create()), expected_processes_(expected_processes)
+{
+}
+
+/** @brief Create a new barrier
+ *
+ * See @ref s4u_raii.
+ */
+BarrierPtr Barrier::create(unsigned int expected_processes)
 {
-  mutex_ = Mutex::create();
-  cond_  = ConditionVariable::create();
+    return BarrierPtr(new Barrier(expected_processes));
 }
 
 /**
@@ -43,6 +49,21 @@ int Barrier::wait()
   mutex_->unlock();
   return 0;
 }
+
+void intrusive_ptr_add_ref(Barrier* barrier)
+{
+  xbt_assert(barrier);
+  barrier->refcount_.fetch_add(1, std::memory_order_relaxed);
+}
+
+void intrusive_ptr_release(Barrier* barrier)
+{
+  xbt_assert(barrier);
+  if (barrier->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
+    std::atomic_thread_fence(std::memory_order_acquire);
+    delete barrier;
+  }
+}
 } // namespace s4u
 } // namespace simgrid