Merge branch 'master' of github.com:simgrid/simgrid

diff --git a/examples/s4u/actor-create/s4u_actor-create.cpp b/examples/s4u/actor-create/s4u_actor-create.cpp
index f6700b0..56c2849 100644 (file)
--- a/examples/s4u/actor-create/s4u_actor-create.cpp
+++ b/examples/s4u/actor-create/s4u_actor-create.cpp
@@ -114,6 +114,7 @@ int main(int argc, char** argv)
   e->run();
 
   /* Once the simulation is done, the program is ended */
-  e->shutdown();
+  delete e;
+
   return 0;
 }

diff --git a/include/simgrid/host.h b/include/simgrid/host.h
index eac85bf..1c418b2 100644 (file)
--- a/include/simgrid/host.h
+++ b/include/simgrid/host.h
@@ -39,6 +39,8 @@ XBT_PUBLIC(xbt_dynar_t) sg_host_get_attached_storage_list(sg_host_t host);
 XBT_PUBLIC(double) sg_host_speed(sg_host_t host);
 XBT_PUBLIC(double) sg_host_get_available_speed(sg_host_t host);
 
+XBT_PUBLIC(sg_host_t) sg_host_self();
+XBT_PUBLIC(const char*) sg_host_self_get_name();
 XBT_PUBLIC(int) sg_host_get_nb_pstates(sg_host_t host);
 XBT_PUBLIC(int) sg_host_get_pstate(sg_host_t host);
 XBT_PUBLIC(void) sg_host_set_pstate(sg_host_t host,int pstate);

diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index 6eb90dd..057b20c 100644 (file)
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -297,6 +297,7 @@ XBT_PUBLIC(int) MSG_process_get_PPID(msg_process_t process);
 XBT_PUBLIC(const char *) MSG_process_get_name(msg_process_t process);
 XBT_PUBLIC(int) MSG_process_self_PID();
 XBT_PUBLIC(int) MSG_process_self_PPID();
+XBT_PUBLIC(const char*) MSG_process_self_name();
 XBT_PUBLIC(msg_process_t) MSG_process_self();
 XBT_PUBLIC(xbt_dynar_t) MSG_processes_as_dynar();
 XBT_PUBLIC(int) MSG_process_get_number();

diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index b464cf1..f134c43 100644 (file)
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -184,8 +184,6 @@ XBT_PUBLIC(smx_actor_t) SIMIX_process_attach(
 XBT_PUBLIC(void) SIMIX_process_detach();
 
 /*********************************** Host *************************************/
-XBT_PUBLIC(sg_host_t) SIMIX_host_self();
-XBT_PUBLIC(const char*) SIMIX_host_self_get_name();
 XBT_PUBLIC(void) SIMIX_host_off(sg_host_t host, smx_actor_t issuer);
 XBT_PUBLIC(void) SIMIX_host_self_set_data(void *data);
 XBT_PUBLIC(void*) SIMIX_host_self_get_data();
@@ -227,7 +225,6 @@ XBT_PUBLIC(void) simcall_call(smx_actor_t process);
 
 /******************************* Host simcalls ********************************/
 XBT_PUBLIC(void) simcall_host_set_data(sg_host_t host, void *data);
-
 XBT_PUBLIC(smx_activity_t) simcall_execution_start(const char *name,
                                                 double flops_amount,
                                                 double priority, double bound);

diff --git a/include/xbt/synchro.h b/include/xbt/synchro.h
index 340ef71..ba772f7 100644 (file)
--- a/include/xbt/synchro.h
+++ b/include/xbt/synchro.h
@@ -8,8 +8,6 @@
 #ifndef XBT_THREAD_H
 #define XBT_THREAD_H
 
-#include <simgrid/simix.h>
-
 #include "xbt/function_types.h"
 #include "xbt/misc.h" /* SG_BEGIN_DECL */
 

diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp
index 091650e..ffe758f 100644 (file)
--- a/src/msg/msg_process.cpp
+++ b/src/msg/msg_process.cpp
@@ -390,6 +390,14 @@ int MSG_process_self_PPID()
   return MSG_process_get_PPID(MSG_process_self());
 }
 
+/** \ingroup m_process_management
+ * \brief Return the name of the current process.
+ */
+const char* MSG_process_self_name()
+{
+  return SIMIX_process_self_get_name();
+}
+
 /** \ingroup m_process_management
  * \brief Return the current process.
  *

diff --git a/src/simix/popping_accessors.h b/src/simix/popping_accessors.h
index e89a565..6232869 100644 (file)
--- a/src/simix/popping_accessors.h
+++ b/src/simix/popping_accessors.h
@@ -15,94 +15,111 @@
  */
 
 #include "src/simix/popping_private.h"
