X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2ea993e0850fee75ea52d854326103caa280ae6f..2c83ab2062e1f773aeb1ba070196632bd07d47ac:/src/simix/ActorImpl.cpp?ds=sidebyside

diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index 8071b9c1a4..93c18e44bc 100644
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -56,9 +56,6 @@ 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);
@@ -67,38 +64,6 @@ void SIMIX_process_cleanup(smx_actor_t process)
 
   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);
@@ -473,30 +438,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) {
@@ -743,6 +686,7 @@ void SIMIX_process_yield(smx_actor_t self)
   if (self->context_->iwannadie) {
 
     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();
     THROW_IMPOSSIBLE;
   }