X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/09a0b55d933dfe1b6c5e77c6e6b55be1b4e6da66..eee423ad6210571e9ce5d8a54c6dd11d5f41f2ed:/src/simix/popping.cpp

diff --git a/src/simix/popping.cpp b/src/simix/popping.cpp
index 631bc80f22..70a30d26f2 100644
--- a/src/simix/popping.cpp
+++ b/src/simix/popping.cpp
@@ -24,7 +24,7 @@ void SIMIX_simcall_answer(smx_simcall_t simcall)
 {
   if (simcall->issuer != simix_global->maestro_process){
     XBT_DEBUG("Answer simcall %s (%d) issued by %s (%p)", SIMIX_simcall_name(simcall->call), (int)simcall->call,
-        simcall->issuer->name, simcall->issuer);
+        simcall->issuer->name.c_str(), simcall->issuer);
     simcall->issuer->simcall.call = SIMCALL_NONE;
 /*    This check should be useless and slows everyone. Reactivate if you see something
  *    weird in process scheduling.
@@ -40,8 +40,20 @@ void SIMIX_simcall_exit(smx_synchro_t synchro)
   synchro->post();
 }
 
-void SIMIX_run_kernel(void* code)
+void SIMIX_run_kernel(std::function<void()> const* code)
 {
-  std::function<void()>* function = (std::function<void()>*) code;
-  (*function)();
+  (*code)();
+}
+
+/** Kernel code for run_blocking
+ *
+ * The implementtion looks a lot like SIMIX_run_kernel ^^
+ *
+ * However, this `run_blocking` is blocking so the process will not be woken
+ * up until `SIMIX_simcall_answer(simcall)`` is called by the kernel.
+ * This means that `code` is responsible for doing this.
+ */
+void SIMIX_run_blocking(std::function<void()> const* code)
+{
+  (*code)();
 }