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
Revert "kill one simcall, simplify another"
[simgrid.git]
/
src
/
s4u
/
s4u_conditionVariable.cpp
diff --git
a/src/s4u/s4u_conditionVariable.cpp
b/src/s4u/s4u_conditionVariable.cpp
index
8ed32f4
..
33e9df7
100644
(file)
--- a/
src/s4u/s4u_conditionVariable.cpp
+++ b/
src/s4u/s4u_conditionVariable.cpp
@@
-1,29
+1,44
@@
+/* Copyright (c) 2006-2017. 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 <exception>
#include <mutex>
+#include <xbt/ex.hpp>
#include <xbt/log.hpp>
#include <xbt/log.hpp>
-#include "simgrid/s4u/
c
onditionVariable.hpp"
+#include "simgrid/s4u/
C
onditionVariable.hpp"
#include "simgrid/simix.h"
#include "simgrid/simix.h"
+#include "src/simix/smx_synchro_private.hpp"
-using namespace simgrid;
+namespace simgrid {
+namespace s4u {
-s4u::ConditionVariable::ConditionVariable() : cond_(simcall_cond_init()){
-
-}
-
-s4u::ConditionVariable::~ConditionVariable() {
- SIMIX_cond_unref(cond_);
+ConditionVariablePtr ConditionVariable::createConditionVariable()
+{
+ smx_cond_t cond = simcall_cond_init();
+ return ConditionVariablePtr(&cond->cond_, false);
}
/**
* Wait functions
*/
}
/**
* Wait functions
*/
-void s4u::ConditionVariable::wait(std::unique_lock<Mutex>& lock) {
+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_);
}
std::cv_status s4u::ConditionVariable::wait_for(std::unique_lock<Mutex>& lock, double timeout) {
simcall_cond_wait(cond_, lock.mutex()->mutex_);
}
std::cv_status s4u::ConditionVariable::wait_for(std::unique_lock<Mutex>& lock, double timeout) {
+ // The simcall uses -1 for "any timeout" but we don't want this:
+ if (timeout < 0)
+ timeout = 0.0;
+
try {
simcall_cond_wait_timeout(cond_, lock.mutex()->mutex_, timeout);
return std::cv_status::no_timeout;
try {
simcall_cond_wait_timeout(cond_, lock.mutex()->mutex_, timeout);
return std::cv_status::no_timeout;
@@
-49,7
+64,7
@@
std::cv_status s4u::ConditionVariable::wait_for(std::unique_lock<Mutex>& lock, d
}
}
}
}
-std::cv_status
s4u::
ConditionVariable::wait_until(std::unique_lock<Mutex>& lock, double timeout_time)
+std::cv_status ConditionVariable::wait_until(std::unique_lock<Mutex>& lock, double timeout_time)
{
double now = SIMIX_get_clock();
double timeout;
{
double now = SIMIX_get_clock();
double timeout;
@@
-59,16
+74,27
@@
std::cv_status s4u::ConditionVariable::wait_until(std::unique_lock<Mutex>& lock,
timeout = timeout_time - now;
return this->wait_for(lock, timeout);
}
timeout = timeout_time - now;
return this->wait_for(lock, timeout);
}
-
+
/**
* Notify functions
*/
/**
* Notify functions
*/
-void
s4u::
ConditionVariable::notify_one() {
+void ConditionVariable::notify_one() {
simcall_cond_signal(cond_);
}
simcall_cond_signal(cond_);
}
-
-void
s4u::
ConditionVariable::notify_all() {
+
+void ConditionVariable::notify_all() {
simcall_cond_broadcast(cond_);
}
simcall_cond_broadcast(cond_);
}
-
+void intrusive_ptr_add_ref(ConditionVariable* cond)
+{
+ intrusive_ptr_add_ref(cond->cond_);
+}
+
+void intrusive_ptr_release(ConditionVariable* cond)
+{
+ intrusive_ptr_release(cond->cond_);
+}
+
+}
+}