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
Fix shared seek when using something else than MPI_SEEK_SET
[simgrid.git]
/
src
/
s4u
/
s4u_ConditionVariable.cpp
diff --git
a/src/s4u/s4u_ConditionVariable.cpp
b/src/s4u/s4u_ConditionVariable.cpp
index
0e3713d
..
c95fc4f
100644
(file)
--- a/
src/s4u/s4u_ConditionVariable.cpp
+++ b/
src/s4u/s4u_ConditionVariable.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2006-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-20
20
. 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. */
/* 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. */
@@
-19,8
+19,8
@@
namespace s4u {
ConditionVariablePtr ConditionVariable::create()
{
kernel::activity::ConditionVariableImpl* cond =
ConditionVariablePtr ConditionVariable::create()
{
kernel::activity::ConditionVariableImpl* cond =
-
simix
::simcall([] { return new kernel::activity::ConditionVariableImpl(); });
- return ConditionVariablePtr(
&cond->cond_
, false);
+
kernel::actor
::simcall([] { return new kernel::activity::ConditionVariableImpl(); });
+ return ConditionVariablePtr(
cond->get_iface()
, false);
}
/**
}
/**
@@
-31,12
+31,12
@@
void ConditionVariable::wait(MutexPtr lock)
simcall_cond_wait(cond_, lock->pimpl_);
}
simcall_cond_wait(cond_, lock->pimpl_);
}
-void ConditionVariable::wait(std::unique_lock<Mutex>& lock)
+void ConditionVariable::wait(
const
std::unique_lock<Mutex>& lock)
{
simcall_cond_wait(cond_, lock.mutex()->pimpl_);
}
{
simcall_cond_wait(cond_, lock.mutex()->pimpl_);
}
-std::cv_status s4u::ConditionVariable::wait_for(std::unique_lock<Mutex>& lock, double timeout)
+std::cv_status s4u::ConditionVariable::wait_for(
const
std::unique_lock<Mutex>& lock, double timeout)
{
// The simcall uses -1 for "any timeout" but we don't want this:
if (timeout < 0)
{
// The simcall uses -1 for "any timeout" but we don't want this:
if (timeout < 0)
@@
-51,7
+51,7
@@
std::cv_status s4u::ConditionVariable::wait_for(std::unique_lock<Mutex>& lock, d
}
}
}
}
-std::cv_status ConditionVariable::wait_until(std::unique_lock<Mutex>& lock, double timeout_time)
+std::cv_status ConditionVariable::wait_until(
const
std::unique_lock<Mutex>& lock, double timeout_time)
{
double now = SIMIX_get_clock();
double timeout;
{
double now = SIMIX_get_clock();
double timeout;
@@
-67,20
+67,20
@@
std::cv_status ConditionVariable::wait_until(std::unique_lock<Mutex>& lock, doub
*/
void ConditionVariable::notify_one()
{
*/
void ConditionVariable::notify_one()
{
- simgrid::
simix
::simcall([this]() { cond_->signal(); });
+ simgrid::
kernel::actor
::simcall([this]() { cond_->signal(); });
}
void ConditionVariable::notify_all()
{
}
void ConditionVariable::notify_all()
{
- simgrid::
simix
::simcall([this]() { cond_->broadcast(); });
+ simgrid::
kernel::actor
::simcall([this]() { cond_->broadcast(); });
}
}
-void intrusive_ptr_add_ref(ConditionVariable* cond)
+void intrusive_ptr_add_ref(
const
ConditionVariable* cond)
{
intrusive_ptr_add_ref(cond->cond_);
}
{
intrusive_ptr_add_ref(cond->cond_);
}
-void intrusive_ptr_release(ConditionVariable* cond)
+void intrusive_ptr_release(
const
ConditionVariable* cond)
{
intrusive_ptr_release(cond->cond_);
}
{
intrusive_ptr_release(cond->cond_);
}
@@
-92,7
+92,7
@@
void intrusive_ptr_release(ConditionVariable* cond)
sg_cond_t sg_cond_init()
{
simgrid::kernel::activity::ConditionVariableImpl* cond =
sg_cond_t sg_cond_init()
{
simgrid::kernel::activity::ConditionVariableImpl* cond =
- simgrid::
simix
::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); });
+ simgrid::
kernel::actor
::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); });
return new simgrid::s4u::ConditionVariable(cond);
}
return new simgrid::s4u::ConditionVariable(cond);
}
@@
-105,7
+105,7
@@
void sg_cond_wait(sg_cond_t cond, sg_mutex_t mutex)
int sg_cond_wait_for(sg_cond_t cond, sg_mutex_t mutex, double delay)
{
std::unique_lock<simgrid::s4u::Mutex> lock(*mutex);
int sg_cond_wait_for(sg_cond_t cond, sg_mutex_t mutex, double delay)
{
std::unique_lock<simgrid::s4u::Mutex> lock(*mutex);
- return
static_cast<int>(cond->wait_for(lock, delay))
;
+ return
cond->wait_for(lock, delay) == std::cv_status::timeout ? 1 : 0
;
}
void sg_cond_notify_one(sg_cond_t cond)
}
void sg_cond_notify_one(sg_cond_t cond)
@@
-118,7
+118,7
@@
void sg_cond_notify_all(sg_cond_t cond)
cond->notify_all();
}
cond->notify_all();
}
-void sg_cond_destroy(sg_cond_t cond)
+void sg_cond_destroy(
const_
sg_cond_t cond)
{
delete cond;
}
{
delete cond;
}