A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove superfluous indirection.
[simgrid.git]
/
src
/
s4u
/
s4u_conditionVariable.cpp
diff --git
a/src/s4u/s4u_conditionVariable.cpp
b/src/s4u/s4u_conditionVariable.cpp
index
3074f12
..
0def488
100644
(file)
--- a/
src/s4u/s4u_conditionVariable.cpp
+++ b/
src/s4u/s4u_conditionVariable.cpp
@@
-1,17
+1,22
@@
+/* Copyright (c) 2006-2018. 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 <xbt/ex.hpp>
#include <xbt/log.hpp>
#include <exception>
#include <mutex>
#include <xbt/ex.hpp>
#include <xbt/log.hpp>
-#include "src/simix/smx_synchro_private.h"
-#include "simgrid/s4u/conditionVariable.hpp"
+#include "simgrid/s4u/ConditionVariable.hpp"
#include "simgrid/simix.h"
#include "simgrid/simix.h"
+#include "src/kernel/activity/ConditionVariableImpl.hpp"
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
-ConditionVariablePtr ConditionVariable::create
ConditionVariable
()
+ConditionVariablePtr ConditionVariable::create()
{
smx_cond_t cond = simcall_cond_init();
return ConditionVariablePtr(&cond->cond_, false);
{
smx_cond_t cond = simcall_cond_init();
return ConditionVariablePtr(&cond->cond_, false);
@@
-20,6
+25,11
@@
ConditionVariablePtr ConditionVariable::createConditionVariable()
/**
* Wait functions
*/
/**
* Wait functions
*/
+void ConditionVariable::wait(MutexPtr lock)
+{
+ simcall_cond_wait(cond_, lock->mutex_);
+}
+
void ConditionVariable::wait(std::unique_lock<Mutex>& lock) {
simcall_cond_wait(cond_, lock.mutex()->mutex_);
}
void ConditionVariable::wait(std::unique_lock<Mutex>& lock) {
simcall_cond_wait(cond_, lock.mutex()->mutex_);
}
@@
-64,14
+74,14
@@
std::cv_status ConditionVariable::wait_until(std::unique_lock<Mutex>& lock, doub
timeout = timeout_time - now;
return this->wait_for(lock, timeout);
}
timeout = timeout_time - now;
return this->wait_for(lock, timeout);
}
-
+
/**
* Notify functions
*/
void ConditionVariable::notify_one() {
simcall_cond_signal(cond_);
}
/**
* Notify functions
*/
void ConditionVariable::notify_one() {
simcall_cond_signal(cond_);
}
-
+
void ConditionVariable::notify_all() {
simcall_cond_broadcast(cond_);
}
void ConditionVariable::notify_all() {
simcall_cond_broadcast(cond_);
}