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
convert SIMIX_simcall_answer() into ActorImpl::simcall_answer()
[simgrid.git]
/
src
/
kernel
/
activity
/
ConditionVariableImpl.hpp
diff --git
a/src/kernel/activity/ConditionVariableImpl.hpp
b/src/kernel/activity/ConditionVariableImpl.hpp
index
eeb95d1
..
f165dde
100644
(file)
--- a/
src/kernel/activity/ConditionVariableImpl.hpp
+++ b/
src/kernel/activity/ConditionVariableImpl.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2012-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2012-201
9
. 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. */
@@
-7,7
+7,7
@@
#define SIMGRID_KERNEL_ACTIVITY_CONDITIONVARIABLEIMPL_HPP
#include "simgrid/s4u/ConditionVariable.hpp"
#define SIMGRID_KERNEL_ACTIVITY_CONDITIONVARIABLEIMPL_HPP
#include "simgrid/s4u/ConditionVariable.hpp"
-#include "src/
simix
/ActorImpl.hpp"
+#include "src/
kernel/actor
/ActorImpl.hpp"
#include <boost/intrusive/list.hpp>
namespace simgrid {
#include <boost/intrusive/list.hpp>
namespace simgrid {
@@
-19,12
+19,13
@@
public:
ConditionVariableImpl();
~ConditionVariableImpl();
ConditionVariableImpl();
~ConditionVariableImpl();
-
simgrid::kernel::actor::SynchroList sleeping
; /* list of sleeping processes */
-
smx_mutex_t mutex
= nullptr;
- s
imgrid::s
4u::ConditionVariable cond_;
+
actor::SynchroList sleeping_
; /* list of sleeping processes */
+
MutexImpl* mutex_
= nullptr;
+ s4u::ConditionVariable cond_;
void broadcast();
void signal();
void broadcast();
void signal();
+ void wait(MutexImpl* mutex, double timeout, actor::ActorImpl* issuer, smx_simcall_t simcall);
private:
std::atomic_int_fast32_t refcount_{1};
private:
std::atomic_int_fast32_t refcount_{1};
@@
-34,10
+35,5
@@
private:
} // namespace activity
} // namespace kernel
} // namespace simgrid
} // namespace activity
} // namespace kernel
} // namespace simgrid
-XBT_PRIVATE smx_cond_t SIMIX_cond_init();
-
-// simcall handlers
-XBT_PRIVATE void simcall_HANDLER_cond_signal(smx_simcall_t simcall, smx_cond_t cond);
-XBT_PRIVATE void simcall_HANDLER_cond_broadcast(smx_simcall_t simcall, smx_cond_t cond);
#endif
#endif