/* 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 <mutex>
+
#include "simgrid/msg.h"
#include "simgrid/simix.h" /* semaphores for the barrier */
#include <xbt/replay.h>
processes_arrived_sofar = 0;
}
ACT_DEBUG("Entering barrier: %s (%d already there)", NAME, processes_arrived_sofar);
- mutex->lock();
- if (++processes_arrived_sofar == communicator_size) {
- cond->notify_all();
- mutex->unlock();
- } else {
- cond->wait(mutex);
- mutex->unlock();
+
+ {
+ std::unique_lock<simgrid::s4u::Mutex> lock(*mutex);
+ if (++processes_arrived_sofar == communicator_size) {
+ // We can notify without the lock:
+ lock.unlock();
+ cond->notify_all();
+ } else {
+ cond->wait(lock);
+ }
}
ACT_DEBUG("Exiting barrier: %s", NAME);
#ifndef SIMGRID_S4U_COND_VARIABLE_HPP
#define SIMGRID_S4U_COND_VARIABLE_HPP
+#include <mutex>
#include <utility> // std::swap
#include <simgrid/simix.h>
/**
* Wait functions
*/
- void wait(Mutex *mutex);
- void wait_for(Mutex *mutex, double time);
+ void wait(std::unique_lock<Mutex>& lock);
+ void wait_for(std::unique_lock<Mutex>& lock, double time);
/**
* Notify functions
#ifndef SIMGRID_S4U_MUTEX_HPP
#define SIMGRID_S4U_MUTEX_HPP
+#include <mutex>
#include <utility>
#include <boost/intrusive_ptr.hpp>
#include <xbt/base.h>
#include "simgrid/simix.h"
-#include <simgrid/s4u/conditionVariable.hpp>
namespace simgrid {
namespace s4u {
class ConditionVariable;
+
XBT_PUBLIC_CLASS Mutex {
friend ConditionVariable;
public:
private:
simgrid::simix::Mutex* mutex_;
};
+
}} // namespace simgrid::s4u
#endif /* SIMGRID_S4U_MUTEX_HPP */
+#include <mutex>
+
#include "simgrid/s4u/conditionVariable.hpp"
#include "simgrid/simix.h"
/**
* Wait functions
*/
-void s4u::ConditionVariable::wait(s4u::Mutex *mutex) {
- simcall_cond_wait(cond_, mutex->mutex_);
+void s4u::ConditionVariable::wait(std::unique_lock<Mutex>& lock) {
+ simcall_cond_wait(cond_, lock.mutex()->mutex_);
}
-void s4u::ConditionVariable::wait_for(s4u::Mutex *mutex, double timeout) {
- simcall_cond_wait_timeout(cond_, mutex->mutex_, timeout);
+void s4u::ConditionVariable::wait_for(std::unique_lock<Mutex>& lock, double timeout) {
+ simcall_cond_wait_timeout(cond_, lock.mutex()->mutex_, timeout);
}
/**