}
}
-/** @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.
*
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_) {