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 lua compilation
[simgrid.git]
/
src
/
s4u
/
s4u_Actor.cpp
diff --git
a/src/s4u/s4u_Actor.cpp
b/src/s4u/s4u_Actor.cpp
index
8fdb474
..
4285386
100644
(file)
--- a/
src/s4u/s4u_Actor.cpp
+++ b/
src/s4u/s4u_Actor.cpp
@@
-114,7
+114,7
@@
void Actor::join(double timeout) const
{
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
const kernel::actor::ActorImpl* target = pimpl_;
- kernel::actor::simcall_blocking
<void>
([issuer, target, timeout] {
+ kernel::actor::simcall_blocking([issuer, target, timeout] {
if (target->finished_) {
// The joined process is already finished, just wake up the issuer right away
issuer->simcall_answer();
@@
-133,7
+133,7
@@
void Actor::set_auto_restart(bool autorestart)
auto* arg = new kernel::actor::ProcessArg(pimpl_->get_host(), pimpl_);
XBT_DEBUG("Adding %s to the actors_at_boot_ list of Host %s", arg->name.c_str(), arg->host->get_cname());
- pimpl_->get_host()->
pimpl_
->add_actor_at_boot(arg);
+ pimpl_->get_host()->
get_impl()
->add_actor_at_boot(arg);
});
}
@@
-157,13
+157,10
@@
void Actor::set_host(Host* new_host)
const s4u::Host* previous_location = get_host();
kernel::actor::simcall([this, new_host]() {
- if (pimpl_->waiting_synchro_ != nullptr) {
- // The actor is blocked on an activity. If it's an exec, migrate it too.
+ for (auto const& activity : pimpl_->activities_) {
// FIXME: implement the migration of other kinds of activities
- kernel::activity::ExecImplPtr exec =
- boost::dynamic_pointer_cast<kernel::activity::ExecImpl>(pimpl_->waiting_synchro_);
- xbt_assert(exec.get() != nullptr, "We can only migrate blocked actors when they are blocked on executions.");
- exec->migrate(new_host);
+ if (auto exec = boost::dynamic_pointer_cast<kernel::activity::ExecImpl>(activity))
+ exec->migrate(new_host);
}
this->pimpl_->set_host(new_host);
});
@@
-221,7
+218,7
@@
void Actor::suspend()
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
kernel::actor::ActorImpl* target = pimpl_;
s4u::Actor::on_suspend(*this);
- kernel::actor::simcall_blocking
<void>
([issuer, target]() {
+ kernel::actor::simcall_blocking([issuer, target]() {
target->suspend();
if (target != issuer) {
/* If we are suspending ourselves, then just do not finish the simcall now */
@@
-262,7
+259,7
@@
void Actor::kill()
ActorPtr Actor::by_pid(aid_t pid)
{
- kernel::actor::ActorImpl* actor = kernel::actor::ActorImpl::by_
PID
(pid);
+ kernel::actor::ActorImpl* actor = kernel::actor::ActorImpl::by_
pid
(pid);
if (actor != nullptr)
return actor->get_iface();
else
@@
-318,22
+315,34
@@
void sleep_for(double duration)
{
xbt_assert(std::isfinite(duration), "duration is not finite!");
- if (duration > 0) {
- kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
- Actor::on_sleep(*issuer->get_ciface());
-
- kernel::actor::simcall_blocking<void>([issuer, duration]() {
- if (MC_is_active() || MC_record_replay_is_active()) {
- MC_process_clock_add(issuer, duration);
- issuer->simcall_answer();
- return;
- }
- kernel::activity::ActivityImplPtr sync = issuer->sleep(duration);
- sync->register_simcall(&issuer->simcall_);
- });
-
- Actor::on_wake_up(*issuer->get_ciface());
+ if (duration <= 0) /* that's a no-op */
+ return;
+
+ if (duration < sg_surf_precision) {
+ static unsigned int warned = 0; // At most 20 such warnings
+ warned++;
+ if (warned <= 20)
+ XBT_INFO("The parameter to sleep_for() is smaller than the SimGrid numerical accuracy (%g < %g). "
+ "Please refer to https://simgrid.org/doc/latest/Configuring_SimGrid.html#numerical-precision",
+ duration, sg_surf_precision);
+ if (warned == 20)
+ XBT_VERB("(further warnings about the numerical accuracy of sleep_for() will be omitted).");
}
+
+ kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+ Actor::on_sleep(*issuer->get_ciface());
+
+ kernel::actor::simcall_blocking([issuer, duration]() {
+ if (MC_is_active() || MC_record_replay_is_active()) {
+ MC_process_clock_add(issuer, duration);
+ issuer->simcall_answer();
+ return;
+ }
+ kernel::activity::ActivityImplPtr sync = issuer->sleep(duration);
+ sync->register_simcall(&issuer->simcall_);
+ });
+
+ Actor::on_wake_up(*issuer->get_ciface());
}
void yield()
@@
-437,7
+446,7
@@
void suspend()
{
kernel::actor::ActorImpl* self = simgrid::kernel::actor::ActorImpl::self();
s4u::Actor::on_suspend(*self->get_ciface());
- kernel::actor::simcall_blocking
<void>
([self] { self->suspend(); });
+ kernel::actor::simcall_blocking([self] { self->suspend(); });
}
void exit()
@@
-492,7
+501,7
@@
sg_actor_t sg_actor_init(const char* name, sg_host_t host)
return simgrid::s4u::Actor::init(name, host).get();
}
-void sg_actor_start(sg_actor_t actor, xbt_main_func_t code, int argc, const char* const* argv)
+void sg_actor_start
_
(sg_actor_t actor, xbt_main_func_t code, int argc, const char* const* argv)
{
simgrid::kernel::actor::ActorCode function;
if (code)
@@
-500,7
+509,7
@@
void sg_actor_start(sg_actor_t actor, xbt_main_func_t code, int argc, const char
actor->start(function);
}
-sg_actor_t sg_actor_create(const char* name, sg_host_t host, xbt_main_func_t code, int argc, const char* const* argv)
+sg_actor_t sg_actor_create
_
(const char* name, sg_host_t host, xbt_main_func_t code, int argc, const char* const* argv)
{
simgrid::kernel::actor::ActorCode function = simgrid::xbt::wrap_main(code, argc, argv);
return simgrid::s4u::Actor::init(name, host)->start(function).get();
@@
-522,7
+531,7
@@
void sg_actor_exit()
* This function checks whether @a actor is a valid pointer and return its PID (or 0 in case of problem).
*/
-aid_t sg_actor_get_
PID
(const_sg_actor_t actor)
+aid_t sg_actor_get_
pid
(const_sg_actor_t actor)
{
/* Do not raise an exception here: this function is called by the logs
* and the exceptions, so it would be called back again and again */
@@
-537,7
+546,7
@@
aid_t sg_actor_get_PID(const_sg_actor_t actor)
* This function checks whether @a actor is a valid pointer and return its parent's PID.
* Returns -1 if the actor has not been created by any other actor.
*/
-aid_t sg_actor_get_
PPID
(const_sg_actor_t actor)
+aid_t sg_actor_get_
ppid
(const_sg_actor_t actor)
{
return actor->get_ppid();
}
@@
-549,11
+558,26
@@
aid_t sg_actor_get_PPID(const_sg_actor_t actor)
* If none is found, @c nullptr is returned.
Note that the PID are unique in the whole simulation, not only on a given host.
*/
-sg_actor_t sg_actor_by_
PID
(aid_t pid)
+sg_actor_t sg_actor_by_
pid
(aid_t pid)
{
return simgrid::s4u::Actor::by_pid(pid).get();
}
+aid_t sg_actor_get_PID(const_sg_actor_t actor) // XBT_ATTRIB_DEPRECATED_v331
+{
+ return sg_actor_get_pid(actor);
+}
+
+aid_t sg_actor_get_PPID(const_sg_actor_t actor) // XBT_ATTRIB_DEPRECATED_v331
+{
+ return sg_actor_get_ppid(actor);
+}
+
+sg_actor_t sg_actor_by_PID(aid_t pid) // XBT_ATTRIB_DEPRECATED_v331
+{
+ return sg_actor_by_pid(pid);
+}
+
/** @brief Return the name of an actor. */
const char* sg_actor_get_name(const_sg_actor_t actor)
{
@@
-730,7
+754,8
@@
sg_actor_t sg_actor_attach(const char* name, void* data, sg_host_t host, xbt_dic
/* Let's create the process: SIMIX may decide to start it right now, even before returning the flow control to us */
smx_actor_t actor = nullptr;
try {
- actor = simgrid::kernel::actor::ActorImpl::attach(name, data, host, &props).get();
+ actor = simgrid::kernel::actor::ActorImpl::attach(name, data, host).get();
+ actor->set_properties(props);
} catch (simgrid::HostFailureException const&) {
xbt_die("Could not attach");
}