X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8e6b22bbbde4130f0b21491404f2af0f57df8019..bfed90d7c58bf90f06017312bc82965a416986eb:/src/simix/libsmx.cpp

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index e7317084f5..f31aa0e01c 100644
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -17,14 +17,17 @@
 
 #include <xbt/functional.hpp>
 
+#include <simgrid/simix/blocking_simcall.hpp>
+
 #include "src/mc/mc_replay.h"
 #include "smx_private.h"
 #include "src/mc/mc_forward.hpp"
 #include "xbt/ex.h"
 #include "mc/mc.h"
 #include "src/simix/smx_host_private.h"
+#include "src/kernel/activity/SynchroComm.hpp"
+#include "src/surf/virtual_machine.hpp"
 
-#include "src/simix/SynchroComm.hpp"
 
 #include <simgrid/simix.hpp>
 
@@ -32,7 +35,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
 
 #include "popping_bodies.cpp"
 
-void simcall_call(smx_process_t process)
+void simcall_call(smx_actor_t process)
 {
   if (process != simix_global->maestro_process) {
     XBT_DEBUG("Yield process '%s' on simcall %s (%d)", process->name.c_str(),
@@ -68,18 +71,17 @@ xbt_dict_t simcall_asr_get_properties(const char *name)
  * \param flops_amount amount Computation amount (in flops)
  * \param priority computation priority
  * \param bound
- * \param affinity_mask
  * \return A new SIMIX execution synchronization
  */
-smx_synchro_t simcall_execution_start(const char *name,
+smx_activity_t simcall_execution_start(const char *name,
                                     double flops_amount,
-                                    double priority, double bound, unsigned long affinity_mask)
+                                    double priority, double bound)
 {
   /* checking for infinite values */
   xbt_assert(std::isfinite(flops_amount), "flops_amount is not finite!");
   xbt_assert(std::isfinite(priority), "priority is not finite!");
 
-  return simcall_BODY_execution_start(name, flops_amount, priority, bound, affinity_mask);
+  return simcall_BODY_execution_start(name, flops_amount, priority, bound);
 }
 
 /**
@@ -97,7 +99,7 @@ smx_synchro_t simcall_execution_start(const char *name,
  * \param rate the SURF action rate
  * \return A new SIMIX execution synchronization
  */
-smx_synchro_t simcall_execution_parallel_start(const char *name,
+smx_activity_t simcall_execution_parallel_start(const char *name,
                                          int host_nb,
                                          sg_host_t *host_list,
                                          double *flops_amount,
@@ -134,7 +136,7 @@ smx_synchro_t simcall_execution_parallel_start(const char *name,
  * This functions stops the execution. It calls a surf function.
  * \param execution The execution synchro to cancel
  */
-void simcall_execution_cancel(smx_synchro_t execution)
+void simcall_execution_cancel(smx_activity_t execution)
 {
   simcall_BODY_execution_cancel(execution);
 }
@@ -147,7 +149,7 @@ void simcall_execution_cancel(smx_synchro_t execution)
  * \param execution The execution synchro
  * \param priority The new priority
  */
-void simcall_execution_set_priority(smx_synchro_t execution, double priority)
+void simcall_execution_set_priority(smx_activity_t execution, double priority)
 {
   /* checking for infinite values */
   xbt_assert(std::isfinite(priority), "priority is not finite!");
@@ -163,32 +165,18 @@ void simcall_execution_set_priority(smx_synchro_t execution, double priority)
  * \param execution The execution synchro
  * \param bound The new bound
  */
-void simcall_execution_set_bound(smx_synchro_t execution, double bound)
+void simcall_execution_set_bound(smx_activity_t execution, double bound)
 {
   simcall_BODY_execution_set_bound(execution, bound);
 }
 
-/**
- * \ingroup simix_process_management
- * \brief Changes the CPU affinity of an execution synchro.
- *
- * This functions changes the CPU affinity of an execution synchro. See taskset(1) on Linux.
- * \param execution The execution synchro
- * \param host Host
- * \param mask Affinity mask
- */
-void simcall_execution_set_affinity(smx_synchro_t execution, sg_host_t host, unsigned long mask)
-{
-  simcall_BODY_execution_set_affinity(execution, host, mask);
-}
-
 /**
  * \ingroup simix_host_management
  * \brief Waits for the completion of an execution synchro and destroy it.
  *
  * \param execution The execution synchro
  */
-e_smx_state_t simcall_execution_wait(smx_synchro_t execution)
+e_smx_state_t simcall_execution_wait(smx_activity_t execution)
 {
   return (e_smx_state_t) simcall_BODY_execution_wait(execution);
 }
@@ -203,9 +191,14 @@ e_smx_state_t simcall_execution_wait(smx_synchro_t execution)
  *
  * \return The host object of the VM
  */
-void* simcall_vm_create(const char *name, sg_host_t phys_host)
+sg_host_t simcall_vm_create(const char *name, sg_host_t phys_host)
 {
-  return simgrid::simix::kernel(std::bind(SIMIX_vm_create, name, phys_host));
+  return simgrid::simix::kernelImmediate([&] {
+    sg_host_t host = surf_vm_model->createVM(name, phys_host);
+    SIMIX_host_create(host);
+
+    return host;
+  });
 }
 
 /**
@@ -216,7 +209,7 @@ void* simcall_vm_create(const char *name, sg_host_t phys_host)
  */
 void simcall_vm_start(sg_host_t vm)
 {
-  return simgrid::simix::kernel(std::bind(SIMIX_vm_start, vm));
+  simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_start, vm));
 }
 
 /**
@@ -228,7 +221,7 @@ void simcall_vm_start(sg_host_t vm)
  */
 int simcall_vm_get_state(sg_host_t vm)
 {
-  return simgrid::simix::kernel(std::bind(SIMIX_vm_get_state, vm));
+  return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_get_state, vm));
 }
 
 /**
@@ -240,17 +233,12 @@ int simcall_vm_get_state(sg_host_t vm)
  */
 void *simcall_vm_get_pm(sg_host_t vm)
 {
-  return simgrid::simix::kernel(std::bind(SIMIX_vm_get_pm, vm));
+  return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_get_pm, vm));
 }
 
 void simcall_vm_set_bound(sg_host_t vm, double bound)
 {
-  simgrid::simix::kernel(std::bind(SIMIX_vm_set_bound, vm, bound));
-}
-
-void simcall_vm_set_affinity(sg_host_t vm, sg_host_t pm, unsigned long mask)
-{
-  simgrid::simix::kernel(std::bind(SIMIX_vm_set_affinity, vm, pm, mask));
+  simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_set_bound, vm, bound));
 }
 
 /**
@@ -262,7 +250,7 @@ void simcall_vm_set_affinity(sg_host_t vm, sg_host_t pm, unsigned long mask)
  */
 void simcall_vm_migrate(sg_host_t vm, sg_host_t host)
 {
-  return simgrid::simix::kernel(std::bind(SIMIX_vm_migrate, vm, host));
+  simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_migrate, vm, host));
 }
 
 /**
@@ -328,14 +316,13 @@ void simcall_vm_shutdown(sg_host_t vm)
  */
 void simcall_vm_destroy(sg_host_t vm)
 {
-  simgrid::simix::kernel(std::bind(SIMIX_vm_destroy, vm));
+  simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_destroy, vm));
 }
 
 /**
  * \ingroup simix_vm_management
  * \brief Encompassing simcall to prevent the removal of the src or the dst node at the end of a VM migration
  *  The simcall actually invokes the following calls: 
- *     simcall_vm_set_affinity(vm, src_pm, 0); 
  *     simcall_vm_migrate(vm, dst_pm); 
  *     simcall_vm_resume(vm);
  *
@@ -347,7 +334,7 @@ void simcall_vm_destroy(sg_host_t vm)
  */
 void simcall_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst_pm)
 {
-  simgrid::simix::kernel(std::bind(
+  simgrid::simix::kernelImmediate(std::bind(
     SIMIX_vm_migratefrom_resumeto, vm, src_pm, dst_pm));
 }
 
@@ -359,7 +346,7 @@ void simcall_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t d
  *
  * \param process poor victim
  */
-void simcall_process_kill(smx_process_t process)
+void simcall_process_kill(smx_actor_t process)
 {
   simcall_BODY_process_kill(process);
 }
@@ -378,7 +365,7 @@ void simcall_process_killall(int reset_pid)
  * \brief Cleans up a SIMIX process.
  * \param process poor victim (must have already been killed)
  */
-void simcall_process_cleanup(smx_process_t process)
+void simcall_process_cleanup(smx_actor_t process)
 {
   simcall_BODY_process_cleanup(process);
 }
@@ -392,12 +379,12 @@ void simcall_process_cleanup(smx_process_t process)
  * \param process the process to migrate
  * \param dest name of the new host
  */
-void simcall_process_set_host(smx_process_t process, sg_host_t dest)
+void simcall_process_set_host(smx_actor_t process, sg_host_t dest)
 {
   simcall_BODY_process_set_host(process, dest);
 }
 
-void simcall_process_join(smx_process_t process, double timeout)
+void simcall_process_join(smx_actor_t process, double timeout)
 {
   simcall_BODY_process_join(process, timeout);
 }
@@ -411,7 +398,7 @@ void simcall_process_join(smx_process_t process, double timeout)
  *
  * \param process a SIMIX process
  */
-void simcall_process_suspend(smx_process_t process)
+void simcall_process_suspend(smx_actor_t process)
 {
   xbt_assert(process, "Invalid parameters");
 
@@ -427,7 +414,7 @@ void simcall_process_suspend(smx_process_t process)
  *
  * \param process a SIMIX process
  */
-void simcall_process_resume(smx_process_t process)
+void simcall_process_resume(smx_actor_t process)
 {
   simcall_BODY_process_resume(process);
 }
@@ -438,62 +425,40 @@ void simcall_process_resume(smx_process_t process)
  *
  * Maestro internal process is not counted, only user code processes are
  */
-int simcall_process_count(void)
-{
-  return simgrid::simix::kernel(SIMIX_process_count);
-}
-
-/**
- * \ingroup simix_process_management
- * \brief Return the PID of a #smx_process_t.
- * \param process a SIMIX process
- * \return the PID of this process
- */
-int simcall_process_get_PID(smx_process_t process)
+int simcall_process_count()
 {
-  return SIMIX_process_get_PID(process);
+  return simgrid::simix::kernelImmediate(SIMIX_process_count);
 }
 
 /**
  * \ingroup simix_process_management
- * \brief Return the parent PID of a #smx_process_t.
- * \param process a SIMIX process
- * \return the PID of this process parenrt
- */
-int simcall_process_get_PPID(smx_process_t process)
-{
-  return SIMIX_process_get_PPID(process);
-}
-
-/**
- * \ingroup simix_process_management
- * \brief Return the user data of a #smx_process_t.
+ * \brief Return the user data of a #smx_actor_t.
  * \param process a SIMIX process
  * \return the user data of this process
  */
-void* simcall_process_get_data(smx_process_t process)
+void* simcall_process_get_data(smx_actor_t process)
 {
   return SIMIX_process_get_data(process);
 }
 
 /**
  * \ingroup simix_process_management
- * \brief Set the user data of a #smx_process_t.
+ * \brief Set the user data of a #smx_actor_t.
  *
  * This functions sets the user data associated to \a process.
  * \param process SIMIX process
  * \param data User data
  */
-void simcall_process_set_data(smx_process_t process, void *data)
+void simcall_process_set_data(smx_actor_t process, void *data)
 {
-  simgrid::simix::kernel(std::bind(SIMIX_process_set_data, process, data));
+  simgrid::simix::kernelImmediate(std::bind(SIMIX_process_set_data, process, data));
 }
 
 /**
  * \ingroup simix_process_management
  * \brief Set the kill time of a process.
  */
-void simcall_process_set_kill_time(smx_process_t process, double kill_time)
+void simcall_process_set_kill_time(smx_actor_t process, double kill_time)
 {
 
   if (kill_time <= SIMIX_get_clock() || simix_global->kill_process_function == nullptr)
@@ -509,37 +474,10 @@ void simcall_process_set_kill_time(smx_process_t process, double kill_time)
  * \ingroup simix_process_management
  * \brief Get the kill time of a process (or 0 if unset).
  */
-double simcall_process_get_kill_time(smx_process_t process) {
+double simcall_process_get_kill_time(smx_actor_t process) {
   return SIMIX_timer_get_date(process->kill_timer);
 }
 
-/**
- * \ingroup simix_process_management
- * \brief Return the location on which an agent is running.
- *
- * This functions returns the sg_host_t corresponding to the location on which
- * \a process is running.
- * \param process SIMIX process
- * \return SIMIX host
- */
-sg_host_t simcall_process_get_host(smx_process_t process)
-{
-  return SIMIX_process_get_host(process);
-}
-
-/**
- * \ingroup simix_process_management
- * \brief Return the name of an agent.
- *
- * This functions checks whether \a process is a valid pointer or not and return its name.
- * \param process SIMIX process
- * \return The process name
- */
-const char* simcall_process_get_name(smx_process_t process)
-{
-  return SIMIX_process_get_name(process);
-}
-
 /**
  * \ingroup simix_process_management
  * \brief Returns true if the process is suspended .
@@ -548,7 +486,7 @@ const char* simcall_process_get_name(smx_process_t process)
  * \param process SIMIX process
  * \return 1, if the process is suspended, else 0.
  */
-int simcall_process_is_suspended(smx_process_t process)
+int simcall_process_is_suspended(smx_actor_t process)
 {
   return simcall_BODY_process_is_suspended(process);
 }
@@ -559,7 +497,7 @@ int simcall_process_is_suspended(smx_process_t process)
  *
  * This functions returns the properties associated with this process
  */
-xbt_dict_t simcall_process_get_properties(smx_process_t process)
+xbt_dict_t simcall_process_get_properties(smx_actor_t process)
 {
   return SIMIX_process_get_properties(process);
 }
@@ -568,7 +506,7 @@ xbt_dict_t simcall_process_get_properties(smx_process_t process)
  * \brief Add an on_exit function
  * Add an on_exit function which will be executed when the process exits/is killed.
  */
-XBT_PUBLIC(void) simcall_process_on_exit(smx_process_t process, int_f_pvoid_pvoid_t fun, void *data)
+XBT_PUBLIC(void) simcall_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void *data)
 {
   simcall_BODY_process_on_exit(process, fun, data);
 }
@@ -578,7 +516,7 @@ XBT_PUBLIC(void) simcall_process_on_exit(smx_process_t process, int_f_pvoid_pvoi
  * Will restart the process when the host comes back up if auto_restart is set to 1.
  */
 
-XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_process_t process, int auto_restart)
+XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_actor_t process, int auto_restart)
 {
   simcall_BODY_process_auto_restart_set(process, auto_restart);
 }
@@ -587,9 +525,9 @@ XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_process_t process, int aut
  * \ingroup simix_process_management
  * \brief Restarts the process, killing it and starting it again from scratch.
  */
-XBT_PUBLIC(smx_process_t) simcall_process_restart(smx_process_t process)
+XBT_PUBLIC(smx_actor_t) simcall_process_restart(smx_actor_t process)
 {
-  return (smx_process_t) simcall_BODY_process_restart(process);
+  return (smx_actor_t) simcall_BODY_process_restart(process);
 }
 /**
  * \ingroup simix_process_management
@@ -620,32 +558,7 @@ smx_mailbox_t simcall_mbox_create(const char *name)
   return simcall_BODY_mbox_create(name);
 }
 
-/**
- *  \ingroup simix_mbox_management
- *  \brief Returns a rendez-vous point knowing its name
- */
-smx_mailbox_t simcall_mbox_get_by_name(const char *name)
-{
-  /* FIXME: this is a horrible loss of performance, so we hack it out by
-   * skipping the simcall (for now). It works in parallel, it won't work on
-   * distributed but probably we will change MSG for that. */
-
-  return SIMIX_mbox_get_by_name(name);
-}
-
-/**
- *  \ingroup simix_mbox_management
- *  \brief returns the communication at the head of the rendez-vous
- *  \param mbox The rendez-vous point
- *  \return The communication or nullptr if empty
- */
-smx_synchro_t simcall_mbox_front(smx_mailbox_t mbox)
-{
-
-  return mbox->comm_queue->empty()? nullptr:mbox->comm_queue->front();
-}
-
-void simcall_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t process)
+void simcall_mbox_set_receiver(smx_mailbox_t mbox, smx_actor_t process)
 {
   simcall_BODY_mbox_set_receiver(mbox, process);
 }
@@ -653,10 +566,10 @@ void simcall_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t process)
 /**
  * \ingroup simix_comm_management
  */
-void simcall_comm_send(smx_process_t sender, smx_mailbox_t mbox, double task_size, double rate,
+void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate,
                          void *src_buff, size_t src_buff_size,
-                         int (*match_fun)(void *, void *, smx_synchro_t),
-                         void (*copy_data_fun)(smx_synchro_t, void*, size_t), void *data,
+                         int (*match_fun)(void *, void *, smx_activity_t),
+                         void (*copy_data_fun)(smx_activity_t, void*, size_t), void *data,
                          double timeout)
 {
   /* checking for infinite values */
@@ -668,7 +581,7 @@ void simcall_comm_send(smx_process_t sender, smx_mailbox_t mbox, double task_siz
 
   if (MC_is_active() || MC_record_replay_is_active()) {
     /* the model-checker wants two separate simcalls */
-    smx_synchro_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simcall */
+    smx_activity_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simcall */
     comm = simcall_comm_isend(sender, mbox, task_size, rate,
         src_buff, src_buff_size, match_fun, nullptr, copy_data_fun, data, 0);
     simcall_comm_wait(comm, timeout);
@@ -683,11 +596,11 @@ void simcall_comm_send(smx_process_t sender, smx_mailbox_t mbox, double task_siz
 /**
  * \ingroup simix_comm_management
  */
-smx_synchro_t simcall_comm_isend(smx_process_t sender, smx_mailbox_t mbox, double task_size, double rate,
+smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate,
                               void *src_buff, size_t src_buff_size,
-                              int (*match_fun)(void *, void *, smx_synchro_t),
+                              int (*match_fun)(void *, void *, smx_activity_t),
                               void (*clean_fun)(void *),
-                              void (*copy_data_fun)(smx_synchro_t, void*, size_t),
+                              void (*copy_data_fun)(smx_activity_t, void*, size_t),
                               void *data,
                               int detached)
 {
@@ -705,9 +618,9 @@ smx_synchro_t simcall_comm_isend(smx_process_t sender, smx_mailbox_t mbox, doubl
 /**
  * \ingroup simix_comm_management
  */
-void simcall_comm_recv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t * dst_buff_size,
-                       int (*match_fun)(void *, void *, smx_synchro_t),
-                       void (*copy_data_fun)(smx_synchro_t, void*, size_t),
+void simcall_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t * dst_buff_size,
+                       int (*match_fun)(void *, void *, smx_activity_t),
+                       void (*copy_data_fun)(smx_activity_t, void*, size_t),
                        void *data, double timeout, double rate)
 {
   xbt_assert(std::isfinite(timeout), "timeout is not finite!");
@@ -715,7 +628,7 @@ void simcall_comm_recv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buf
 
   if (MC_is_active() || MC_record_replay_is_active()) {
     /* the model-checker wants two separate simcalls */
-    smx_synchro_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simcall */
+    smx_activity_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simcall */
     comm = simcall_comm_irecv(receiver, mbox, dst_buff, dst_buff_size,
                               match_fun, copy_data_fun, data, rate);
     simcall_comm_wait(comm, timeout);
@@ -729,9 +642,9 @@ void simcall_comm_recv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buf
 /**
  * \ingroup simix_comm_management
  */
-smx_synchro_t simcall_comm_irecv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size,
-                                int (*match_fun)(void *, void *, smx_synchro_t),
-                                void (*copy_data_fun)(smx_synchro_t, void*, size_t),
+smx_activity_t simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size,
+                                int (*match_fun)(void *, void *, smx_activity_t),
+                                void (*copy_data_fun)(smx_activity_t, void*, size_t),
                                 void *data, double rate)
 {
   xbt_assert(mbox, "No rendez-vous point defined for irecv");
@@ -743,8 +656,8 @@ smx_synchro_t simcall_comm_irecv(smx_process_t receiver, smx_mailbox_t mbox, voi
 /**
  * \ingroup simix_comm_management
  */
-smx_synchro_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag,
-                                int (*match_fun)(void *, void *, smx_synchro_t), void *data)
+smx_activity_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag,
+                                int (*match_fun)(void *, void *, smx_activity_t), void *data)
 {
   xbt_assert(mbox, "No rendez-vous point defined for iprobe");
 
@@ -754,10 +667,10 @@ smx_synchro_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag
 /**
  * \ingroup simix_comm_management
  */
-void simcall_comm_cancel(smx_synchro_t synchro)
+void simcall_comm_cancel(smx_activity_t synchro)
 {
-  simgrid::simix::kernel([synchro]{
-    simgrid::simix::Comm *comm = static_cast<simgrid::simix::Comm*>(synchro);
+  simgrid::simix::kernelImmediate([synchro]{
+    simgrid::kernel::activity::Comm *comm = static_cast<simgrid::kernel::activity::Comm*>(synchro);
     comm->cancel();
   });
 }
@@ -765,25 +678,25 @@ void simcall_comm_cancel(smx_synchro_t synchro)
 /**
  * \ingroup simix_comm_management
  */
-unsigned int simcall_comm_waitany(xbt_dynar_t comms)
+unsigned int simcall_comm_waitany(xbt_dynar_t comms, double timeout)
 {
-  return simcall_BODY_comm_waitany(comms);
+  return simcall_BODY_comm_waitany(comms, timeout);
 }
 
 /**
  * \ingroup simix_comm_management
  */
-int simcall_comm_testany(xbt_dynar_t comms)
+int simcall_comm_testany(smx_activity_t* comms, size_t count)
 {
-  if (xbt_dynar_is_empty(comms))
+  if (count == 0)
     return -1;
-  return simcall_BODY_comm_testany(comms);
+  return simcall_BODY_comm_testany(comms, count);
 }
 
 /**
  * \ingroup simix_comm_management
  */
-void simcall_comm_wait(smx_synchro_t comm, double timeout)
+void simcall_comm_wait(smx_activity_t comm, double timeout)
 {
   xbt_assert(std::isfinite(timeout), "timeout is not finite!");
   simcall_BODY_comm_wait(comm, timeout);
@@ -796,7 +709,7 @@ void simcall_comm_wait(smx_synchro_t comm, double timeout)
  * \param execution The execution synchro
  * \param category The tracing category
  */
-void simcall_set_category(smx_synchro_t synchro, const char *category)
+void simcall_set_category(smx_activity_t synchro, const char *category)
 {
   if (category == nullptr) {
     return;
@@ -808,7 +721,7 @@ void simcall_set_category(smx_synchro_t synchro, const char *category)
  * \ingroup simix_comm_management
  *
  */
-int simcall_comm_test(smx_synchro_t comm)
+int simcall_comm_test(smx_activity_t comm)
 {
   return simcall_BODY_comm_test(comm);
 }
@@ -817,7 +730,7 @@ int simcall_comm_test(smx_synchro_t comm)
  * \ingroup simix_synchro_management
  *
  */
-smx_mutex_t simcall_mutex_init(void)
+smx_mutex_t simcall_mutex_init()
 {
   if(!simix_global) {
     fprintf(stderr,"You must run MSG_init before using MSG\n"); // We can't use xbt_die since we may get there before the initialization
@@ -857,7 +770,7 @@ void simcall_mutex_unlock(smx_mutex_t mutex)
  * \ingroup simix_synchro_management
  *
  */
-smx_cond_t simcall_cond_init(void)
+smx_cond_t simcall_cond_init()
 {
   return simcall_BODY_cond_init();
 }
@@ -1090,7 +1003,12 @@ xbt_dict_t simcall_storage_get_content(smx_storage_t storage)
 
 void simcall_run_kernel(std::function<void()> const& code)
 {
-  return simcall_BODY_run_kernel(&code);
+  simcall_BODY_run_kernel(&code);
+}
+
+void simcall_run_blocking(std::function<void()> const& code)
+{
+  simcall_BODY_run_blocking(&code);
 }
 
 int simcall_mc_random(int min, int max) {
@@ -1103,3 +1021,15 @@ int simcall_mc_random(int min, int max) {
 const char *SIMIX_simcall_name(e_smx_simcall_t kind) {
   return simcall_names[kind];
 }
+
+namespace simgrid {
+namespace simix {
+
+void unblock(smx_actor_t process)
+{
+  xbt_assert(SIMIX_is_maestro());
+  SIMIX_simcall_answer(&process->simcall);
+}
+
+}
+}