X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/38f7ddbf61f574a934f191ef2d8358d9f8be1f96..d5b29830df70e823202e384a7655e4371193ecd7:/src/simix/ActorImpl.cpp diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index 5af5070581..d4b3934ff4 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -433,7 +433,7 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { boost::dynamic_pointer_cast(process->waiting_synchro); if (exec != nullptr) { - + /* Nothing to do */ } else if (comm != nullptr) { process->comms.remove(process->waiting_synchro); comm->cancel(); @@ -449,6 +449,8 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { } else if (io != nullptr) { SIMIX_io_destroy(process->waiting_synchro); + } else { + xbt_die("Unknown type of activity"); } /* @@ -878,10 +880,9 @@ xbt_dynar_t SIMIX_processes_as_dynar() { } void SIMIX_process_on_exit_runall(smx_actor_t process) { - s_smx_process_exit_fun_t exit_fun; smx_process_exit_status_t exit_status = (process->context->iwannadie) ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS; while (not process->on_exit.empty()) { - exit_fun = process->on_exit.back(); + s_smx_process_exit_fun_t exit_fun = process->on_exit.back(); (exit_fun.fun)((void*)exit_status, exit_fun.arg); process->on_exit.pop_back(); }