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
SIMIX_process_change_host becomes ActorImpl::change_host
[simgrid.git]
/
src
/
simix
/
ActorImpl.cpp
diff --git
a/src/simix/ActorImpl.cpp
b/src/simix/ActorImpl.cpp
index
06e64af
..
a1d2bda
100644
(file)
--- a/
src/simix/ActorImpl.cpp
+++ b/
src/simix/ActorImpl.cpp
@@
-36,7
+36,7
@@
smx_actor_t SIMIX_process_self()
{
smx_context_t self_context = simgrid::kernel::context::Context::self();
- return (self_context != nullptr) ? self_context->
process
() : nullptr;
+ return (self_context != nullptr) ? self_context->
get_actor
() : nullptr;
}
/**
@@
-56,49
+56,8
@@
void SIMIX_process_cleanup(smx_actor_t process)
XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", process->get_cname(), process,
process->waiting_synchro.get());
- process->finished_ = true;
- SIMIX_process_on_exit_runall(process);
-
- /* Unregister from the kill timer if any */
- if (process->kill_timer != nullptr) {
- SIMIX_timer_remove(process->kill_timer);
- process->kill_timer = nullptr;
- }
-
simix_global->mutex.lock();
- /* cancel non-blocking communications */
- while (not process->comms.empty()) {
- smx_activity_t synchro = process->comms.front();
- process->comms.pop_front();
- simgrid::kernel::activity::CommImplPtr comm =
- boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(synchro);
-
- /* make sure no one will finish the comm after this process is destroyed,
- * because src_proc or dst_proc would be an invalid pointer */
-
- if (comm->src_proc == process) {
- XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p", comm.get(),
- comm->detached, (int)comm->state_, comm->src_proc, comm->dst_proc);
- comm->src_proc = nullptr;
-
- } else if (comm->dst_proc == process) {
- XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p", comm.get(), (int)comm->state_,
- comm->src_proc, comm->dst_proc);
- comm->dst_proc = nullptr;
-
- if (comm->detached && comm->src_proc != nullptr) {
- /* the comm will be freed right now, remove it from the sender */
- comm->src_proc->comms.remove(comm);
- }
- } else {
- xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro.get());
- }
- comm->cancel();
- }
-
- XBT_DEBUG("%s@%s(%ld) should not run anymore", process->get_cname(), process->iface()->get_host()->get_cname(),
- process->pid_);
simix_global->process_list.erase(process->pid_);
if (process->host_ && process->host_process_list_hook.is_linked())
simgrid::xbt::intrusive_erase(process->host_->pimpl_->process_list_, *process);
@@
-132,7
+91,6
@@
void SIMIX_process_empty_trash()
}
namespace simgrid {
-
namespace kernel {
namespace actor {
@@
-147,6
+105,17
@@
ActorImpl::~ActorImpl()
delete this->context_;
}
+void ActorImpl::set_kill_time(double kill_time)
+{
+ if (kill_time <= SIMIX_get_clock())
+ return;
+ XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, get_cname(), host_->get_cname());
+ kill_timer = SIMIX_timer_set(kill_time, [this] {
+ SIMIX_process_kill(this, nullptr);
+ kill_timer = nullptr;
+ });
+}
+
static void dying_daemon(int /*exit_status*/, void* data)
{
std::vector<ActorImpl*>* vect = &simix_global->daemons;
@@
-180,9
+149,9
@@
simgrid::s4u::Actor* ActorImpl::restart()
SIMIX_process_kill(this, (this == simix_global->maestro_process) ? this : SIMIX_process_self());
// start the new process
- ActorImpl
*
actor =
-
SIMIX_process_
create(arg.name, std::move(arg.code), arg.data, arg.host, arg.properties.get(), nullptr);
-
simcall_process_set_kill_time(actor,
arg.kill_time);
+ ActorImpl
Ptr
actor =
+
ActorImpl::
create(arg.name, std::move(arg.code), arg.data, arg.host, arg.properties.get(), nullptr);
+
actor->set_kill_time(
arg.kill_time);
actor->set_auto_restart(arg.auto_restart);
return actor->ciface();
@@
-237,8
+206,8
@@
smx_activity_t ActorImpl::sleep(double duration)
simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl();
synchro->host = host_;
- synchro->surf_
sleep
= host_->pimpl_cpu->sleep(duration);
- synchro->surf_
sleep
->set_data(synchro);
+ synchro->surf_
action_
= host_->pimpl_cpu->sleep(duration);
+ synchro->surf_
action_
->set_data(synchro);
XBT_DEBUG("Create sleep synchronization %p", synchro);
return synchro;
@@
-293,86
+262,76
@@
void ActorImpl::throw_exception(std::exception_ptr e)
waiting_synchro = nullptr;
}
-void
create_maestro(simgrid::simix::ActorCode code
)
+void
ActorImpl::change_host(sg_host_t dest
)
{
- /* Create maestro process and initialize it */
- smx_actor_t maestro = new simgrid::kernel::actor::ActorImpl(simgrid::xbt::string(""), /*host*/ nullptr);
-
- if (not code) {
- maestro->context_ = SIMIX_context_new(simgrid::simix::ActorCode(), nullptr, maestro);
- } else {
- if (not simix_global)
- xbt_die("simix is not initialized, please call MSG_init first");
- maestro->context_ = simix_global->context_factory->create_maestro(code, maestro);
- }
-
- maestro->simcall.issuer = maestro;
- simix_global->maestro_process = maestro;
+ simgrid::xbt::intrusive_erase(host_->pimpl_->process_list_, *this);
+ host_ = dest;
+ dest->pimpl_->process_list_.push_back(*this);
}
-} // namespace actor
-}
-}
-
-/** @brief Creates and runs the maestro process */
-void SIMIX_maestro_create(void (*code)(void*), void* data)
-{
- simgrid::kernel::actor::create_maestro(std::bind(code, data));
-}
-
-/**
- * @brief Internal function to create a process.
- *
- * This function actually creates the process.
- * It may be called when a SIMCALL_PROCESS_CREATE simcall occurs,
- * or directly for SIMIX internal purposes. The sure thing is that it's called from maestro context.
- *
- * @return the process created
- */
-smx_actor_t SIMIX_process_create(std::string name, simgrid::simix::ActorCode code, void* data, simgrid::s4u::Host* host,
- std::unordered_map<std::string, std::string>* properties, smx_actor_t parent_process)
+ActorImplPtr ActorImpl::create(std::string name, simgrid::simix::ActorCode code, void* data, simgrid::s4u::Host* host,
+ std::unordered_map<std::string, std::string>* properties, smx_actor_t parent_actor)
{
XBT_DEBUG("Start actor %s@'%s'", name.c_str(), host->get_cname());
if (host->is_off()) {
- XBT_WARN("Cannot launch
process
'%s' on failed host '%s'", name.c_str(), host->get_cname());
+ XBT_WARN("Cannot launch
actor
'%s' on failed host '%s'", name.c_str(), host->get_cname());
return nullptr;
}
-
smx_actor_t process
= new simgrid::kernel::actor::ActorImpl(simgrid::xbt::string(name), host);
+
ActorImpl* actor
= new simgrid::kernel::actor::ActorImpl(simgrid::xbt::string(name), host);
xbt_assert(code && host != nullptr, "Invalid parameters");
- /*
Process
data */
-
process
->set_user_data(data);
-
process
->code = code;
+ /*
actor
data */
+
actor
->set_user_data(data);
+
actor
->code = code;
- if (parent_
process
!= nullptr)
-
process->ppid_ = parent_process
->pid_;
+ if (parent_
actor
!= nullptr)
+
actor->ppid_ = parent_actor
->pid_;
- XBT_VERB("Create context %s",
process
->get_cname());
-
process->context_ = SIMIX_context_new(std::move(code), &SIMIX_process_cleanup, process
);
+ XBT_VERB("Create context %s",
actor
->get_cname());
+
actor->context_ = SIMIX_context_new(std::move(code), &SIMIX_process_cleanup, actor
);
/* Add properties */
if (properties != nullptr)
for (auto const& kv : *properties)
-
process
->set_property(kv.first, kv.second);
+
actor
->set_property(kv.first, kv.second);
/* Add the process to its host's process list */
- host->pimpl_->process_list_.push_back(*
process
);
+ host->pimpl_->process_list_.push_back(*
actor
);
- XBT_DEBUG("Start context '%s'",
process
->get_cname());
+ XBT_DEBUG("Start context '%s'",
actor
->get_cname());
/* Now insert it in the global process list and in the process to run list */
- simix_global->process_list[
process->pid_] = process
;
- XBT_DEBUG("Inserting %s(%s) in the to_run list",
process
->get_cname(), host->get_cname());
- simix_global->process_to_run.push_back(
process
);
- intrusive_ptr_add_ref(
process
);
+ simix_global->process_list[
actor->pid_] = actor
;
+ XBT_DEBUG("Inserting %s(%s) in the to_run list",
actor
->get_cname(), host->get_cname());
+ simix_global->process_to_run.push_back(
actor
);
+ intrusive_ptr_add_ref(
actor
);
/* The on_creation() signal must be delayed until there, where the pid and everything is set */
- simgrid::s4u::Actor::on_creation(
process
->iface());
+ simgrid::s4u::Actor::on_creation(
actor
->iface());
- return process;
+ return ActorImplPtr(actor);
+}
+
+void create_maestro(simgrid::simix::ActorCode code)
+{
+ /* Create maestro process and initialize it */
+ smx_actor_t maestro = new simgrid::kernel::actor::ActorImpl(simgrid::xbt::string(""), /*host*/ nullptr);
+
+ if (not code) {
+ maestro->context_ = SIMIX_context_new(simgrid::simix::ActorCode(), nullptr, maestro);
+ } else {
+ maestro->context_ = simix_global->context_factory->create_maestro(code, maestro);
+ }
+
+ maestro->simcall.issuer = maestro;
+ simix_global->maestro_process = maestro;
+}
+
+} // namespace actor
+} // namespace kernel
}
smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostname,
@@
-432,7
+391,7
@@
void SIMIX_process_detach()
if (context == nullptr)
xbt_die("Not a suitable context");
- SIMIX_process_cleanup(context->
process
());
+ SIMIX_process_cleanup(context->
get_actor
());
context->attach_stop();
}
@@
-481,30
+440,8
@@
void SIMIX_process_kill(smx_actor_t actor, smx_actor_t issuer)
actor->exception = nullptr;
// Forcefully kill the actor if its host is turned off. Not an HostFailureException because you should not survive that
- if (actor->host_->is_off()) {
- /* HORRIBLE HACK: Don't throw an StopRequest exception in Java, because it breaks sometimes.
- *
- * It seems to break for the actors started from the Java world, with new Process()
- * while it works for the ones started from the C world, with the deployment file.
- * When it happens, the simulation stops brutally with a message "untrapped exception StopRequest".
- *
- * From what I understand, it works for the native actors because they have a nice try/catch block around their main
- * but I fail to have something like that for pure Java actors. That's probably a story of C->Java vs Java->C
- * calling conventions. The right solution may be to have try/catch(StopRequest) blocks around each native call in
- * JNI. ie, protect every Java->C++ call from C++ exceptions. But this sounds long and painful to do before we
- * switch to an automatic generator such as SWIG. For now, we don't throw here that exception that we sometimes fail
- * to catch.
- *
- * One of the unfortunate outcome is that the threads started from the deployment file are not stopped anymore.
- * Or maybe this is the actors stopping gracefully as opposed to the killed ones? Or maybe this is absolutely all
- * actors of the Java simulation? I'm not sure. Anyway. Because of them, the simulation hangs at the end, waiting
- * for them to stop but they won't. The current answer to that is very brutal:
- * we do a "exit(0)" to kill the JVM from the C code after the call to MSG_run(). Definitely unpleasant.
- */
-
- if (simgrid::kernel::context::factory_initializer == nullptr) // Only Java sets a factory_initializer, for now
- actor->throw_exception(std::make_exception_ptr(simgrid::kernel::context::Context::StopRequest("host failed")));
- }
+ if (actor->host_->is_off())
+ actor->throw_exception(std::make_exception_ptr(simgrid::kernel::context::StopRequest("host failed")));
/* destroy the blocking synchro if any */
if (actor->waiting_synchro != nullptr) {
@@
-534,8
+471,8
@@
void SIMIX_process_kill(smx_actor_t actor, smx_actor_t issuer)
if (i != actor->waiting_synchro->simcalls_.end())
actor->waiting_synchro->simcalls_.remove(&actor->simcall);
} else if (sleep != nullptr) {
- if (sleep->surf_
sleep
)
- sleep->surf_
sleep
->cancel();
+ if (sleep->surf_
action_
)
+ sleep->surf_
action_
->cancel();
sleep->post();
} else if (raw != nullptr) {
SIMIX_synchro_stop_waiting(actor, &actor->simcall);
@@
-620,13
+557,6
@@
void SIMIX_process_killall(smx_actor_t issuer)
SIMIX_process_kill(kv.second, issuer);
}
-void SIMIX_process_change_host(smx_actor_t actor, sg_host_t dest)
-{
- xbt_assert((actor != nullptr), "Invalid parameters");
- simgrid::xbt::intrusive_erase(actor->host_->pimpl_->process_list_, *actor);
- actor->host_ = dest;
- dest->pimpl_->process_list_.push_back(*actor);
-}
void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t actor)
{
@@
-698,8
+628,8
@@
smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, doubl
SIMIX_process_on_exit(process,
[](int, void* arg) {
auto sleep = static_cast<simgrid::kernel::activity::SleepImpl*>(arg);
- if (sleep->surf_
sleep
)
- sleep->surf_
sleep
->finish(simgrid::kernel::resource::Action::State::FINISHED);
+ if (sleep->surf_
action_
)
+ sleep->surf_
action_
->finish(simgrid::kernel::resource::Action::State::FINISHED);
intrusive_ptr_release(sleep);
},
res.get());
@@
-725,9
+655,9
@@
void SIMIX_process_sleep_destroy(smx_activity_t synchro)
simgrid::kernel::activity::SleepImplPtr sleep =
boost::dynamic_pointer_cast<simgrid::kernel::activity::SleepImpl>(synchro);
- if (sleep->surf_
sleep
) {
- sleep->surf_
sleep
->unref();
- sleep->surf_
sleep
= nullptr;
+ if (sleep->surf_
action_
) {
+ sleep->surf_
action_
->unref();
+ sleep->surf_
action_
= nullptr;
}
}
@@
-749,22
+679,11
@@
void SIMIX_process_yield(smx_actor_t self)
XBT_DEBUG("Control returned to me: '%s'", self->get_cname());
if (self->context_->iwannadie) {
- XBT_DEBUG("I wanna die!");
- self->finished_ = true;
- /* execute the on_exit functions */
- SIMIX_process_on_exit_runall(self);
-
- if (self->auto_restart_ && self->host_->is_off() &&
- watched_hosts.find(self->host_->get_cname()) == watched_hosts.end()) {
- XBT_DEBUG("Push host %s to watched_hosts because it's off and %s needs to restart", self->host_->get_cname(),
- self->get_cname());
- watched_hosts.insert(self->host_->get_cname());
- }
XBT_DEBUG("Process %s@%s is dead", self->get_cname(), self->host_->get_cname());
+ // throw simgrid::kernel::context::StopRequest(); Does not seem to properly kill the actor
self->context_->stop();
- xbt_backtrace_display_current();
- xbt_die("I should be dead by now.");
+ THROW_IMPOSSIBLE;
}
if (self->suspended_) {
@@
-799,17
+718,6
@@
smx_actor_t SIMIX_process_from_PID(aid_t PID)
return actor == simix_global->process_list.end() ? nullptr : actor->second;
}
-void SIMIX_process_on_exit_runall(smx_actor_t actor)
-{
- simgrid::s4u::Actor::on_destruction(actor->iface());
- smx_process_exit_status_t exit_status = (actor->context_->iwannadie) ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS;
- while (not actor->on_exit.empty()) {
- s_smx_process_exit_fun_t exit_fun = actor->on_exit.back();
- actor->on_exit.pop_back();
- (exit_fun.fun)(exit_status, exit_fun.arg);
- }
-}
-
void SIMIX_process_on_exit(smx_actor_t actor, int_f_pvoid_pvoid_t fun, void* data)
{
SIMIX_process_on_exit(actor, [fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data);
@@
-842,6
+750,11
@@
smx_actor_t simcall_process_create(std::string name, simgrid::simix::ActorCode c
{
smx_actor_t self = SIMIX_process_self();
return simgrid::simix::simcall([name, code, data, host, properties, self] {
- return
SIMIX_process_create(name, std::move(code), data, host, properties, self
);
+ return
simgrid::kernel::actor::ActorImpl::create(name, std::move(code), data, host, properties, self).get(
);
});
}
+
+void simcall_process_set_data(smx_actor_t process, void* data)
+{
+ simgrid::simix::simcall([process, data] { process->set_user_data(data); });
+}