- 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);