From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Tue, 1 Aug 2017 21:13:30 +0000 (+0200)
Subject: Try to fix msg-process-join.
X-Git-Tag: v3_17~293
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3588903e68413e5b42def6dad2c8ece40106c2e5

Try to fix msg-process-join.

On exit, call SIMIX_process_join_finish in maestro context.
---

diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index 318e5ed228..6bd02caaa7 100644
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -723,7 +723,12 @@ smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, doubl
    * The C API should first be properly replaced with the C++ one, which is a fair amount of work.
    */
   intrusive_ptr_add_ref(process);
-  SIMIX_process_on_exit(process, (int_f_pvoid_pvoid_t)SIMIX_process_join_finish, &*res);
+  SIMIX_process_on_exit(process,
+                        [](void*, void* arg) {
+                          return simgrid::simix::kernelImmediate(
+                              [&] { return SIMIX_process_join_finish(SMX_EXIT_SUCCESS, arg); });
+                        },
+                        &*res);
   return res;
 }