-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2019. 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. */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)");
-unsigned long simix_process_maxpid = 0;
+static unsigned long simix_process_maxpid = 0;
/**
* @brief Returns the current agent.
*/
smx_actor_t SIMIX_process_self()
{
- smx_context_t self_context = SIMIX_context_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;
}
/**
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);
}
namespace simgrid {
-
namespace kernel {
namespace actor {
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);
}
}
}
-/** @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.
*
simix_global->process_to_run.push_back(process);
intrusive_ptr_add_ref(process);
- /* The onCreation() signal must be delayed until there, where the pid and everything is set */
- simgrid::s4u::ActorPtr tmp = process->iface(); // Passing this directly to onCreation will lead to crashes
- simgrid::s4u::Actor::on_creation(tmp);
+ /* The on_creation() signal must be delayed until there, where the pid and everything is set */
+ simgrid::s4u::Actor::on_creation(process->iface());
return process;
}
void SIMIX_process_detach()
{
- auto* context = dynamic_cast<simgrid::kernel::context::AttachContext*>(SIMIX_context_self());
+ auto* context = dynamic_cast<simgrid::kernel::context::AttachContext*>(simgrid::kernel::context::Context::self());
if (context == nullptr)
xbt_die("Not a suitable context");
- SIMIX_process_cleanup(context->process());
+ SIMIX_process_cleanup(context->get_actor());
context->attach_stop();
}
return;
}
- XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", issuer->get_cname(),
- (issuer->host_ == nullptr ? "(null)" : issuer->host_->get_cname()), actor->get_cname(),
+ XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", issuer == nullptr ? "(null)" : issuer->get_cname(),
+ (issuer == nullptr || issuer->host_ == nullptr ? "(null)" : issuer->host_->get_cname()), actor->get_cname(),
actor->host_->get_cname());
actor->context_->iwannadie = true;
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) {
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_) {
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);
