check that disk has been given as argument before accessing its pimpl

[simgrid.git] / src / s4u / s4u_Barrier.cpp

diff --git a/src/s4u/s4u_Barrier.cpp b/src/s4u/s4u_Barrier.cpp
index f22b711..f7104fb 100644 (file)
--- a/src/s4u/s4u_Barrier.cpp
+++ b/src/s4u/s4u_Barrier.cpp
@@ -13,8 +13,7 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_barrier, s4u, "S4U barrier");
 
-namespace simgrid {
-namespace s4u {
+namespace simgrid::s4u {
 
 /** @brief Create a new barrier
  *
@@ -37,7 +36,7 @@ int Barrier::wait()
   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_LOCK, pimpl_};
+    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);
 
@@ -67,8 +66,7 @@ void intrusive_ptr_release(Barrier* barrier)
 {
   intrusive_ptr_release(barrier->pimpl_);
 }
-} // namespace s4u
-} // namespace simgrid
+} // namespace simgrid::s4u
 
 /* **************************** Public C interface *************************** */