-/* Copyright (c) 2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2018-2022. 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 <exception>
-#include <mutex>
+#include <simgrid/barrier.h>
+#include <simgrid/modelchecker.h>
+#include <simgrid/s4u/Barrier.hpp>
-#include <xbt/ex.hpp>
-#include <xbt/log.hpp>
+#include "src/kernel/activity/BarrierImpl.hpp"
+#include "src/kernel/actor/SynchroObserver.hpp"
+#include "src/mc/mc_replay.hpp"
-#include "simgrid/s4u/Barrier.hpp"
-#include "simgrid/simix.h"
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_barrier, s4u, "S4U barrier");
-XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_barrier, "S4U barrier");
+namespace simgrid::s4u {
-namespace simgrid {
-namespace s4u {
-
-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_actors)
{
+ auto* res = new kernel::activity::BarrierImpl(expected_actors);
+ return BarrierPtr(&res->piface_, false);
}
-/**
- * Wait functions
+/** @brief Block the current actor until all expected actors reach the barrier.
+ *
+ * This method is meant to be somewhat consistent with the pthread_barrier_wait function.
+ *
+ * @return false for all actors but one: exactly one actor will get true as a return value.
*/
int Barrier::wait()
{
- mutex_->lock();
- arrived_processes_++;
- XBT_DEBUG("waiting %p %u/%u", this, arrived_processes_, expected_processes_);
- if (arrived_processes_ == expected_processes_) {
- cond_->notify_all();
- mutex_->unlock();
- arrived_processes_ = 0;
- return -1;
+ kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+
+ if (MC_is_active() || MC_record_replay_is_active()) { // Split in 2 simcalls for transition persistency
+ kernel::actor::BarrierObserver lock_observer{issuer, mc::Transition::Type::BARRIER_ASYNC_LOCK, pimpl_};
+ auto acquisition =
+ kernel::actor::simcall_answered([issuer, this] { return pimpl_->acquire_async(issuer); }, &lock_observer);
+
+ kernel::actor::BarrierObserver wait_observer{issuer, mc::Transition::Type::BARRIER_WAIT, acquisition.get()};
+ return kernel::actor::simcall_blocking([issuer, acquisition] { acquisition->wait_for(issuer, -1); },
+ &wait_observer);
+
+ } else { // Do it in one simcall only
+ kernel::activity::BarrierAcquisitionImpl* acqui = nullptr; // unused here, but must be typed to pick the right ctor
+ kernel::actor::BarrierObserver observer{issuer, mc::Transition::Type::BARRIER_WAIT, acqui};
+ return kernel::actor::simcall_blocking([issuer, this] { pimpl_->acquire_async(issuer)->wait_for(issuer, -1); },
+ &observer);
}
+}
+
+std::string Barrier::to_string() const
+{
+ return pimpl_->to_string();
+}
+
+void intrusive_ptr_add_ref(Barrier* barrier)
+{
+ intrusive_ptr_add_ref(barrier->pimpl_);
+}
- cond_->wait(mutex_);
- mutex_->unlock();
+void intrusive_ptr_release(Barrier* barrier)
+{
+ intrusive_ptr_release(barrier->pimpl_);
+}
+} // namespace simgrid::s4u
+
+/* **************************** Public C interface *************************** */
+
+sg_bar_t sg_barrier_init(unsigned int count)
+{
+ simgrid::s4u::BarrierPtr bar = simgrid::s4u::Barrier::create(count);
+ intrusive_ptr_add_ref(bar.get());
+ return bar.get();
+}
+
+/** @brief Initializes a barrier, with count elements */
+void sg_barrier_destroy(sg_bar_t bar)
+{
+ intrusive_ptr_release(bar);
+}
+
+/** @brief Performs a barrier already initialized.
+ *
+ * @return 0 for all actors but one: exactly one actor will get SG_BARRIER_SERIAL_THREAD as a return value. */
+int sg_barrier_wait(sg_bar_t bar)
+{
+ if (bar->wait())
+ return SG_BARRIER_SERIAL_THREAD;
return 0;
}
-} // namespace s4u
-} // namespace simgrid
