X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b1da3d4d609abf3952a35e240c3f8c6e629a0ffe..7e42dd535dfc0d68de20fba4b9fc5e480b56c74b:/src/s4u/s4u_Barrier.cpp

diff --git a/src/s4u/s4u_Barrier.cpp b/src/s4u/s4u_Barrier.cpp
index cd111763d6..fb71bbb4c9 100644
--- a/src/s4u/s4u_Barrier.cpp
+++ b/src/s4u/s4u_Barrier.cpp
@@ -6,11 +6,11 @@
 #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");
 
@@ -21,6 +21,15 @@ Barrier::Barrier(unsigned int expected_processes) : mutex_(Mutex::create()), con
 {
 }
 
+/** @brief Create a new barrier
+ *
+ * See @ref s4u_raii.
+ */
+BarrierPtr Barrier::create(unsigned int expected_processes)
+{
+    return BarrierPtr(new Barrier(expected_processes));
+}
+
 /**
  * Wait functions
  */
@@ -40,5 +49,39 @@ 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
+
+/* **************************** Public C interface *************************** */
+
+sg_bar_t sg_barrier_init(unsigned int count)
+{
+  return new simgrid::s4u::Barrier(count);
+}
+
+/** @brief Initializes a barrier, with count elements */
+void sg_barrier_destroy(sg_bar_t bar)
+{
+  delete bar;
+}
+
+/** @brief Performs a barrier already initialized */
+int sg_barrier_wait(sg_bar_t bar)
+{
+  return bar->wait();
+}