-static inline smx_actor_t simcall_process_kill__get__process(smx_simcall_t simcall) {
+static inline smx_actor_t simcall_process_kill__get__process(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_actor_t>(simcall->args[0]);
 }
 static inline smx_actor_t simcall_process_kill__getraw__process(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_actor_t>(simcall->args[0]);
 }
-static inline void simcall_process_kill__set__process(smx_simcall_t simcall, smx_actor_t arg) {
-    simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
+static inline void simcall_process_kill__set__process(smx_simcall_t simcall, smx_actor_t arg)
+{
+  simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
 }
 
-static inline int simcall_process_killall__get__reset_pid(smx_simcall_t simcall) {
+static inline int simcall_process_killall__get__reset_pid(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<int>(simcall->args[0]);
 }
 static inline int simcall_process_killall__getraw__reset_pid(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<int>(simcall->args[0]);
 }
-static inline void simcall_process_killall__set__reset_pid(smx_simcall_t simcall, int arg) {
-    simgrid::simix::marshal<int>(simcall->args[0], arg);
+static inline void simcall_process_killall__set__reset_pid(smx_simcall_t simcall, int arg)
+{
+  simgrid::simix::marshal<int>(simcall->args[0], arg);
 }
 
-static inline smx_actor_t simcall_process_cleanup__get__process(smx_simcall_t simcall) {
+static inline smx_actor_t simcall_process_cleanup__get__process(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_actor_t>(simcall->args[0]);
 }
 static inline smx_actor_t simcall_process_cleanup__getraw__process(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_actor_t>(simcall->args[0]);
 }
-static inline void simcall_process_cleanup__set__process(smx_simcall_t simcall, smx_actor_t arg) {
-    simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
+static inline void simcall_process_cleanup__set__process(smx_simcall_t simcall, smx_actor_t arg)
+{
+  simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
 }
 
-static inline smx_actor_t simcall_process_suspend__get__process(smx_simcall_t simcall) {
+static inline smx_actor_t simcall_process_suspend__get__process(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_actor_t>(simcall->args[0]);
 }
 static inline smx_actor_t simcall_process_suspend__getraw__process(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_actor_t>(simcall->args[0]);
 }
-static inline void simcall_process_suspend__set__process(smx_simcall_t simcall, smx_actor_t arg) {
-    simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
+static inline void simcall_process_suspend__set__process(smx_simcall_t simcall, smx_actor_t arg)
+{
+  simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
 }
 
-static inline smx_actor_t simcall_process_resume__get__process(smx_simcall_t simcall) {
+static inline smx_actor_t simcall_process_resume__get__process(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_actor_t>(simcall->args[0]);
 }
 static inline smx_actor_t simcall_process_resume__getraw__process(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_actor_t>(simcall->args[0]);
 }
-static inline void simcall_process_resume__set__process(smx_simcall_t simcall, smx_actor_t arg) {
-    simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
+static inline void simcall_process_resume__set__process(smx_simcall_t simcall, smx_actor_t arg)
+{
+  simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
 }
 
-static inline smx_actor_t simcall_process_set_host__get__process(smx_simcall_t simcall) {
+static inline smx_actor_t simcall_process_set_host__get__process(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_actor_t>(simcall->args[0]);
 }
 static inline smx_actor_t simcall_process_set_host__getraw__process(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_actor_t>(simcall->args[0]);
 }
-static inline void simcall_process_set_host__set__process(smx_simcall_t simcall, smx_actor_t arg) {
-    simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
+static inline void simcall_process_set_host__set__process(smx_simcall_t simcall, smx_actor_t arg)
+{
+  simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
 }
-static inline sg_host_t simcall_process_set_host__get__dest(smx_simcall_t simcall) {
+static inline sg_host_t simcall_process_set_host__get__dest(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<sg_host_t>(simcall->args[1]);
 }
 static inline sg_host_t simcall_process_set_host__getraw__dest(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<sg_host_t>(simcall->args[1]);
 }
-static inline void simcall_process_set_host__set__dest(smx_simcall_t simcall, sg_host_t arg) {
-    simgrid::simix::marshal<sg_host_t>(simcall->args[1], arg);
+static inline void simcall_process_set_host__set__dest(smx_simcall_t simcall, sg_host_t arg)
+{
+  simgrid::simix::marshal<sg_host_t>(simcall->args[1], arg);
 }
 
-static inline smx_actor_t simcall_process_is_suspended__get__process(smx_simcall_t simcall) {
+static inline smx_actor_t simcall_process_is_suspended__get__process(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_actor_t>(simcall->args[0]);
 }
 static inline smx_actor_t simcall_process_is_suspended__getraw__process(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_actor_t>(simcall->args[0]);
 }
-static inline void simcall_process_is_suspended__set__process(smx_simcall_t simcall, smx_actor_t arg) {
-    simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
+static inline void simcall_process_is_suspended__set__process(smx_simcall_t simcall, smx_actor_t arg)
+{
+  simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
 }
-static inline int simcall_process_is_suspended__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<int>(simcall->result);
+static inline int simcall_process_is_suspended__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline int simcall_process_is_suspended__getraw__result(smx_simcall_t simcall)
 {
@@ -112,28 +129,33 @@ static inline void simcall_process_is_suspended__set__result(smx_simcall_t simca
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline smx_actor_t simcall_process_join__get__process(smx_simcall_t simcall) {
+static inline smx_actor_t simcall_process_join__get__process(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_actor_t>(simcall->args[0]);
 }
 static inline smx_actor_t simcall_process_join__getraw__process(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_actor_t>(simcall->args[0]);
 }
-static inline void simcall_process_join__set__process(smx_simcall_t simcall, smx_actor_t arg) {
-    simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
+static inline void simcall_process_join__set__process(smx_simcall_t simcall, smx_actor_t arg)
+{
+  simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
 }
-static inline double simcall_process_join__get__timeout(smx_simcall_t simcall) {
+static inline double simcall_process_join__get__timeout(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[1]);
 }
 static inline double simcall_process_join__getraw__timeout(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[1]);
 }
-static inline void simcall_process_join__set__timeout(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[1], arg);
+static inline void simcall_process_join__set__timeout(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[1], arg);
 }
-static inline int simcall_process_join__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<int>(simcall->result);
+static inline int simcall_process_join__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline int simcall_process_join__getraw__result(smx_simcall_t simcall)
 {
@@ -143,18 +165,21 @@ static inline void simcall_process_join__set__result(smx_simcall_t simcall, int
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline double simcall_process_sleep__get__duration(smx_simcall_t simcall) {
+static inline double simcall_process_sleep__get__duration(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[0]);
 }
 static inline double simcall_process_sleep__getraw__duration(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[0]);
 }
-static inline void simcall_process_sleep__set__duration(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[0], arg);
+static inline void simcall_process_sleep__set__duration(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[0], arg);
 }
-static inline int simcall_process_sleep__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<int>(simcall->result);
+static inline int simcall_process_sleep__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline int simcall_process_sleep__getraw__result(smx_simcall_t simcall)
 {
@@ -164,157 +189,181 @@ static inline void simcall_process_sleep__set__result(smx_simcall_t simcall, int
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline const char* simcall_execution_start__get__name(smx_simcall_t simcall) {
+static inline const char* simcall_execution_start__get__name(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<const char*>(simcall->args[0]);
 }
 static inline const char* simcall_execution_start__getraw__name(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<const char*>(simcall->args[0]);
 }
-static inline void simcall_execution_start__set__name(smx_simcall_t simcall, const char* arg) {
-    simgrid::simix::marshal<const char*>(simcall->args[0], arg);
+static inline void simcall_execution_start__set__name(smx_simcall_t simcall, const char* arg)
+{
+  simgrid::simix::marshal<const char*>(simcall->args[0], arg);
 }
-static inline double simcall_execution_start__get__flops_amount(smx_simcall_t simcall) {
+static inline double simcall_execution_start__get__flops_amount(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[1]);
 }
 static inline double simcall_execution_start__getraw__flops_amount(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[1]);
 }
-static inline void simcall_execution_start__set__flops_amount(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[1], arg);
+static inline void simcall_execution_start__set__flops_amount(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[1], arg);
 }
-static inline double simcall_execution_start__get__priority(smx_simcall_t simcall) {
+static inline double simcall_execution_start__get__priority(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[2]);
 }
 static inline double simcall_execution_start__getraw__priority(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[2]);
 }
-static inline void simcall_execution_start__set__priority(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[2], arg);
+static inline void simcall_execution_start__set__priority(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[2], arg);
 }
-static inline double simcall_execution_start__get__bound(smx_simcall_t simcall) {
+static inline double simcall_execution_start__get__bound(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[3]);
 }
 static inline double simcall_execution_start__getraw__bound(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[3]);
 }
-static inline void simcall_execution_start__set__bound(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[3], arg);
+static inline void simcall_execution_start__set__bound(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[3], arg);
 }
-static inline boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
+static inline boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
 simcall_execution_start__get__result(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->result);
+  return simgrid::simix::unmarshal<boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>>(simcall->result);
 }
-static inline simgrid::kernel::activity::ActivityImpl* simcall_execution_start__getraw__result(smx_simcall_t simcall)
+static inline simgrid::kernel::activity::ExecImpl* simcall_execution_start__getraw__result(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ActivityImpl*>(simcall->result);
+  return simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ExecImpl*>(simcall->result);
 }
 static inline void
 simcall_execution_start__set__result(smx_simcall_t simcall,
-                                     boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> result)
+                                     boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl> result)
 {
-  simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->result, result);
+  simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>>(simcall->result, result);
 }
 
-static inline const char* simcall_execution_parallel_start__get__name(smx_simcall_t simcall) {
+static inline const char* simcall_execution_parallel_start__get__name(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<const char*>(simcall->args[0]);
 }
 static inline const char* simcall_execution_parallel_start__getraw__name(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<const char*>(simcall->args[0]);
 }
-static inline void simcall_execution_parallel_start__set__name(smx_simcall_t simcall, const char* arg) {
-    simgrid::simix::marshal<const char*>(simcall->args[0], arg);
+static inline void simcall_execution_parallel_start__set__name(smx_simcall_t simcall, const char* arg)
+{
+  simgrid::simix::marshal<const char*>(simcall->args[0], arg);
 }
-static inline int simcall_execution_parallel_start__get__host_nb(smx_simcall_t simcall) {
+static inline int simcall_execution_parallel_start__get__host_nb(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<int>(simcall->args[1]);
 }
 static inline int simcall_execution_parallel_start__getraw__host_nb(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<int>(simcall->args[1]);
 }
-static inline void simcall_execution_parallel_start__set__host_nb(smx_simcall_t simcall, int arg) {
-    simgrid::simix::marshal<int>(simcall->args[1], arg);
+static inline void simcall_execution_parallel_start__set__host_nb(smx_simcall_t simcall, int arg)
+{
+  simgrid::simix::marshal<int>(simcall->args[1], arg);
 }
-static inline sg_host_t* simcall_execution_parallel_start__get__host_list(smx_simcall_t simcall) {
+static inline sg_host_t* simcall_execution_parallel_start__get__host_list(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<sg_host_t*>(simcall->args[2]);
 }
 static inline sg_host_t* simcall_execution_parallel_start__getraw__host_list(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<sg_host_t*>(simcall->args[2]);
 }
-static inline void simcall_execution_parallel_start__set__host_list(smx_simcall_t simcall, sg_host_t* arg) {
-    simgrid::simix::marshal<sg_host_t*>(simcall->args[2], arg);
+static inline void simcall_execution_parallel_start__set__host_list(smx_simcall_t simcall, sg_host_t* arg)
+{
+  simgrid::simix::marshal<sg_host_t*>(simcall->args[2], arg);
 }
-static inline double* simcall_execution_parallel_start__get__flops_amount(smx_simcall_t simcall) {
+static inline double* simcall_execution_parallel_start__get__flops_amount(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double*>(simcall->args[3]);
 }
 static inline double* simcall_execution_parallel_start__getraw__flops_amount(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double*>(simcall->args[3]);
 }
-static inline void simcall_execution_parallel_start__set__flops_amount(smx_simcall_t simcall, double* arg) {
-    simgrid::simix::marshal<double*>(simcall->args[3], arg);
+static inline void simcall_execution_parallel_start__set__flops_amount(smx_simcall_t simcall, double* arg)
+{
+  simgrid::simix::marshal<double*>(simcall->args[3], arg);
 }
-static inline double* simcall_execution_parallel_start__get__bytes_amount(smx_simcall_t simcall) {
+static inline double* simcall_execution_parallel_start__get__bytes_amount(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double*>(simcall->args[4]);
 }
 static inline double* simcall_execution_parallel_start__getraw__bytes_amount(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double*>(simcall->args[4]);
 }
-static inline void simcall_execution_parallel_start__set__bytes_amount(smx_simcall_t simcall, double* arg) {
-    simgrid::simix::marshal<double*>(simcall->args[4], arg);
+static inline void simcall_execution_parallel_start__set__bytes_amount(smx_simcall_t simcall, double* arg)
+{
+  simgrid::simix::marshal<double*>(simcall->args[4], arg);
 }
-static inline double simcall_execution_parallel_start__get__amount(smx_simcall_t simcall) {
+static inline double simcall_execution_parallel_start__get__amount(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[5]);
 }
 static inline double simcall_execution_parallel_start__getraw__amount(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[5]);
 }
-static inline void simcall_execution_parallel_start__set__amount(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[5], arg);
+static inline void simcall_execution_parallel_start__set__amount(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[5], arg);
 }
-static inline double simcall_execution_parallel_start__get__rate(smx_simcall_t simcall) {
+static inline double simcall_execution_parallel_start__get__rate(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[6]);
 }
 static inline double simcall_execution_parallel_start__getraw__rate(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[6]);
 }
-static inline void simcall_execution_parallel_start__set__rate(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[6], arg);
+static inline void simcall_execution_parallel_start__set__rate(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[6], arg);
 }
-static inline double simcall_execution_parallel_start__get__timeout(smx_simcall_t simcall) {
+static inline double simcall_execution_parallel_start__get__timeout(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[7]);
 }
 static inline double simcall_execution_parallel_start__getraw__timeout(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[7]);
 }
-static inline void simcall_execution_parallel_start__set__timeout(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[7], arg);
+static inline void simcall_execution_parallel_start__set__timeout(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[7], arg);
 }
-static inline boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
+static inline boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
 simcall_execution_parallel_start__get__result(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->result);
+  return simgrid::simix::unmarshal<boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>>(simcall->result);
 }
-static inline simgrid::kernel::activity::ActivityImpl*
+static inline simgrid::kernel::activity::ExecImpl*
 simcall_execution_parallel_start__getraw__result(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ActivityImpl*>(simcall->result);
+  return simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ExecImpl*>(simcall->result);
 }
 static inline void
 simcall_execution_parallel_start__set__result(smx_simcall_t simcall,
-                                              boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> result)
+                                              boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl> result)
 {
-  simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->result, result);
+  simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>>(simcall->result, result);
 }
 
 static inline boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
@@ -350,15 +399,17 @@ simcall_execution_set_priority__set__execution(smx_simcall_t simcall,
 {
   simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->args[0], arg);
 }
-static inline double simcall_execution_set_priority__get__priority(smx_simcall_t simcall) {
+static inline double simcall_execution_set_priority__get__priority(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[1]);
 }
 static inline double simcall_execution_set_priority__getraw__priority(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[1]);
 }
-static inline void simcall_execution_set_priority__set__priority(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[1], arg);
+static inline void simcall_execution_set_priority__set__priority(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[1], arg);
 }
 
 static inline boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
@@ -377,15 +428,17 @@ simcall_execution_set_bound__set__execution(smx_simcall_t simcall,
 {
   simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->args[0], arg);
 }
-static inline double simcall_execution_set_bound__get__bound(smx_simcall_t simcall) {
+static inline double simcall_execution_set_bound__get__bound(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[1]);
 }
 static inline double simcall_execution_set_bound__getraw__bound(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[1]);
 }
-static inline void simcall_execution_set_bound__set__bound(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[1], arg);
+static inline void simcall_execution_set_bound__set__bound(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[1], arg);
 }
 
 static inline boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
@@ -403,8 +456,9 @@ simcall_execution_wait__set__execution(smx_simcall_t simcall,
 {
   simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->args[0], arg);
 }
-static inline int simcall_execution_wait__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<int>(simcall->result);
+static inline int simcall_execution_wait__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline int simcall_execution_wait__getraw__result(smx_simcall_t simcall)
 {
@@ -414,70 +468,83 @@ static inline void simcall_execution_wait__set__result(smx_simcall_t simcall, in
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline smx_actor_t simcall_process_on_exit__get__process(smx_simcall_t simcall) {
+static inline smx_actor_t simcall_process_on_exit__get__process(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_actor_t>(simcall->args[0]);
 }
 static inline smx_actor_t simcall_process_on_exit__getraw__process(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_actor_t>(simcall->args[0]);
 }
-static inline void simcall_process_on_exit__set__process(smx_simcall_t simcall, smx_actor_t arg) {
-    simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
+static inline void simcall_process_on_exit__set__process(smx_simcall_t simcall, smx_actor_t arg)
+{
+  simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
 }
-static inline int_f_pvoid_pvoid_t simcall_process_on_exit__get__fun(smx_simcall_t simcall) {
+static inline int_f_pvoid_pvoid_t simcall_process_on_exit__get__fun(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<int_f_pvoid_pvoid_t>(simcall->args[1]);
 }
 static inline int_f_pvoid_pvoid_t simcall_process_on_exit__getraw__fun(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<int_f_pvoid_pvoid_t>(simcall->args[1]);
 }
-static inline void simcall_process_on_exit__set__fun(smx_simcall_t simcall, int_f_pvoid_pvoid_t arg) {
-    simgrid::simix::marshal<int_f_pvoid_pvoid_t>(simcall->args[1], arg);
+static inline void simcall_process_on_exit__set__fun(smx_simcall_t simcall, int_f_pvoid_pvoid_t arg)
+{
+  simgrid::simix::marshal<int_f_pvoid_pvoid_t>(simcall->args[1], arg);
 }
-static inline void* simcall_process_on_exit__get__data(smx_simcall_t simcall) {
+static inline void* simcall_process_on_exit__get__data(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<void*>(simcall->args[2]);
 }
 static inline void* simcall_process_on_exit__getraw__data(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<void*>(simcall->args[2]);
 }
-static inline void simcall_process_on_exit__set__data(smx_simcall_t simcall, void* arg) {
-    simgrid::simix::marshal<void*>(simcall->args[2], arg);
+static inline void simcall_process_on_exit__set__data(smx_simcall_t simcall, void* arg)
+{
+  simgrid::simix::marshal<void*>(simcall->args[2], arg);
 }
 
-static inline smx_actor_t simcall_process_auto_restart_set__get__process(smx_simcall_t simcall) {
+static inline smx_actor_t simcall_process_auto_restart_set__get__process(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_actor_t>(simcall->args[0]);
 }
 static inline smx_actor_t simcall_process_auto_restart_set__getraw__process(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_actor_t>(simcall->args[0]);
 }
-static inline void simcall_process_auto_restart_set__set__process(smx_simcall_t simcall, smx_actor_t arg) {
-    simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
+static inline void simcall_process_auto_restart_set__set__process(smx_simcall_t simcall, smx_actor_t arg)
+{
+  simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
 }
-static inline int simcall_process_auto_restart_set__get__auto_restart(smx_simcall_t simcall) {
+static inline int simcall_process_auto_restart_set__get__auto_restart(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<int>(simcall->args[1]);
 }
 static inline int simcall_process_auto_restart_set__getraw__auto_restart(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<int>(simcall->args[1]);
 }
-static inline void simcall_process_auto_restart_set__set__auto_restart(smx_simcall_t simcall, int arg) {
-    simgrid::simix::marshal<int>(simcall->args[1], arg);
+static inline void simcall_process_auto_restart_set__set__auto_restart(smx_simcall_t simcall, int arg)
+{
+  simgrid::simix::marshal<int>(simcall->args[1], arg);
 }
 
-static inline smx_actor_t simcall_process_restart__get__process(smx_simcall_t simcall) {
+static inline smx_actor_t simcall_process_restart__get__process(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_actor_t>(simcall->args[0]);
 }
 static inline smx_actor_t simcall_process_restart__getraw__process(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_actor_t>(simcall->args[0]);
 }
-static inline void simcall_process_restart__set__process(smx_simcall_t simcall, smx_actor_t arg) {
-    simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
+static inline void simcall_process_restart__set__process(smx_simcall_t simcall, smx_actor_t arg)
+{
+  simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
 }
-static inline smx_actor_t simcall_process_restart__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<smx_actor_t>(simcall->result);
+static inline smx_actor_t simcall_process_restart__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<smx_actor_t>(simcall->result);
 }
 static inline smx_actor_t simcall_process_restart__getraw__result(smx_simcall_t simcall)
 {
@@ -487,65 +554,77 @@ static inline void simcall_process_restart__set__result(smx_simcall_t simcall, s
     simgrid::simix::marshal<smx_actor_t>(simcall->result, result);
 }
 
-static inline smx_mailbox_t simcall_comm_iprobe__get__mbox(smx_simcall_t simcall) {
+static inline smx_mailbox_t simcall_comm_iprobe__get__mbox(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_mailbox_t>(simcall->args[0]);
 }
 static inline smx_mailbox_t simcall_comm_iprobe__getraw__mbox(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_mailbox_t>(simcall->args[0]);
 }
-static inline void simcall_comm_iprobe__set__mbox(smx_simcall_t simcall, smx_mailbox_t arg) {
-    simgrid::simix::marshal<smx_mailbox_t>(simcall->args[0], arg);
+static inline void simcall_comm_iprobe__set__mbox(smx_simcall_t simcall, smx_mailbox_t arg)
+{
+  simgrid::simix::marshal<smx_mailbox_t>(simcall->args[0], arg);
 }
-static inline int simcall_comm_iprobe__get__type(smx_simcall_t simcall) {
+static inline int simcall_comm_iprobe__get__type(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<int>(simcall->args[1]);
 }
 static inline int simcall_comm_iprobe__getraw__type(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<int>(simcall->args[1]);
 }
-static inline void simcall_comm_iprobe__set__type(smx_simcall_t simcall, int arg) {
-    simgrid::simix::marshal<int>(simcall->args[1], arg);
+static inline void simcall_comm_iprobe__set__type(smx_simcall_t simcall, int arg)
+{
+  simgrid::simix::marshal<int>(simcall->args[1], arg);
 }
-static inline int simcall_comm_iprobe__get__src(smx_simcall_t simcall) {
+static inline int simcall_comm_iprobe__get__src(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<int>(simcall->args[2]);
 }
 static inline int simcall_comm_iprobe__getraw__src(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<int>(simcall->args[2]);
 }
-static inline void simcall_comm_iprobe__set__src(smx_simcall_t simcall, int arg) {
-    simgrid::simix::marshal<int>(simcall->args[2], arg);
+static inline void simcall_comm_iprobe__set__src(smx_simcall_t simcall, int arg)
+{
+  simgrid::simix::marshal<int>(simcall->args[2], arg);
 }
-static inline int simcall_comm_iprobe__get__tag(smx_simcall_t simcall) {
+static inline int simcall_comm_iprobe__get__tag(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<int>(simcall->args[3]);
 }
 static inline int simcall_comm_iprobe__getraw__tag(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<int>(simcall->args[3]);
 }
-static inline void simcall_comm_iprobe__set__tag(smx_simcall_t simcall, int arg) {
-    simgrid::simix::marshal<int>(simcall->args[3], arg);
+static inline void simcall_comm_iprobe__set__tag(smx_simcall_t simcall, int arg)
+{
+  simgrid::simix::marshal<int>(simcall->args[3], arg);
 }
-static inline simix_match_func_t simcall_comm_iprobe__get__match_fun(smx_simcall_t simcall) {
+static inline simix_match_func_t simcall_comm_iprobe__get__match_fun(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<simix_match_func_t>(simcall->args[4]);
 }
 static inline simix_match_func_t simcall_comm_iprobe__getraw__match_fun(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<simix_match_func_t>(simcall->args[4]);
 }
-static inline void simcall_comm_iprobe__set__match_fun(smx_simcall_t simcall, simix_match_func_t arg) {
-    simgrid::simix::marshal<simix_match_func_t>(simcall->args[4], arg);
+static inline void simcall_comm_iprobe__set__match_fun(smx_simcall_t simcall, simix_match_func_t arg)
+{
+  simgrid::simix::marshal<simix_match_func_t>(simcall->args[4], arg);
 }
-static inline void* simcall_comm_iprobe__get__data(smx_simcall_t simcall) {
+static inline void* simcall_comm_iprobe__get__data(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<void*>(simcall->args[5]);
 }
 static inline void* simcall_comm_iprobe__getraw__data(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<void*>(simcall->args[5]);
 }
-static inline void simcall_comm_iprobe__set__data(smx_simcall_t simcall, void* arg) {
-    simgrid::simix::marshal<void*>(simcall->args[5], arg);
+static inline void simcall_comm_iprobe__set__data(smx_simcall_t simcall, void* arg)
+{
+  simgrid::simix::marshal<void*>(simcall->args[5], arg);
 }
 static inline boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
 simcall_comm_iprobe__get__result(smx_simcall_t simcall)
@@ -563,216 +642,258 @@ simcall_comm_iprobe__set__result(smx_simcall_t simcall,
   simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->result, result);
 }
 
-static inline smx_actor_t simcall_comm_send__get__sender(smx_simcall_t simcall) {
+static inline smx_actor_t simcall_comm_send__get__sender(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_actor_t>(simcall->args[0]);
 }
 static inline smx_actor_t simcall_comm_send__getraw__sender(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_actor_t>(simcall->args[0]);
 }
-static inline void simcall_comm_send__set__sender(smx_simcall_t simcall, smx_actor_t arg) {
-    simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
+static inline void simcall_comm_send__set__sender(smx_simcall_t simcall, smx_actor_t arg)
+{
+  simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
 }
-static inline smx_mailbox_t simcall_comm_send__get__mbox(smx_simcall_t simcall) {
+static inline smx_mailbox_t simcall_comm_send__get__mbox(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_mailbox_t>(simcall->args[1]);
 }
 static inline smx_mailbox_t simcall_comm_send__getraw__mbox(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_mailbox_t>(simcall->args[1]);
 }
-static inline void simcall_comm_send__set__mbox(smx_simcall_t simcall, smx_mailbox_t arg) {
-    simgrid::simix::marshal<smx_mailbox_t>(simcall->args[1], arg);
+static inline void simcall_comm_send__set__mbox(smx_simcall_t simcall, smx_mailbox_t arg)
+{
+  simgrid::simix::marshal<smx_mailbox_t>(simcall->args[1], arg);
 }
-static inline double simcall_comm_send__get__task_size(smx_simcall_t simcall) {
+static inline double simcall_comm_send__get__task_size(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[2]);
 }
 static inline double simcall_comm_send__getraw__task_size(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[2]);
 }
-static inline void simcall_comm_send__set__task_size(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[2], arg);
+static inline void simcall_comm_send__set__task_size(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[2], arg);
 }
-static inline double simcall_comm_send__get__rate(smx_simcall_t simcall) {
+static inline double simcall_comm_send__get__rate(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[3]);
 }
 static inline double simcall_comm_send__getraw__rate(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[3]);
 }
-static inline void simcall_comm_send__set__rate(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[3], arg);
+static inline void simcall_comm_send__set__rate(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[3], arg);
 }
-static inline void* simcall_comm_send__get__src_buff(smx_simcall_t simcall) {
+static inline void* simcall_comm_send__get__src_buff(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<void*>(simcall->args[4]);
 }
 static inline void* simcall_comm_send__getraw__src_buff(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<void*>(simcall->args[4]);
 }
-static inline void simcall_comm_send__set__src_buff(smx_simcall_t simcall, void* arg) {
-    simgrid::simix::marshal<void*>(simcall->args[4], arg);
+static inline void simcall_comm_send__set__src_buff(smx_simcall_t simcall, void* arg)
+{
+  simgrid::simix::marshal<void*>(simcall->args[4], arg);
 }
-static inline size_t simcall_comm_send__get__src_buff_size(smx_simcall_t simcall) {
+static inline size_t simcall_comm_send__get__src_buff_size(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<size_t>(simcall->args[5]);
 }
 static inline size_t simcall_comm_send__getraw__src_buff_size(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<size_t>(simcall->args[5]);
 }
-static inline void simcall_comm_send__set__src_buff_size(smx_simcall_t simcall, size_t arg) {
-    simgrid::simix::marshal<size_t>(simcall->args[5], arg);
+static inline void simcall_comm_send__set__src_buff_size(smx_simcall_t simcall, size_t arg)
+{
+  simgrid::simix::marshal<size_t>(simcall->args[5], arg);
 }
-static inline simix_match_func_t simcall_comm_send__get__match_fun(smx_simcall_t simcall) {
+static inline simix_match_func_t simcall_comm_send__get__match_fun(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<simix_match_func_t>(simcall->args[6]);
 }
 static inline simix_match_func_t simcall_comm_send__getraw__match_fun(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<simix_match_func_t>(simcall->args[6]);
 }
-static inline void simcall_comm_send__set__match_fun(smx_simcall_t simcall, simix_match_func_t arg) {
-    simgrid::simix::marshal<simix_match_func_t>(simcall->args[6], arg);
+static inline void simcall_comm_send__set__match_fun(smx_simcall_t simcall, simix_match_func_t arg)
+{
+  simgrid::simix::marshal<simix_match_func_t>(simcall->args[6], arg);
 }
-static inline simix_copy_data_func_t simcall_comm_send__get__copy_data_fun(smx_simcall_t simcall) {
+static inline simix_copy_data_func_t simcall_comm_send__get__copy_data_fun(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<simix_copy_data_func_t>(simcall->args[7]);
 }
 static inline simix_copy_data_func_t simcall_comm_send__getraw__copy_data_fun(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<simix_copy_data_func_t>(simcall->args[7]);
 }
-static inline void simcall_comm_send__set__copy_data_fun(smx_simcall_t simcall, simix_copy_data_func_t arg) {
-    simgrid::simix::marshal<simix_copy_data_func_t>(simcall->args[7], arg);
+static inline void simcall_comm_send__set__copy_data_fun(smx_simcall_t simcall, simix_copy_data_func_t arg)
+{
+  simgrid::simix::marshal<simix_copy_data_func_t>(simcall->args[7], arg);
 }
-static inline void* simcall_comm_send__get__data(smx_simcall_t simcall) {
+static inline void* simcall_comm_send__get__data(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<void*>(simcall->args[8]);
 }
 static inline void* simcall_comm_send__getraw__data(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<void*>(simcall->args[8]);
 }
-static inline void simcall_comm_send__set__data(smx_simcall_t simcall, void* arg) {
-    simgrid::simix::marshal<void*>(simcall->args[8], arg);
+static inline void simcall_comm_send__set__data(smx_simcall_t simcall, void* arg)
+{
+  simgrid::simix::marshal<void*>(simcall->args[8], arg);
 }
-static inline double simcall_comm_send__get__timeout(smx_simcall_t simcall) {
+static inline double simcall_comm_send__get__timeout(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[9]);
 }
 static inline double simcall_comm_send__getraw__timeout(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[9]);
 }
-static inline void simcall_comm_send__set__timeout(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[9], arg);
+static inline void simcall_comm_send__set__timeout(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[9], arg);
 }
 
-static inline smx_actor_t simcall_comm_isend__get__sender(smx_simcall_t simcall) {
+static inline smx_actor_t simcall_comm_isend__get__sender(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_actor_t>(simcall->args[0]);
 }
 static inline smx_actor_t simcall_comm_isend__getraw__sender(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_actor_t>(simcall->args[0]);
 }
-static inline void simcall_comm_isend__set__sender(smx_simcall_t simcall, smx_actor_t arg) {
-    simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
+static inline void simcall_comm_isend__set__sender(smx_simcall_t simcall, smx_actor_t arg)
+{
+  simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
 }
-static inline smx_mailbox_t simcall_comm_isend__get__mbox(smx_simcall_t simcall) {
+static inline smx_mailbox_t simcall_comm_isend__get__mbox(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_mailbox_t>(simcall->args[1]);
 }
 static inline smx_mailbox_t simcall_comm_isend__getraw__mbox(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_mailbox_t>(simcall->args[1]);
 }
-static inline void simcall_comm_isend__set__mbox(smx_simcall_t simcall, smx_mailbox_t arg) {
-    simgrid::simix::marshal<smx_mailbox_t>(simcall->args[1], arg);
+static inline void simcall_comm_isend__set__mbox(smx_simcall_t simcall, smx_mailbox_t arg)
+{
+  simgrid::simix::marshal<smx_mailbox_t>(simcall->args[1], arg);
 }
-static inline double simcall_comm_isend__get__task_size(smx_simcall_t simcall) {
+static inline double simcall_comm_isend__get__task_size(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[2]);
 }
 static inline double simcall_comm_isend__getraw__task_size(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[2]);
 }
-static inline void simcall_comm_isend__set__task_size(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[2], arg);
+static inline void simcall_comm_isend__set__task_size(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[2], arg);
 }
-static inline double simcall_comm_isend__get__rate(smx_simcall_t simcall) {
+static inline double simcall_comm_isend__get__rate(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[3]);
 }
 static inline double simcall_comm_isend__getraw__rate(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[3]);
 }
-static inline void simcall_comm_isend__set__rate(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[3], arg);
+static inline void simcall_comm_isend__set__rate(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[3], arg);
 }
-static inline void* simcall_comm_isend__get__src_buff(smx_simcall_t simcall) {
+static inline void* simcall_comm_isend__get__src_buff(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<void*>(simcall->args[4]);
 }
 static inline void* simcall_comm_isend__getraw__src_buff(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<void*>(simcall->args[4]);
 }
-static inline void simcall_comm_isend__set__src_buff(smx_simcall_t simcall, void* arg) {
-    simgrid::simix::marshal<void*>(simcall->args[4], arg);
+static inline void simcall_comm_isend__set__src_buff(smx_simcall_t simcall, void* arg)
+{
+  simgrid::simix::marshal<void*>(simcall->args[4], arg);
 }
-static inline size_t simcall_comm_isend__get__src_buff_size(smx_simcall_t simcall) {
+static inline size_t simcall_comm_isend__get__src_buff_size(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<size_t>(simcall->args[5]);
 }
 static inline size_t simcall_comm_isend__getraw__src_buff_size(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<size_t>(simcall->args[5]);
 }
-static inline void simcall_comm_isend__set__src_buff_size(smx_simcall_t simcall, size_t arg) {
-    simgrid::simix::marshal<size_t>(simcall->args[5], arg);
+static inline void simcall_comm_isend__set__src_buff_size(smx_simcall_t simcall, size_t arg)
+{
+  simgrid::simix::marshal<size_t>(simcall->args[5], arg);
 }
-static inline simix_match_func_t simcall_comm_isend__get__match_fun(smx_simcall_t simcall) {
+static inline simix_match_func_t simcall_comm_isend__get__match_fun(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<simix_match_func_t>(simcall->args[6]);
 }
 static inline simix_match_func_t simcall_comm_isend__getraw__match_fun(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<simix_match_func_t>(simcall->args[6]);
 }
-static inline void simcall_comm_isend__set__match_fun(smx_simcall_t simcall, simix_match_func_t arg) {
-    simgrid::simix::marshal<simix_match_func_t>(simcall->args[6], arg);
+static inline void simcall_comm_isend__set__match_fun(smx_simcall_t simcall, simix_match_func_t arg)
+{
+  simgrid::simix::marshal<simix_match_func_t>(simcall->args[6], arg);
 }
-static inline simix_clean_func_t simcall_comm_isend__get__clean_fun(smx_simcall_t simcall) {
+static inline simix_clean_func_t simcall_comm_isend__get__clean_fun(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<simix_clean_func_t>(simcall->args[7]);
 }
 static inline simix_clean_func_t simcall_comm_isend__getraw__clean_fun(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<simix_clean_func_t>(simcall->args[7]);
 }
-static inline void simcall_comm_isend__set__clean_fun(smx_simcall_t simcall, simix_clean_func_t arg) {
-    simgrid::simix::marshal<simix_clean_func_t>(simcall->args[7], arg);
+static inline void simcall_comm_isend__set__clean_fun(smx_simcall_t simcall, simix_clean_func_t arg)
+{
+  simgrid::simix::marshal<simix_clean_func_t>(simcall->args[7], arg);
 }
-static inline simix_copy_data_func_t simcall_comm_isend__get__copy_data_fun(smx_simcall_t simcall) {
+static inline simix_copy_data_func_t simcall_comm_isend__get__copy_data_fun(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<simix_copy_data_func_t>(simcall->args[8]);
 }
 static inline simix_copy_data_func_t simcall_comm_isend__getraw__copy_data_fun(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<simix_copy_data_func_t>(simcall->args[8]);
 }
-static inline void simcall_comm_isend__set__copy_data_fun(smx_simcall_t simcall, simix_copy_data_func_t arg) {
-    simgrid::simix::marshal<simix_copy_data_func_t>(simcall->args[8], arg);
+static inline void simcall_comm_isend__set__copy_data_fun(smx_simcall_t simcall, simix_copy_data_func_t arg)
+{
+  simgrid::simix::marshal<simix_copy_data_func_t>(simcall->args[8], arg);
 }
-static inline void* simcall_comm_isend__get__data(smx_simcall_t simcall) {
+static inline void* simcall_comm_isend__get__data(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<void*>(simcall->args[9]);
 }
 static inline void* simcall_comm_isend__getraw__data(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<void*>(simcall->args[9]);
 }
-static inline void simcall_comm_isend__set__data(smx_simcall_t simcall, void* arg) {
-    simgrid::simix::marshal<void*>(simcall->args[9], arg);
+static inline void simcall_comm_isend__set__data(smx_simcall_t simcall, void* arg)
+{
+  simgrid::simix::marshal<void*>(simcall->args[9], arg);
 }
-static inline int simcall_comm_isend__get__detached(smx_simcall_t simcall) {
+static inline int simcall_comm_isend__get__detached(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<int>(simcall->args[10]);
 }
 static inline int simcall_comm_isend__getraw__detached(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<int>(simcall->args[10]);
 }
-static inline void simcall_comm_isend__set__detached(smx_simcall_t simcall, int arg) {
-    simgrid::simix::marshal<int>(simcall->args[10], arg);
+static inline void simcall_comm_isend__set__detached(smx_simcall_t simcall, int arg)
+{
+  simgrid::simix::marshal<int>(simcall->args[10], arg);
 }
 static inline boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
 simcall_comm_isend__get__result(smx_simcall_t simcall)
@@ -789,176 +910,210 @@ static inline void simcall_comm_isend__set__result(smx_simcall_t simcall,
   simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->result, result);
 }
 
-static inline smx_actor_t simcall_comm_recv__get__receiver(smx_simcall_t simcall) {
+static inline smx_actor_t simcall_comm_recv__get__receiver(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_actor_t>(simcall->args[0]);
 }
 static inline smx_actor_t simcall_comm_recv__getraw__receiver(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_actor_t>(simcall->args[0]);
 }
-static inline void simcall_comm_recv__set__receiver(smx_simcall_t simcall, smx_actor_t arg) {
-    simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
+static inline void simcall_comm_recv__set__receiver(smx_simcall_t simcall, smx_actor_t arg)
+{
+  simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
 }
-static inline smx_mailbox_t simcall_comm_recv__get__mbox(smx_simcall_t simcall) {
+static inline smx_mailbox_t simcall_comm_recv__get__mbox(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_mailbox_t>(simcall->args[1]);
 }
 static inline smx_mailbox_t simcall_comm_recv__getraw__mbox(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_mailbox_t>(simcall->args[1]);
 }
-static inline void simcall_comm_recv__set__mbox(smx_simcall_t simcall, smx_mailbox_t arg) {
-    simgrid::simix::marshal<smx_mailbox_t>(simcall->args[1], arg);
+static inline void simcall_comm_recv__set__mbox(smx_simcall_t simcall, smx_mailbox_t arg)
+{
+  simgrid::simix::marshal<smx_mailbox_t>(simcall->args[1], arg);
 }
-static inline void* simcall_comm_recv__get__dst_buff(smx_simcall_t simcall) {
+static inline void* simcall_comm_recv__get__dst_buff(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<void*>(simcall->args[2]);
 }
 static inline void* simcall_comm_recv__getraw__dst_buff(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<void*>(simcall->args[2]);
 }
-static inline void simcall_comm_recv__set__dst_buff(smx_simcall_t simcall, void* arg) {
-    simgrid::simix::marshal<void*>(simcall->args[2], arg);
+static inline void simcall_comm_recv__set__dst_buff(smx_simcall_t simcall, void* arg)
+{
+  simgrid::simix::marshal<void*>(simcall->args[2], arg);
 }
-static inline size_t* simcall_comm_recv__get__dst_buff_size(smx_simcall_t simcall) {
+static inline size_t* simcall_comm_recv__get__dst_buff_size(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<size_t*>(simcall->args[3]);
 }
 static inline size_t* simcall_comm_recv__getraw__dst_buff_size(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<size_t*>(simcall->args[3]);
 }
-static inline void simcall_comm_recv__set__dst_buff_size(smx_simcall_t simcall, size_t* arg) {
-    simgrid::simix::marshal<size_t*>(simcall->args[3], arg);
+static inline void simcall_comm_recv__set__dst_buff_size(smx_simcall_t simcall, size_t* arg)
+{
+  simgrid::simix::marshal<size_t*>(simcall->args[3], arg);
 }
-static inline simix_match_func_t simcall_comm_recv__get__match_fun(smx_simcall_t simcall) {
+static inline simix_match_func_t simcall_comm_recv__get__match_fun(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<simix_match_func_t>(simcall->args[4]);
 }
 static inline simix_match_func_t simcall_comm_recv__getraw__match_fun(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<simix_match_func_t>(simcall->args[4]);
 }
-static inline void simcall_comm_recv__set__match_fun(smx_simcall_t simcall, simix_match_func_t arg) {
-    simgrid::simix::marshal<simix_match_func_t>(simcall->args[4], arg);
+static inline void simcall_comm_recv__set__match_fun(smx_simcall_t simcall, simix_match_func_t arg)
+{
+  simgrid::simix::marshal<simix_match_func_t>(simcall->args[4], arg);
 }
-static inline simix_copy_data_func_t simcall_comm_recv__get__copy_data_fun(smx_simcall_t simcall) {
+static inline simix_copy_data_func_t simcall_comm_recv__get__copy_data_fun(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<simix_copy_data_func_t>(simcall->args[5]);
 }
 static inline simix_copy_data_func_t simcall_comm_recv__getraw__copy_data_fun(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<simix_copy_data_func_t>(simcall->args[5]);
 }
-static inline void simcall_comm_recv__set__copy_data_fun(smx_simcall_t simcall, simix_copy_data_func_t arg) {
-    simgrid::simix::marshal<simix_copy_data_func_t>(simcall->args[5], arg);
+static inline void simcall_comm_recv__set__copy_data_fun(smx_simcall_t simcall, simix_copy_data_func_t arg)
+{
+  simgrid::simix::marshal<simix_copy_data_func_t>(simcall->args[5], arg);
 }
-static inline void* simcall_comm_recv__get__data(smx_simcall_t simcall) {
+static inline void* simcall_comm_recv__get__data(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<void*>(simcall->args[6]);
 }
 static inline void* simcall_comm_recv__getraw__data(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<void*>(simcall->args[6]);
 }
-static inline void simcall_comm_recv__set__data(smx_simcall_t simcall, void* arg) {
-    simgrid::simix::marshal<void*>(simcall->args[6], arg);
+static inline void simcall_comm_recv__set__data(smx_simcall_t simcall, void* arg)
+{
+  simgrid::simix::marshal<void*>(simcall->args[6], arg);
 }
-static inline double simcall_comm_recv__get__timeout(smx_simcall_t simcall) {
+static inline double simcall_comm_recv__get__timeout(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[7]);
 }
 static inline double simcall_comm_recv__getraw__timeout(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[7]);
 }
-static inline void simcall_comm_recv__set__timeout(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[7], arg);
+static inline void simcall_comm_recv__set__timeout(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[7], arg);
 }
-static inline double simcall_comm_recv__get__rate(smx_simcall_t simcall) {
+static inline double simcall_comm_recv__get__rate(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[8]);
 }
 static inline double simcall_comm_recv__getraw__rate(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[8]);
 }
-static inline void simcall_comm_recv__set__rate(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[8], arg);
+static inline void simcall_comm_recv__set__rate(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[8], arg);
 }
 
-static inline smx_actor_t simcall_comm_irecv__get__receiver(smx_simcall_t simcall) {
+static inline smx_actor_t simcall_comm_irecv__get__receiver(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_actor_t>(simcall->args[0]);
 }
 static inline smx_actor_t simcall_comm_irecv__getraw__receiver(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_actor_t>(simcall->args[0]);
 }
-static inline void simcall_comm_irecv__set__receiver(smx_simcall_t simcall, smx_actor_t arg) {
-    simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
+static inline void simcall_comm_irecv__set__receiver(smx_simcall_t simcall, smx_actor_t arg)
+{
+  simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
 }
-static inline smx_mailbox_t simcall_comm_irecv__get__mbox(smx_simcall_t simcall) {
+static inline smx_mailbox_t simcall_comm_irecv__get__mbox(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_mailbox_t>(simcall->args[1]);
 }
 static inline smx_mailbox_t simcall_comm_irecv__getraw__mbox(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_mailbox_t>(simcall->args[1]);
 }
-static inline void simcall_comm_irecv__set__mbox(smx_simcall_t simcall, smx_mailbox_t arg) {
-    simgrid::simix::marshal<smx_mailbox_t>(simcall->args[1], arg);
+static inline void simcall_comm_irecv__set__mbox(smx_simcall_t simcall, smx_mailbox_t arg)
+{
+  simgrid::simix::marshal<smx_mailbox_t>(simcall->args[1], arg);
 }
-static inline void* simcall_comm_irecv__get__dst_buff(smx_simcall_t simcall) {
+static inline void* simcall_comm_irecv__get__dst_buff(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<void*>(simcall->args[2]);
 }
 static inline void* simcall_comm_irecv__getraw__dst_buff(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<void*>(simcall->args[2]);
 }
-static inline void simcall_comm_irecv__set__dst_buff(smx_simcall_t simcall, void* arg) {
-    simgrid::simix::marshal<void*>(simcall->args[2], arg);
+static inline void simcall_comm_irecv__set__dst_buff(smx_simcall_t simcall, void* arg)
+{
+  simgrid::simix::marshal<void*>(simcall->args[2], arg);
 }
-static inline size_t* simcall_comm_irecv__get__dst_buff_size(smx_simcall_t simcall) {
+static inline size_t* simcall_comm_irecv__get__dst_buff_size(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<size_t*>(simcall->args[3]);
 }
 static inline size_t* simcall_comm_irecv__getraw__dst_buff_size(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<size_t*>(simcall->args[3]);
 }
-static inline void simcall_comm_irecv__set__dst_buff_size(smx_simcall_t simcall, size_t* arg) {
-    simgrid::simix::marshal<size_t*>(simcall->args[3], arg);
+static inline void simcall_comm_irecv__set__dst_buff_size(smx_simcall_t simcall, size_t* arg)
+{
+  simgrid::simix::marshal<size_t*>(simcall->args[3], arg);
 }
-static inline simix_match_func_t simcall_comm_irecv__get__match_fun(smx_simcall_t simcall) {
+static inline simix_match_func_t simcall_comm_irecv__get__match_fun(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<simix_match_func_t>(simcall->args[4]);
 }
 static inline simix_match_func_t simcall_comm_irecv__getraw__match_fun(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<simix_match_func_t>(simcall->args[4]);
 }
-static inline void simcall_comm_irecv__set__match_fun(smx_simcall_t simcall, simix_match_func_t arg) {
-    simgrid::simix::marshal<simix_match_func_t>(simcall->args[4], arg);
+static inline void simcall_comm_irecv__set__match_fun(smx_simcall_t simcall, simix_match_func_t arg)
+{
+  simgrid::simix::marshal<simix_match_func_t>(simcall->args[4], arg);
 }
-static inline simix_copy_data_func_t simcall_comm_irecv__get__copy_data_fun(smx_simcall_t simcall) {
+static inline simix_copy_data_func_t simcall_comm_irecv__get__copy_data_fun(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<simix_copy_data_func_t>(simcall->args[5]);
 }
 static inline simix_copy_data_func_t simcall_comm_irecv__getraw__copy_data_fun(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<simix_copy_data_func_t>(simcall->args[5]);
 }
-static inline void simcall_comm_irecv__set__copy_data_fun(smx_simcall_t simcall, simix_copy_data_func_t arg) {
-    simgrid::simix::marshal<simix_copy_data_func_t>(simcall->args[5], arg);
+static inline void simcall_comm_irecv__set__copy_data_fun(smx_simcall_t simcall, simix_copy_data_func_t arg)
+{
+  simgrid::simix::marshal<simix_copy_data_func_t>(simcall->args[5], arg);
 }
-static inline void* simcall_comm_irecv__get__data(smx_simcall_t simcall) {
+static inline void* simcall_comm_irecv__get__data(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<void*>(simcall->args[6]);
 }
 static inline void* simcall_comm_irecv__getraw__data(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<void*>(simcall->args[6]);
 }
-static inline void simcall_comm_irecv__set__data(smx_simcall_t simcall, void* arg) {
-    simgrid::simix::marshal<void*>(simcall->args[6], arg);
+static inline void simcall_comm_irecv__set__data(smx_simcall_t simcall, void* arg)
+{
+  simgrid::simix::marshal<void*>(simcall->args[6], arg);
 }
-static inline double simcall_comm_irecv__get__rate(smx_simcall_t simcall) {
+static inline double simcall_comm_irecv__get__rate(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[7]);
 }
 static inline double simcall_comm_irecv__getraw__rate(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[7]);
 }
-static inline void simcall_comm_irecv__set__rate(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[7], arg);
+static inline void simcall_comm_irecv__set__rate(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[7], arg);
 }
 static inline boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
 simcall_comm_irecv__get__result(smx_simcall_t simcall)
@@ -975,28 +1130,33 @@ static inline void simcall_comm_irecv__set__result(smx_simcall_t simcall,
   simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->result, result);
 }
 
-static inline xbt_dynar_t simcall_comm_waitany__get__comms(smx_simcall_t simcall) {
+static inline xbt_dynar_t simcall_comm_waitany__get__comms(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<xbt_dynar_t>(simcall->args[0]);
 }
 static inline xbt_dynar_t simcall_comm_waitany__getraw__comms(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<xbt_dynar_t>(simcall->args[0]);
 }
-static inline void simcall_comm_waitany__set__comms(smx_simcall_t simcall, xbt_dynar_t arg) {
-    simgrid::simix::marshal<xbt_dynar_t>(simcall->args[0], arg);
+static inline void simcall_comm_waitany__set__comms(smx_simcall_t simcall, xbt_dynar_t arg)
+{
+  simgrid::simix::marshal<xbt_dynar_t>(simcall->args[0], arg);
 }
-static inline double simcall_comm_waitany__get__timeout(smx_simcall_t simcall) {
+static inline double simcall_comm_waitany__get__timeout(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[1]);
 }
 static inline double simcall_comm_waitany__getraw__timeout(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[1]);
 }
-static inline void simcall_comm_waitany__set__timeout(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[1], arg);
+static inline void simcall_comm_waitany__set__timeout(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[1], arg);
 }
-static inline int simcall_comm_waitany__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<int>(simcall->result);
+static inline int simcall_comm_waitany__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline int simcall_comm_waitany__getraw__result(smx_simcall_t simcall)
 {
@@ -1020,15 +1180,17 @@ static inline void simcall_comm_wait__set__comm(smx_simcall_t simcall,
 {
   simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->args[0], arg);
 }
-static inline double simcall_comm_wait__get__timeout(smx_simcall_t simcall) {
+static inline double simcall_comm_wait__get__timeout(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[1]);
 }
 static inline double simcall_comm_wait__getraw__timeout(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[1]);
 }
-static inline void simcall_comm_wait__set__timeout(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[1], arg);
+static inline void simcall_comm_wait__set__timeout(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[1], arg);
 }
 
 static inline boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
@@ -1045,8 +1207,9 @@ static inline void simcall_comm_test__set__comm(smx_simcall_t simcall,
 {
   simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->args[0], arg);
 }
-static inline int simcall_comm_test__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<int>(simcall->result);
+static inline int simcall_comm_test__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline int simcall_comm_test__getraw__result(smx_simcall_t simcall)
 {
@@ -1070,18 +1233,21 @@ static inline void simcall_comm_testany__set__comms(smx_simcall_t simcall,
 {
   simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>*>(simcall->args[0], arg);
 }
-static inline size_t simcall_comm_testany__get__count(smx_simcall_t simcall) {
+static inline size_t simcall_comm_testany__get__count(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<size_t>(simcall->args[1]);
 }
 static inline size_t simcall_comm_testany__getraw__count(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<size_t>(simcall->args[1]);
 }
-static inline void simcall_comm_testany__set__count(smx_simcall_t simcall, size_t arg) {
-    simgrid::simix::marshal<size_t>(simcall->args[1], arg);
+static inline void simcall_comm_testany__set__count(smx_simcall_t simcall, size_t arg)
+{
+  simgrid::simix::marshal<size_t>(simcall->args[1], arg);
 }
-static inline int simcall_comm_testany__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<int>(simcall->result);
+static inline int simcall_comm_testany__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline int simcall_comm_testany__getraw__result(smx_simcall_t simcall)
 {
@@ -1091,8 +1257,9 @@ static inline void simcall_comm_testany__set__result(smx_simcall_t simcall, int
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline smx_mutex_t simcall_mutex_init__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<smx_mutex_t>(simcall->result);
+static inline smx_mutex_t simcall_mutex_init__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<smx_mutex_t>(simcall->result);
 }
 static inline smx_mutex_t simcall_mutex_init__getraw__result(smx_simcall_t simcall)
 {
@@ -1102,29 +1269,34 @@ static inline void simcall_mutex_init__set__result(smx_simcall_t simcall, smx_mu
     simgrid::simix::marshal<smx_mutex_t>(simcall->result, result);
 }
 
-static inline smx_mutex_t simcall_mutex_lock__get__mutex(smx_simcall_t simcall) {
+static inline smx_mutex_t simcall_mutex_lock__get__mutex(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_mutex_t>(simcall->args[0]);
 }
 static inline smx_mutex_t simcall_mutex_lock__getraw__mutex(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_mutex_t>(simcall->args[0]);
 }
-static inline void simcall_mutex_lock__set__mutex(smx_simcall_t simcall, smx_mutex_t arg) {
-    simgrid::simix::marshal<smx_mutex_t>(simcall->args[0], arg);
+static inline void simcall_mutex_lock__set__mutex(smx_simcall_t simcall, smx_mutex_t arg)
+{
+  simgrid::simix::marshal<smx_mutex_t>(simcall->args[0], arg);
 }
 
-static inline smx_mutex_t simcall_mutex_trylock__get__mutex(smx_simcall_t simcall) {
+static inline smx_mutex_t simcall_mutex_trylock__get__mutex(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_mutex_t>(simcall->args[0]);
 }
 static inline smx_mutex_t simcall_mutex_trylock__getraw__mutex(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_mutex_t>(simcall->args[0]);
 }
-static inline void simcall_mutex_trylock__set__mutex(smx_simcall_t simcall, smx_mutex_t arg) {
-    simgrid::simix::marshal<smx_mutex_t>(simcall->args[0], arg);
+static inline void simcall_mutex_trylock__set__mutex(smx_simcall_t simcall, smx_mutex_t arg)
+{
+  simgrid::simix::marshal<smx_mutex_t>(simcall->args[0], arg);
 }
-static inline int simcall_mutex_trylock__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<int>(simcall->result);
+static inline int simcall_mutex_trylock__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline int simcall_mutex_trylock__getraw__result(smx_simcall_t simcall)
 {
@@ -1134,19 +1306,22 @@ static inline void simcall_mutex_trylock__set__result(smx_simcall_t simcall, int
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline smx_mutex_t simcall_mutex_unlock__get__mutex(smx_simcall_t simcall) {
+static inline smx_mutex_t simcall_mutex_unlock__get__mutex(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_mutex_t>(simcall->args[0]);
 }
 static inline smx_mutex_t simcall_mutex_unlock__getraw__mutex(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_mutex_t>(simcall->args[0]);
 }
-static inline void simcall_mutex_unlock__set__mutex(smx_simcall_t simcall, smx_mutex_t arg) {
-    simgrid::simix::marshal<smx_mutex_t>(simcall->args[0], arg);
+static inline void simcall_mutex_unlock__set__mutex(smx_simcall_t simcall, smx_mutex_t arg)
+{
+  simgrid::simix::marshal<smx_mutex_t>(simcall->args[0], arg);
 }
 
-static inline smx_cond_t simcall_cond_init__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<smx_cond_t>(simcall->result);
+static inline smx_cond_t simcall_cond_init__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<smx_cond_t>(simcall->result);
 }
 static inline smx_cond_t simcall_cond_init__getraw__result(smx_simcall_t simcall)
 {
@@ -1156,92 +1331,109 @@ static inline void simcall_cond_init__set__result(smx_simcall_t simcall, smx_con
     simgrid::simix::marshal<smx_cond_t>(simcall->result, result);
 }
 
-static inline smx_cond_t simcall_cond_signal__get__cond(smx_simcall_t simcall) {
+static inline smx_cond_t simcall_cond_signal__get__cond(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_cond_t>(simcall->args[0]);
 }
 static inline smx_cond_t simcall_cond_signal__getraw__cond(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_cond_t>(simcall->args[0]);
 }
-static inline void simcall_cond_signal__set__cond(smx_simcall_t simcall, smx_cond_t arg) {
-    simgrid::simix::marshal<smx_cond_t>(simcall->args[0], arg);
+static inline void simcall_cond_signal__set__cond(smx_simcall_t simcall, smx_cond_t arg)
+{
+  simgrid::simix::marshal<smx_cond_t>(simcall->args[0], arg);
 }
 
-static inline smx_cond_t simcall_cond_wait__get__cond(smx_simcall_t simcall) {
+static inline smx_cond_t simcall_cond_wait__get__cond(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_cond_t>(simcall->args[0]);
 }
 static inline smx_cond_t simcall_cond_wait__getraw__cond(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_cond_t>(simcall->args[0]);
 }
-static inline void simcall_cond_wait__set__cond(smx_simcall_t simcall, smx_cond_t arg) {
-    simgrid::simix::marshal<smx_cond_t>(simcall->args[0], arg);
+static inline void simcall_cond_wait__set__cond(smx_simcall_t simcall, smx_cond_t arg)
+{
+  simgrid::simix::marshal<smx_cond_t>(simcall->args[0], arg);
 }
-static inline smx_mutex_t simcall_cond_wait__get__mutex(smx_simcall_t simcall) {
+static inline smx_mutex_t simcall_cond_wait__get__mutex(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_mutex_t>(simcall->args[1]);
 }
 static inline smx_mutex_t simcall_cond_wait__getraw__mutex(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_mutex_t>(simcall->args[1]);
 }
-static inline void simcall_cond_wait__set__mutex(smx_simcall_t simcall, smx_mutex_t arg) {
-    simgrid::simix::marshal<smx_mutex_t>(simcall->args[1], arg);
+static inline void simcall_cond_wait__set__mutex(smx_simcall_t simcall, smx_mutex_t arg)
+{
+  simgrid::simix::marshal<smx_mutex_t>(simcall->args[1], arg);
 }
 
-static inline smx_cond_t simcall_cond_wait_timeout__get__cond(smx_simcall_t simcall) {
+static inline smx_cond_t simcall_cond_wait_timeout__get__cond(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_cond_t>(simcall->args[0]);
 }
 static inline smx_cond_t simcall_cond_wait_timeout__getraw__cond(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_cond_t>(simcall->args[0]);
 }
-static inline void simcall_cond_wait_timeout__set__cond(smx_simcall_t simcall, smx_cond_t arg) {
-    simgrid::simix::marshal<smx_cond_t>(simcall->args[0], arg);
+static inline void simcall_cond_wait_timeout__set__cond(smx_simcall_t simcall, smx_cond_t arg)
+{
+  simgrid::simix::marshal<smx_cond_t>(simcall->args[0], arg);
 }
-static inline smx_mutex_t simcall_cond_wait_timeout__get__mutex(smx_simcall_t simcall) {
+static inline smx_mutex_t simcall_cond_wait_timeout__get__mutex(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_mutex_t>(simcall->args[1]);
 }
 static inline smx_mutex_t simcall_cond_wait_timeout__getraw__mutex(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_mutex_t>(simcall->args[1]);
 }
-static inline void simcall_cond_wait_timeout__set__mutex(smx_simcall_t simcall, smx_mutex_t arg) {
-    simgrid::simix::marshal<smx_mutex_t>(simcall->args[1], arg);
+static inline void simcall_cond_wait_timeout__set__mutex(smx_simcall_t simcall, smx_mutex_t arg)
+{
+  simgrid::simix::marshal<smx_mutex_t>(simcall->args[1], arg);
 }
-static inline double simcall_cond_wait_timeout__get__timeout(smx_simcall_t simcall) {
+static inline double simcall_cond_wait_timeout__get__timeout(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[2]);
 }
 static inline double simcall_cond_wait_timeout__getraw__timeout(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[2]);
 }
-static inline void simcall_cond_wait_timeout__set__timeout(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[2], arg);
+static inline void simcall_cond_wait_timeout__set__timeout(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[2], arg);
 }
 
-static inline smx_cond_t simcall_cond_broadcast__get__cond(smx_simcall_t simcall) {
+static inline smx_cond_t simcall_cond_broadcast__get__cond(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_cond_t>(simcall->args[0]);
 }
 static inline smx_cond_t simcall_cond_broadcast__getraw__cond(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_cond_t>(simcall->args[0]);
 }
-static inline void simcall_cond_broadcast__set__cond(smx_simcall_t simcall, smx_cond_t arg) {
-    simgrid::simix::marshal<smx_cond_t>(simcall->args[0], arg);
+static inline void simcall_cond_broadcast__set__cond(smx_simcall_t simcall, smx_cond_t arg)
+{
+  simgrid::simix::marshal<smx_cond_t>(simcall->args[0], arg);
 }
 
-static inline unsigned int simcall_sem_init__get__capacity(smx_simcall_t simcall) {
+static inline unsigned int simcall_sem_init__get__capacity(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<unsigned int>(simcall->args[0]);
 }
 static inline unsigned int simcall_sem_init__getraw__capacity(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<unsigned int>(simcall->args[0]);
 }
-static inline void simcall_sem_init__set__capacity(smx_simcall_t simcall, unsigned int arg) {
-    simgrid::simix::marshal<unsigned int>(simcall->args[0], arg);
+static inline void simcall_sem_init__set__capacity(smx_simcall_t simcall, unsigned int arg)
+{
+  simgrid::simix::marshal<unsigned int>(simcall->args[0], arg);
 }
-static inline smx_sem_t simcall_sem_init__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<smx_sem_t>(simcall->result);
+static inline smx_sem_t simcall_sem_init__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<smx_sem_t>(simcall->result);
 }
 static inline smx_sem_t simcall_sem_init__getraw__result(smx_simcall_t simcall)
 {
@@ -1251,29 +1443,34 @@ static inline void simcall_sem_init__set__result(smx_simcall_t simcall, smx_sem_
     simgrid::simix::marshal<smx_sem_t>(simcall->result, result);
 }
 
-static inline smx_sem_t simcall_sem_release__get__sem(smx_simcall_t simcall) {
+static inline smx_sem_t simcall_sem_release__get__sem(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_sem_t>(simcall->args[0]);
 }
 static inline smx_sem_t simcall_sem_release__getraw__sem(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_sem_t>(simcall->args[0]);
 }
-static inline void simcall_sem_release__set__sem(smx_simcall_t simcall, smx_sem_t arg) {
-    simgrid::simix::marshal<smx_sem_t>(simcall->args[0], arg);
+static inline void simcall_sem_release__set__sem(smx_simcall_t simcall, smx_sem_t arg)
+{
+  simgrid::simix::marshal<smx_sem_t>(simcall->args[0], arg);
 }
 
-static inline smx_sem_t simcall_sem_would_block__get__sem(smx_simcall_t simcall) {
+static inline smx_sem_t simcall_sem_would_block__get__sem(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_sem_t>(simcall->args[0]);
 }
 static inline smx_sem_t simcall_sem_would_block__getraw__sem(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_sem_t>(simcall->args[0]);
 }
-static inline void simcall_sem_would_block__set__sem(smx_simcall_t simcall, smx_sem_t arg) {
-    simgrid::simix::marshal<smx_sem_t>(simcall->args[0], arg);
+static inline void simcall_sem_would_block__set__sem(smx_simcall_t simcall, smx_sem_t arg)
+{
+  simgrid::simix::marshal<smx_sem_t>(simcall->args[0], arg);
 }
-static inline int simcall_sem_would_block__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<int>(simcall->result);
+static inline int simcall_sem_would_block__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline int simcall_sem_would_block__getraw__result(smx_simcall_t simcall)
 {
@@ -1283,50 +1480,59 @@ static inline void simcall_sem_would_block__set__result(smx_simcall_t simcall, i
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline smx_sem_t simcall_sem_acquire__get__sem(smx_simcall_t simcall) {
+static inline smx_sem_t simcall_sem_acquire__get__sem(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_sem_t>(simcall->args[0]);
 }
 static inline smx_sem_t simcall_sem_acquire__getraw__sem(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_sem_t>(simcall->args[0]);
 }
-static inline void simcall_sem_acquire__set__sem(smx_simcall_t simcall, smx_sem_t arg) {
-    simgrid::simix::marshal<smx_sem_t>(simcall->args[0], arg);
+static inline void simcall_sem_acquire__set__sem(smx_simcall_t simcall, smx_sem_t arg)
+{
+  simgrid::simix::marshal<smx_sem_t>(simcall->args[0], arg);
 }
 
-static inline smx_sem_t simcall_sem_acquire_timeout__get__sem(smx_simcall_t simcall) {
+static inline smx_sem_t simcall_sem_acquire_timeout__get__sem(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_sem_t>(simcall->args[0]);
 }
 static inline smx_sem_t simcall_sem_acquire_timeout__getraw__sem(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_sem_t>(simcall->args[0]);
 }
-static inline void simcall_sem_acquire_timeout__set__sem(smx_simcall_t simcall, smx_sem_t arg) {
-    simgrid::simix::marshal<smx_sem_t>(simcall->args[0], arg);
+static inline void simcall_sem_acquire_timeout__set__sem(smx_simcall_t simcall, smx_sem_t arg)
+{
+  simgrid::simix::marshal<smx_sem_t>(simcall->args[0], arg);
 }
-static inline double simcall_sem_acquire_timeout__get__timeout(smx_simcall_t simcall) {
+static inline double simcall_sem_acquire_timeout__get__timeout(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<double>(simcall->args[1]);
 }
 static inline double simcall_sem_acquire_timeout__getraw__timeout(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<double>(simcall->args[1]);
 }
-static inline void simcall_sem_acquire_timeout__set__timeout(smx_simcall_t simcall, double arg) {
-    simgrid::simix::marshal<double>(simcall->args[1], arg);
+static inline void simcall_sem_acquire_timeout__set__timeout(smx_simcall_t simcall, double arg)
+{
+  simgrid::simix::marshal<double>(simcall->args[1], arg);
 }
 
-static inline smx_sem_t simcall_sem_get_capacity__get__sem(smx_simcall_t simcall) {
+static inline smx_sem_t simcall_sem_get_capacity__get__sem(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_sem_t>(simcall->args[0]);
 }
 static inline smx_sem_t simcall_sem_get_capacity__getraw__sem(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_sem_t>(simcall->args[0]);
 }
-static inline void simcall_sem_get_capacity__set__sem(smx_simcall_t simcall, smx_sem_t arg) {
-    simgrid::simix::marshal<smx_sem_t>(simcall->args[0], arg);
+static inline void simcall_sem_get_capacity__set__sem(smx_simcall_t simcall, smx_sem_t arg)
+{
+  simgrid::simix::marshal<smx_sem_t>(simcall->args[0], arg);
 }
-static inline int simcall_sem_get_capacity__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<int>(simcall->result);
+static inline int simcall_sem_get_capacity__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline int simcall_sem_get_capacity__getraw__result(smx_simcall_t simcall)
 {
@@ -1336,38 +1542,45 @@ static inline void simcall_sem_get_capacity__set__result(smx_simcall_t simcall,
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline smx_file_t simcall_file_read__get__fd(smx_simcall_t simcall) {
+static inline smx_file_t simcall_file_read__get__fd(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
 }
 static inline smx_file_t simcall_file_read__getraw__fd(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_read__set__fd(smx_simcall_t simcall, smx_file_t arg) {
-    simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
+static inline void simcall_file_read__set__fd(smx_simcall_t simcall, smx_file_t arg)
+{
+  simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
 }
-static inline sg_size_t simcall_file_read__get__size(smx_simcall_t simcall) {
+static inline sg_size_t simcall_file_read__get__size(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<sg_size_t>(simcall->args[1]);
 }
 static inline sg_size_t simcall_file_read__getraw__size(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<sg_size_t>(simcall->args[1]);
 }
-static inline void simcall_file_read__set__size(smx_simcall_t simcall, sg_size_t arg) {
-    simgrid::simix::marshal<sg_size_t>(simcall->args[1], arg);
+static inline void simcall_file_read__set__size(smx_simcall_t simcall, sg_size_t arg)
+{
+  simgrid::simix::marshal<sg_size_t>(simcall->args[1], arg);
 }
-static inline sg_host_t simcall_file_read__get__host(smx_simcall_t simcall) {
+static inline sg_host_t simcall_file_read__get__host(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<sg_host_t>(simcall->args[2]);
 }
 static inline sg_host_t simcall_file_read__getraw__host(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<sg_host_t>(simcall->args[2]);
 }
-static inline void simcall_file_read__set__host(smx_simcall_t simcall, sg_host_t arg) {
-    simgrid::simix::marshal<sg_host_t>(simcall->args[2], arg);
+static inline void simcall_file_read__set__host(smx_simcall_t simcall, sg_host_t arg)
+{
+  simgrid::simix::marshal<sg_host_t>(simcall->args[2], arg);
 }
-static inline sg_size_t simcall_file_read__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
+static inline sg_size_t simcall_file_read__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
 }
 static inline sg_size_t simcall_file_read__getraw__result(smx_simcall_t simcall)
 {
@@ -1377,38 +1590,45 @@ static inline void simcall_file_read__set__result(smx_simcall_t simcall, sg_size
     simgrid::simix::marshal<sg_size_t>(simcall->result, result);
 }
 
-static inline smx_file_t simcall_file_write__get__fd(smx_simcall_t simcall) {
+static inline smx_file_t simcall_file_write__get__fd(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
 }
 static inline smx_file_t simcall_file_write__getraw__fd(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_write__set__fd(smx_simcall_t simcall, smx_file_t arg) {
-    simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
+static inline void simcall_file_write__set__fd(smx_simcall_t simcall, smx_file_t arg)
+{
+  simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
 }
-static inline sg_size_t simcall_file_write__get__size(smx_simcall_t simcall) {
+static inline sg_size_t simcall_file_write__get__size(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<sg_size_t>(simcall->args[1]);
 }
 static inline sg_size_t simcall_file_write__getraw__size(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<sg_size_t>(simcall->args[1]);
 }
-static inline void simcall_file_write__set__size(smx_simcall_t simcall, sg_size_t arg) {
-    simgrid::simix::marshal<sg_size_t>(simcall->args[1], arg);
+static inline void simcall_file_write__set__size(smx_simcall_t simcall, sg_size_t arg)
+{
+  simgrid::simix::marshal<sg_size_t>(simcall->args[1], arg);
 }
-static inline sg_host_t simcall_file_write__get__host(smx_simcall_t simcall) {
+static inline sg_host_t simcall_file_write__get__host(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<sg_host_t>(simcall->args[2]);
 }
 static inline sg_host_t simcall_file_write__getraw__host(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<sg_host_t>(simcall->args[2]);
 }
-static inline void simcall_file_write__set__host(smx_simcall_t simcall, sg_host_t arg) {
-    simgrid::simix::marshal<sg_host_t>(simcall->args[2], arg);
+static inline void simcall_file_write__set__host(smx_simcall_t simcall, sg_host_t arg)
+{
+  simgrid::simix::marshal<sg_host_t>(simcall->args[2], arg);
 }
-static inline sg_size_t simcall_file_write__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
+static inline sg_size_t simcall_file_write__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
 }
 static inline sg_size_t simcall_file_write__getraw__result(smx_simcall_t simcall)
 {
@@ -1454,8 +1674,9 @@ static inline void simcall_file_open__set__st(smx_simcall_t simcall, sg_storage_
 {
   simgrid::simix::marshal<sg_storage_t>(simcall->args[2], arg);
 }
-static inline smx_file_t simcall_file_open__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<smx_file_t>(simcall->result);
+static inline smx_file_t simcall_file_open__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<smx_file_t>(simcall->result);
 }
 static inline smx_file_t simcall_file_open__getraw__result(smx_simcall_t simcall)
 {
@@ -1465,28 +1686,33 @@ static inline void simcall_file_open__set__result(smx_simcall_t simcall, smx_fil
     simgrid::simix::marshal<smx_file_t>(simcall->result, result);
 }
 
-static inline smx_file_t simcall_file_close__get__fd(smx_simcall_t simcall) {
+static inline smx_file_t simcall_file_close__get__fd(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
 }
 static inline smx_file_t simcall_file_close__getraw__fd(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_close__set__fd(smx_simcall_t simcall, smx_file_t arg) {
-    simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
+static inline void simcall_file_close__set__fd(smx_simcall_t simcall, smx_file_t arg)
+{
+  simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
 }
-static inline sg_host_t simcall_file_close__get__host(smx_simcall_t simcall) {
+static inline sg_host_t simcall_file_close__get__host(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<sg_host_t>(simcall->args[1]);
 }
 static inline sg_host_t simcall_file_close__getraw__host(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<sg_host_t>(simcall->args[1]);
 }
-static inline void simcall_file_close__set__host(smx_simcall_t simcall, sg_host_t arg) {
-    simgrid::simix::marshal<sg_host_t>(simcall->args[1], arg);
+static inline void simcall_file_close__set__host(smx_simcall_t simcall, sg_host_t arg)
+{
+  simgrid::simix::marshal<sg_host_t>(simcall->args[1], arg);
 }
-static inline int simcall_file_close__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<int>(simcall->result);
+static inline int simcall_file_close__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline int simcall_file_close__getraw__result(smx_simcall_t simcall)
 {
@@ -1496,28 +1722,33 @@ static inline void simcall_file_close__set__result(smx_simcall_t simcall, int re
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline smx_file_t simcall_file_unlink__get__fd(smx_simcall_t simcall) {
+static inline smx_file_t simcall_file_unlink__get__fd(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
 }
 static inline smx_file_t simcall_file_unlink__getraw__fd(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_unlink__set__fd(smx_simcall_t simcall, smx_file_t arg) {
-    simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
+static inline void simcall_file_unlink__set__fd(smx_simcall_t simcall, smx_file_t arg)
+{
+  simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
 }
-static inline sg_host_t simcall_file_unlink__get__host(smx_simcall_t simcall) {
+static inline sg_host_t simcall_file_unlink__get__host(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<sg_host_t>(simcall->args[1]);
 }
 static inline sg_host_t simcall_file_unlink__getraw__host(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<sg_host_t>(simcall->args[1]);
 }
-static inline void simcall_file_unlink__set__host(smx_simcall_t simcall, sg_host_t arg) {
-    simgrid::simix::marshal<sg_host_t>(simcall->args[1], arg);
+static inline void simcall_file_unlink__set__host(smx_simcall_t simcall, sg_host_t arg)
+{
+  simgrid::simix::marshal<sg_host_t>(simcall->args[1], arg);
 }
-static inline int simcall_file_unlink__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<int>(simcall->result);
+static inline int simcall_file_unlink__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline int simcall_file_unlink__getraw__result(smx_simcall_t simcall)
 {
@@ -1527,18 +1758,21 @@ static inline void simcall_file_unlink__set__result(smx_simcall_t simcall, int r
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline smx_file_t simcall_file_get_size__get__fd(smx_simcall_t simcall) {
+static inline smx_file_t simcall_file_get_size__get__fd(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
 }
 static inline smx_file_t simcall_file_get_size__getraw__fd(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_get_size__set__fd(smx_simcall_t simcall, smx_file_t arg) {
-    simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
+static inline void simcall_file_get_size__set__fd(smx_simcall_t simcall, smx_file_t arg)
+{
+  simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
 }
-static inline sg_size_t simcall_file_get_size__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
+static inline sg_size_t simcall_file_get_size__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
 }
 static inline sg_size_t simcall_file_get_size__getraw__result(smx_simcall_t simcall)
 {
@@ -1548,18 +1782,21 @@ static inline void simcall_file_get_size__set__result(smx_simcall_t simcall, sg_
     simgrid::simix::marshal<sg_size_t>(simcall->result, result);
 }
 
-static inline smx_file_t simcall_file_tell__get__fd(smx_simcall_t simcall) {
+static inline smx_file_t simcall_file_tell__get__fd(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
 }
 static inline smx_file_t simcall_file_tell__getraw__fd(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_tell__set__fd(smx_simcall_t simcall, smx_file_t arg) {
-    simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
+static inline void simcall_file_tell__set__fd(smx_simcall_t simcall, smx_file_t arg)
+{
+  simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
 }
-static inline sg_size_t simcall_file_tell__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
+static inline sg_size_t simcall_file_tell__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
 }
 static inline sg_size_t simcall_file_tell__getraw__result(smx_simcall_t simcall)
 {
@@ -1569,38 +1806,45 @@ static inline void simcall_file_tell__set__result(smx_simcall_t simcall, sg_size
     simgrid::simix::marshal<sg_size_t>(simcall->result, result);
 }
 
-static inline smx_file_t simcall_file_seek__get__fd(smx_simcall_t simcall) {
+static inline smx_file_t simcall_file_seek__get__fd(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
 }
 static inline smx_file_t simcall_file_seek__getraw__fd(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_seek__set__fd(smx_simcall_t simcall, smx_file_t arg) {
-    simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
+static inline void simcall_file_seek__set__fd(smx_simcall_t simcall, smx_file_t arg)
+{
+  simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
 }
-static inline sg_offset_t simcall_file_seek__get__offset(smx_simcall_t simcall) {
+static inline sg_offset_t simcall_file_seek__get__offset(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<sg_offset_t>(simcall->args[1]);
 }
 static inline sg_offset_t simcall_file_seek__getraw__offset(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<sg_offset_t>(simcall->args[1]);
 }
-static inline void simcall_file_seek__set__offset(smx_simcall_t simcall, sg_offset_t arg) {
-    simgrid::simix::marshal<sg_offset_t>(simcall->args[1], arg);
+static inline void simcall_file_seek__set__offset(smx_simcall_t simcall, sg_offset_t arg)
+{
+  simgrid::simix::marshal<sg_offset_t>(simcall->args[1], arg);
 }
-static inline int simcall_file_seek__get__origin(smx_simcall_t simcall) {
+static inline int simcall_file_seek__get__origin(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<int>(simcall->args[2]);
 }
 static inline int simcall_file_seek__getraw__origin(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<int>(simcall->args[2]);
 }
-static inline void simcall_file_seek__set__origin(smx_simcall_t simcall, int arg) {
-    simgrid::simix::marshal<int>(simcall->args[2], arg);
+static inline void simcall_file_seek__set__origin(smx_simcall_t simcall, int arg)
+{
+  simgrid::simix::marshal<int>(simcall->args[2], arg);
 }
-static inline int simcall_file_seek__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<int>(simcall->result);
+static inline int simcall_file_seek__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline int simcall_file_seek__getraw__result(smx_simcall_t simcall)
 {
@@ -1610,28 +1854,33 @@ static inline void simcall_file_seek__set__result(smx_simcall_t simcall, int res
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline smx_file_t simcall_file_move__get__fd(smx_simcall_t simcall) {
+static inline smx_file_t simcall_file_move__get__fd(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
 }
 static inline smx_file_t simcall_file_move__getraw__fd(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<smx_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_move__set__fd(smx_simcall_t simcall, smx_file_t arg) {
-    simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
+static inline void simcall_file_move__set__fd(smx_simcall_t simcall, smx_file_t arg)
+{
+  simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
 }
-static inline const char* simcall_file_move__get__fullpath(smx_simcall_t simcall) {
+static inline const char* simcall_file_move__get__fullpath(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<const char*>(simcall->args[1]);
 }
 static inline const char* simcall_file_move__getraw__fullpath(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<const char*>(simcall->args[1]);
 }
-static inline void simcall_file_move__set__fullpath(smx_simcall_t simcall, const char* arg) {
-    simgrid::simix::marshal<const char*>(simcall->args[1], arg);
+static inline void simcall_file_move__set__fullpath(smx_simcall_t simcall, const char* arg)
+{
+  simgrid::simix::marshal<const char*>(simcall->args[1], arg);
 }
-static inline int simcall_file_move__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<int>(simcall->result);
+static inline int simcall_file_move__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline int simcall_file_move__getraw__result(smx_simcall_t simcall)
 {
@@ -1641,28 +1890,33 @@ static inline void simcall_file_move__set__result(smx_simcall_t simcall, int res
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline int simcall_mc_random__get__min(smx_simcall_t simcall) {
+static inline int simcall_mc_random__get__min(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<int>(simcall->args[0]);
 }
 static inline int simcall_mc_random__getraw__min(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<int>(simcall->args[0]);
 }
-static inline void simcall_mc_random__set__min(smx_simcall_t simcall, int arg) {
-    simgrid::simix::marshal<int>(simcall->args[0], arg);
+static inline void simcall_mc_random__set__min(smx_simcall_t simcall, int arg)
+{
+  simgrid::simix::marshal<int>(simcall->args[0], arg);
 }
-static inline int simcall_mc_random__get__max(smx_simcall_t simcall) {
+static inline int simcall_mc_random__get__max(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<int>(simcall->args[1]);
 }
 static inline int simcall_mc_random__getraw__max(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<int>(simcall->args[1]);
 }
-static inline void simcall_mc_random__set__max(smx_simcall_t simcall, int arg) {
-    simgrid::simix::marshal<int>(simcall->args[1], arg);
+static inline void simcall_mc_random__set__max(smx_simcall_t simcall, int arg)
+{
+  simgrid::simix::marshal<int>(simcall->args[1], arg);
 }
-static inline int simcall_mc_random__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<int>(simcall->result);
+static inline int simcall_mc_random__get__result(smx_simcall_t simcall)
+{
+  return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline int simcall_mc_random__getraw__result(smx_simcall_t simcall)
 {
@@ -1686,37 +1940,43 @@ static inline void simcall_set_category__set__synchro(smx_simcall_t simcall,
 {
   simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->args[0], arg);
 }
-static inline const char* simcall_set_category__get__category(smx_simcall_t simcall) {
+static inline const char* simcall_set_category__get__category(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<const char*>(simcall->args[1]);
 }
 static inline const char* simcall_set_category__getraw__category(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<const char*>(simcall->args[1]);
 }
-static inline void simcall_set_category__set__category(smx_simcall_t simcall, const char* arg) {
-    simgrid::simix::marshal<const char*>(simcall->args[1], arg);
+static inline void simcall_set_category__set__category(smx_simcall_t simcall, const char* arg)
+{
+  simgrid::simix::marshal<const char*>(simcall->args[1], arg);
 }
 
-static inline std::function<void()> const* simcall_run_kernel__get__code(smx_simcall_t simcall) {
+static inline std::function<void()> const* simcall_run_kernel__get__code(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<std::function<void()> const*>(simcall->args[0]);
 }
 static inline std::function<void()> const* simcall_run_kernel__getraw__code(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<std::function<void()> const*>(simcall->args[0]);
 }
-static inline void simcall_run_kernel__set__code(smx_simcall_t simcall, std::function<void()> const* arg) {
-    simgrid::simix::marshal<std::function<void()> const*>(simcall->args[0], arg);
+static inline void simcall_run_kernel__set__code(smx_simcall_t simcall, std::function<void()> const* arg)
+{
+  simgrid::simix::marshal<std::function<void()> const*>(simcall->args[0], arg);
 }
 
-static inline std::function<void()> const* simcall_run_blocking__get__code(smx_simcall_t simcall) {
+static inline std::function<void()> const* simcall_run_blocking__get__code(smx_simcall_t simcall)
+{
   return simgrid::simix::unmarshal<std::function<void()> const*>(simcall->args[0]);
 }
 static inline std::function<void()> const* simcall_run_blocking__getraw__code(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<std::function<void()> const*>(simcall->args[0]);
 }
-static inline void simcall_run_blocking__set__code(smx_simcall_t simcall, std::function<void()> const* arg) {
-    simgrid::simix::marshal<std::function<void()> const*>(simcall->args[0], arg);
+static inline void simcall_run_blocking__set__code(smx_simcall_t simcall, std::function<void()> const* arg)
+{
+  simgrid::simix::marshal<std::function<void()> const*>(simcall->args[0], arg);
 }
 
 /* The prototype of all simcall handlers, automatically generated for you */
@@ -1727,7 +1987,7 @@ XBT_PRIVATE void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_acto
 XBT_PRIVATE void simcall_HANDLER_process_set_host(smx_simcall_t simcall, smx_actor_t process, sg_host_t dest);
 XBT_PRIVATE void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t process, double timeout);
 XBT_PRIVATE void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration);
-XBT_PRIVATE boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
+XBT_PRIVATE boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
 simcall_HANDLER_execution_start(smx_simcall_t simcall, const char* name, double flops_amount, double priority,
                                 double bound);
 XBT_PRIVATE void

diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp
index 79b16f1..79a6d32 100644 (file)
--- a/src/simix/popping_bodies.cpp
+++ b/src/simix/popping_bodies.cpp
@@ -90,22 +90,22 @@ inline static int simcall_BODY_process_sleep(double duration) {
     return simcall<int, double>(SIMCALL_PROCESS_SLEEP, duration);
   }
 
-  inline static boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
+  inline static boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
   simcall_BODY_execution_start(const char* name, double flops_amount, double priority, double bound)
   {
     /* Go to that function to follow the code flow through the simcall barrier */
     if (0) simcall_HANDLER_execution_start(&SIMIX_process_self()->simcall, name, flops_amount, priority, bound);
-    return simcall<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>, const char*, double, double, double>(
+    return simcall<boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>, const char*, double, double, double>(
         SIMCALL_EXECUTION_START, name, flops_amount, priority, bound);
   }
 
-  inline static boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
+  inline static boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
   simcall_BODY_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount,
                                         double* bytes_amount, double amount, double rate, double timeout)
   {
     /* Go to that function to follow the code flow through the simcall barrier */
     if (0) SIMIX_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, amount, rate, timeout);
-    return simcall<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>, const char*, int, sg_host_t*, double*,
+    return simcall<boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>, const char*, int, sg_host_t*, double*,
                    double*, double, double, double>(SIMCALL_EXECUTION_PARALLEL_START, name, host_nb, host_list,
                                                     flops_amount, bytes_amount, amount, rate, timeout);
   }

diff --git a/src/simix/popping_generated.cpp b/src/simix/popping_generated.cpp
index ff4bb38..3837fc8 100644 (file)
--- a/src/simix/popping_generated.cpp
+++ b/src/simix/popping_generated.cpp
@@ -136,7 +136,7 @@ case SIMCALL_PROCESS_SLEEP:
       break;
 
 case SIMCALL_EXECUTION_START:
-  simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(
+  simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>>(
       simcall->result,
       simcall_HANDLER_execution_start(simcall, simgrid::simix::unmarshal<const char*>(simcall->args[0]),
                                       simgrid::simix::unmarshal<double>(simcall->args[1]),
@@ -146,7 +146,7 @@ case SIMCALL_EXECUTION_START:
   break;
 
 case SIMCALL_EXECUTION_PARALLEL_START:
-  simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(
+  simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>>(
       simcall->result,
       SIMIX_execution_parallel_start(
           simgrid::simix::unmarshal<const char*>(simcall->args[0]), simgrid::simix::unmarshal<int>(simcall->args[1]),

diff --git a/src/simix/popping_private.h b/src/simix/popping_private.h
index c04b0b2..698a3a5 100644 (file)
--- a/src/simix/popping_private.h
+++ b/src/simix/popping_private.h
@@ -11,6 +11,7 @@
 
 #include <src/kernel/activity/ActivityImpl.hpp>
 #include <src/kernel/activity/CommImpl.hpp>
+#include <src/kernel/activity/ExecImpl.hpp>
 
 #include <boost/intrusive_ptr.hpp>
 

diff --git a/src/simix/simcalls.in b/src/simix/simcalls.in
index fe851a0..469e761 100644 (file)
--- a/src/simix/simcalls.in
+++ b/src/simix/simcalls.in
@@ -46,8 +46,8 @@ int  process_is_suspended(smx_actor_t process) [[nohandler]];
 int  process_join(smx_actor_t process, double timeout) [[block]];
 int  process_sleep(double duration) [[block]];
 
-boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> execution_start(const char* name, double flops_amount, double priority, double bound);
-boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double amount, double rate, double timeout) [[nohandler]];
+boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl> execution_start(const char* name, double flops_amount, double priority, double bound);
+boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl> execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double amount, double rate, double timeout) [[nohandler]];
 void          execution_cancel(boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> execution) [[nohandler]];
 void          execution_set_priority(boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> execution, double priority) [[nohandler]];
 void          execution_set_bound(boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> execution, double bound) [[nohandler]];

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index f846463..4465a64 100755 (executable)
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -85,18 +85,19 @@ class Simcall(object):
         for i in range(len(self.args)):
             arg = self.args[i]
             rawtype = regex.sub(r'\1*\2', arg.rettype())
-            res.append('static inline %s simcall_%s__get__%s(smx_simcall_t simcall) {' % (
+            res.append('static inline %s simcall_%s__get__%s(smx_simcall_t simcall)' % (
                 arg.rettype(), self.name, arg.name))
-            res.append(
-                '  return simgrid::simix::unmarshal<%s>(simcall->args[%i]);' % (arg.rettype(), i))
+            res.append('{')
+            res.append('  return simgrid::simix::unmarshal<%s>(simcall->args[%i]);' % (arg.rettype(), i))
             res.append('}')
-            res.append('static inline %s simcall_%s__getraw__%s(smx_simcall_t simcall) {' % (
+            res.append('static inline %s simcall_%s__getraw__%s(smx_simcall_t simcall)' % (
                 rawtype, self.name, arg.name))
-            res.append(
-                '  return simgrid::simix::unmarshal_raw<%s>(simcall->args[%i]);' % (rawtype, i))
+            res.append('{')
+            res.append('  return simgrid::simix::unmarshal_raw<%s>(simcall->args[%i]);' % (rawtype, i))
             res.append('}')
-            res.append('static inline void simcall_%s__set__%s(smx_simcall_t simcall, %s arg) {' % (
+            res.append('static inline void simcall_%s__set__%s(smx_simcall_t simcall, %s arg)' % (
                 self.name, arg.name, arg.rettype()))
+            res.append('{')
             res.append('    simgrid::simix::marshal<%s>(simcall->args[%i], arg);' % (arg.rettype(), i))
             res.append('}')
 
@@ -104,7 +105,9 @@ class Simcall(object):
         if self.res.type != 'void':
             rawtype = regex.sub(r'\1*\2', self.res.rettype())
             res.append(
-                'static inline %s simcall_%s__get__result(smx_simcall_t simcall){' % (self.res.rettype(), self.name))
+                'static inline %s simcall_%s__get__result(smx_simcall_t simcall)' % (self.res.rettype(), self.name))
+            res.append('{')
+
             res.append('    return simgrid::simix::unmarshal<%s>(simcall->result);' % self.res.rettype())
             res.append('}')
             res.append(
@@ -139,7 +142,7 @@ class Simcall(object):
         return '\n'.join(res)
 
     def body(self):
-        res = ['  ']
+        res = ['']
         res.append(
             'inline static %s simcall_BODY_%s(%s) {' % (self.res.rettype(),
                                                         self.name,

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index 7519162..69054e2 100644 (file)
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -92,16 +92,16 @@ void SIMIX_host_off(sg_host_t h, smx_actor_t issuer)
   }
 }
 
-sg_host_t SIMIX_host_self()
+sg_host_t sg_host_self()
 {
   smx_actor_t process = SIMIX_process_self();
   return (process == nullptr) ? nullptr : process->host;
 }
 
 /* needs to be public and without simcall for exceptions and logging events */
-const char* SIMIX_host_self_get_name()
+const char* sg_host_self_get_name()
 {
-  sg_host_t host = SIMIX_host_self();
+  sg_host_t host = sg_host_self();
   if (host == nullptr || SIMIX_process_self() == simix_global->maestro_process)
     return "";
 
@@ -152,13 +152,17 @@ void SIMIX_host_autorestart(sg_host_t host)
   process_list.clear();
 }
 
-smx_activity_t simcall_HANDLER_execution_start(smx_simcall_t simcall, const char* name, double flops_amount,
-                                              double priority, double bound) {
+boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl> simcall_HANDLER_execution_start(smx_simcall_t simcall,
+                                                                                          const char* name,
+                                                                                          double flops_amount,
+                                                                                          double priority, double bound)
+{
   return SIMIX_execution_start(simcall->issuer, name,flops_amount,priority,bound);
 }
 
-smx_activity_t SIMIX_execution_start(smx_actor_t issuer, const char *name, double flops_amount, double priority,
-                                    double bound){
+boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
+SIMIX_execution_start(smx_actor_t issuer, const char* name, double flops_amount, double priority, double bound)
+{
 
   /* alloc structures and initialize */
   simgrid::kernel::activity::ExecImplPtr exec =
@@ -180,8 +184,9 @@ smx_activity_t SIMIX_execution_start(smx_actor_t issuer, const char *name, doubl
   return exec;
 }
 
-smx_activity_t SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount,
-                                              double* bytes_amount, double amount, double rate, double timeout)
+boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
+SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount,
+                               double* bytes_amount, double amount, double rate, double timeout)
 {
 
   /* alloc structures and initialize */

diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h
index 5a953dd..a642409 100644 (file)
--- a/src/simix/smx_host_private.h
+++ b/src/simix/smx_host_private.h
@@ -58,11 +58,11 @@ XBT_PRIVATE void SIMIX_set_category(smx_activity_t synchro, const char *category
 
 SG_END_DECL()
 
-XBT_PRIVATE smx_activity_t SIMIX_execution_start(smx_actor_t issuer, const char* name, double flops_amount,
-                                                 double priority, double bound);
-XBT_PRIVATE smx_activity_t SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list,
-                                                          double* flops_amount, double* bytes_amount, double amount,
-                                                          double rate, double timeout);
+XBT_PRIVATE boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
+SIMIX_execution_start(smx_actor_t issuer, const char* name, double flops_amount, double priority, double bound);
+XBT_PRIVATE boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
+SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount,
+                               double* bytes_amount, double amount, double rate, double timeout);
 
 #endif
 

diff --git a/src/smpi/instr_smpi.cpp b/src/smpi/instr_smpi.cpp
index d0f4c4d..eb3b141 100644 (file)
--- a/src/smpi/instr_smpi.cpp
+++ b/src/smpi/instr_smpi.cpp
@@ -197,7 +197,7 @@ void TRACE_smpi_init(int rank)
 
   container_t father;
   if (TRACE_smpi_is_grouped()){
-    father = PJ_container_get (SIMIX_host_self_get_name());
+    father = PJ_container_get(sg_host_self_get_name());
   }else{
     father = PJ_container_get_root ();
   }

diff --git a/src/smpi/smpi_comm.cpp b/src/smpi/smpi_comm.cpp
index f128f59..d5ac71c 100644 (file)
--- a/src/smpi/smpi_comm.cpp
+++ b/src/smpi/smpi_comm.cpp
@@ -333,19 +333,20 @@ void Comm::init_smp(){
    }
   //identify neighbours in comm
   //get the indexes of all processes sharing the same simix host
-  xbt_swag_t process_list = SIMIX_host_self()->extension<simgrid::simix::Host>()->process_list;
-  int intra_comm_size     = 0;
-  int min_index           = INT_MAX;//the minimum index will be the leader
-  smx_actor_t actor       = nullptr;
-  xbt_swag_foreach(actor, process_list) {
-    int index = actor->pid -1;
-
-    if(this->group()->rank(index)!=MPI_UNDEFINED){
-      intra_comm_size++;
-      //the process is in the comm
-      if(index < min_index)
-        min_index=index;
-    }
+   xbt_swag_t process_list = sg_host_self()->extension<simgrid::simix::Host>()->process_list;
+   int intra_comm_size     = 0;
+   int min_index           = INT_MAX; // the minimum index will be the leader
+   smx_actor_t actor       = nullptr;
+   xbt_swag_foreach(actor, process_list)
+   {
+     int index = actor->pid - 1;
+
+     if (this->group()->rank(index) != MPI_UNDEFINED) {
+       intra_comm_size++;
+       // the process is in the comm
+       if (index < min_index)
+         min_index = index;
+     }
   }
   XBT_DEBUG("number of processes deployed on my node : %d", intra_comm_size);
   MPI_Group group_intra = new  Group(intra_comm_size);

diff --git a/src/smpi/smpi_dvfs.cpp b/src/smpi/smpi_dvfs.cpp
index bc9d903..c19e14e 100644 (file)
--- a/src/smpi/smpi_dvfs.cpp
+++ b/src/smpi/smpi_dvfs.cpp
@@ -24,7 +24,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_dvfs, smpi, "Logging specific to SMPI (expe
  */
 double smpi_get_host_power_peak_at(int pstate_index)
 {
-  return SIMIX_host_self()->getPstateSpeed(pstate_index);
+  return sg_host_self()->getPstateSpeed(pstate_index);
 }
 
 /**
@@ -34,7 +34,7 @@ double smpi_get_host_power_peak_at(int pstate_index)
  */
 double smpi_get_host_current_power_peak()
 {
-  return SIMIX_host_self()->speed();
+  return sg_host_self()->speed();
 }
 
 /**
@@ -42,7 +42,7 @@ double smpi_get_host_current_power_peak()
  */
 int smpi_get_host_nb_pstates()
 {
-  return sg_host_get_nb_pstates(SIMIX_host_self());
+  return sg_host_get_nb_pstates(sg_host_self());
 }
 
 /**
@@ -52,11 +52,11 @@ int smpi_get_host_nb_pstates()
  */
 void smpi_set_host_pstate(int pstate_index)
 {
-  sg_host_set_pstate(SIMIX_host_self(), pstate_index);
+  sg_host_set_pstate(sg_host_self(), pstate_index);
 }
 /** @brief Gets the pstate at which the processor currently running */
 int smpi_get_host_pstate() {
-  return sg_host_get_pstate(SIMIX_host_self());
+  return sg_host_get_pstate(sg_host_self());
 }
 
 /**
@@ -65,7 +65,7 @@ int smpi_get_host_pstate() {
  * \return Returns the consumed energy
  */
 double smpi_get_host_consumed_energy() {
-  return sg_host_get_consumed_energy(SIMIX_host_self());
+  return sg_host_get_consumed_energy(sg_host_self());
 }
 
 #if SMPI_FORTRAN

diff --git a/src/smpi/smpi_pmpi.cpp b/src/smpi/smpi_pmpi.cpp
index 4c68e80..6a1b4d3 100644 (file)
--- a/src/smpi/smpi_pmpi.cpp
+++ b/src/smpi/smpi_pmpi.cpp
@@ -2153,9 +2153,9 @@ int PMPI_Alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype
 
 int PMPI_Get_processor_name(char *name, int *resultlen)
 {
-  strncpy(name, SIMIX_host_self()->cname(), strlen(SIMIX_host_self()->cname()) < MPI_MAX_PROCESSOR_NAME - 1
-                                                ? strlen(SIMIX_host_self()->cname()) + 1
-                                                : MPI_MAX_PROCESSOR_NAME - 1);
+  strncpy(name, sg_host_self()->cname(), strlen(sg_host_self()->cname()) < MPI_MAX_PROCESSOR_NAME - 1
+                                             ? strlen(sg_host_self()->cname()) + 1
+                                             : MPI_MAX_PROCESSOR_NAME - 1);
   *resultlen = strlen(name) > MPI_MAX_PROCESSOR_NAME ? MPI_MAX_PROCESSOR_NAME : strlen(name);
 
   return MPI_SUCCESS;

diff --git a/src/xbt/mallocator.c b/src/xbt/mallocator.c
index 408e115..fa9f582 100644 (file)
--- a/src/xbt/mallocator.c
+++ b/src/xbt/mallocator.c
@@ -6,12 +6,12 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "src/internal_config.h"
 #include "xbt/mallocator.h"
+#include "mallocator_private.h"
+#include "simgrid/modelchecker.h" /* kill mallocators when model-checking is enabled */
+#include "src/internal_config.h"
 #include "xbt/asserts.h"
 #include "xbt/sysdep.h"
-#include "mc/mc.h" /* kill mallocators when model-checking is enabled */
-#include "mallocator_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_mallocator, xbt, "Mallocators");
 

diff --git a/src/xbt/xbt_log_layout_format.c b/src/xbt/xbt_log_layout_format.c
index 3407ff7..18c55ac 100644 (file)
--- a/src/xbt/xbt_log_layout_format.c
+++ b/src/xbt/xbt_log_layout_format.c
@@ -5,10 +5,10 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "xbt/sysdep.h"
+#include "simgrid/host.h"
 #include "src/xbt/log_private.h"
-#include "simgrid/simix.h"      /* SIMIX_host_self_get_name */
 #include "surf/surf.h"
+#include "xbt/sysdep.h"
 #include <stdio.h>
 
 extern const char *xbt_log_priority_names[8];
@@ -119,11 +119,9 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l, xbt_log_event_t ev, co
         show_string(xbt_log_priority_names[ev->priority]);
         break;
       case 'h':                 /* host name; SimGrid extension */
-        show_string(SIMIX_host_self_get_name());
-        break;
-      case 't':                 /* thread name; LOG4J compliant */
-        show_string(SIMIX_process_self_get_name());
+        show_string(sg_host_self_get_name());
         break;
+      case 't':                 /* thread/process name; LOG4J compliant */
       case 'P':                 /* process name; SimGrid extension */
         show_string(xbt_procname());
         break;

diff --git a/src/xbt/xbt_log_layout_simple.c b/src/xbt/xbt_log_layout_simple.c
index 8d77b3e..b890b15 100644 (file)
--- a/src/xbt/xbt_log_layout_simple.c
+++ b/src/xbt/xbt_log_layout_simple.c
@@ -8,7 +8,7 @@
 #include "xbt/sysdep.h"
 #include "src/xbt/log_private.h"
 
-#include "simgrid/simix.h"      /* SIMIX_host_self_get_name */
+#include "simgrid/host.h" /* sg_host_self_get_name */
 #include "surf/surf.h"
 #include <stdio.h>
 
@@ -36,12 +36,12 @@ static int xbt_log_layout_simple_doit(xbt_log_layout_t l, xbt_log_event_t ev, co
   /* Display the proc info if available */
   procname = xbt_procname();
   if (procname && strcmp(procname,"maestro")) {
-    len = snprintf(p, rem_size, "%s:%s:(%d) ", SIMIX_host_self_get_name(), procname, xbt_getpid());
+    len = snprintf(p, rem_size, "%s:%s:(%d) ", sg_host_self_get_name(), procname, xbt_getpid());
     check_overflow(len);
   }
   else if (!procname)  {
-  len = snprintf(p, rem_size, "%s::(%d) ", SIMIX_host_self_get_name(), xbt_getpid());
-  check_overflow(len);
+    len = snprintf(p, rem_size, "%s::(%d) ", sg_host_self_get_name(), xbt_getpid());
+    check_overflow(len);
   }
 
   /* Display the date */

diff --git a/src/xbt/xbt_os_synchro.c b/src/xbt/xbt_os_synchro.c
index 8727228..1a7adda 100644 (file)
--- a/src/xbt/xbt_os_synchro.c
+++ b/src/xbt/xbt_os_synchro.c
@@ -1,7 +1,4 @@
-/* xbt_synchro -- Synchronization virtualized depending on whether we are   */
-/*                in simulation or real life (act on simulated processes)   */
-
-/* This is the simulation implementation, using simix.                      */
+/* Classical synchro schema, implemented on top of SimGrid                  */
 
 /* Copyright (c) 2007-2016. The SimGrid Team.
  * All rights reserved.                                                     */

diff --git a/src/xbt/xbt_virtu.c b/src/xbt/xbt_virtu.c
index b35f23a..b4d2cb5 100644 (file)
--- a/src/xbt/xbt_virtu.c
+++ b/src/xbt/xbt_virtu.c
@@ -5,10 +5,10 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "simgrid/msg.h"
+#include "xbt/function_types.h"
 #include "xbt/misc.h"
 #include "xbt/virtu.h"
-#include "xbt/function_types.h"
-#include "simgrid/simix.h"
 
 static int xbt_fake_pid(void)
 {
@@ -19,5 +19,5 @@ int_f_void_t xbt_getpid = &xbt_fake_pid;
 
 const char *xbt_procname(void)
 {
-  return SIMIX_process_self_get_name();
+  return MSG_process_self_name();
 }