[simix] Remove the process_create simcall

[simgrid.git] / src / simix / popping_bodies.cpp

diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp
index bfc0c86..9494181 100644 (file)
--- a/src/simix/popping_bodies.cpp
+++ b/src/simix/popping_bodies.cpp
@@ -17,6 +17,7 @@
 #include "src/mc/mc_forward.hpp"
 #include "xbt/ex.h"
 #include <simgrid/simix.hpp>
+/** @cond */ // Please Doxygen, don't look at this
   
 inline static void simcall_BODY_vm_suspend(sg_host_t ind_vm) {
     smx_process_t self = SIMIX_process_self();
@@ -30,7 +31,7 @@ inline static void simcall_BODY_vm_suspend(sg_host_t ind_vm) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) ind_vm;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -51,7 +52,7 @@ inline static void simcall_BODY_vm_resume(sg_host_t ind_vm) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) ind_vm;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -72,7 +73,7 @@ inline static void simcall_BODY_vm_shutdown(sg_host_t ind_vm) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) ind_vm;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -93,7 +94,7 @@ inline static void simcall_BODY_vm_save(sg_host_t ind_vm) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) ind_vm;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -114,7 +115,7 @@ inline static void simcall_BODY_vm_restore(sg_host_t ind_vm) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) ind_vm;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -123,35 +124,6 @@ inline static void simcall_BODY_vm_restore(sg_host_t ind_vm) {
     
   }
   
-inline static void* simcall_BODY_process_create(const char* name, xbt_main_func_t code, void* data, const char* hostname, double kill_time, int argc, char** argv, xbt_dict_t properties, int auto_restart) {
-    smx_process_t self = SIMIX_process_self();
-
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) simcall_HANDLER_process_create(&self->simcall, name, code, data, hostname, kill_time, argc, argv, properties, auto_restart);
-    /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
-
-    self->simcall.call = SIMCALL_PROCESS_CREATE;
-    memset(&self->simcall.result, 0, sizeof(self->simcall.result));
-    memset(self->simcall.args, 0, sizeof(self->simcall.args));
-    self->simcall.args[0].cc = (const char*) name;
-    self->simcall.args[1].fp = (FPtr) code;
-    self->simcall.args[2].dp = (void*) data;
-    self->simcall.args[3].cc = (const char*) hostname;
-    self->simcall.args[4].d = (double) kill_time;
-    self->simcall.args[5].i = (int) argc;
-    self->simcall.args[6].dp = (void*) argv;
-    self->simcall.args[7].dp = (void*) properties;
-    self->simcall.args[8].i = (int) auto_restart;
-    if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
-                SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
-      SIMIX_process_yield(self);
-    } else {
-      SIMIX_simcall_handle(&self->simcall, 0);
-    }    
-    return (void*) self->simcall.result.dp;
-  }
-  
 inline static void simcall_BODY_process_kill(smx_process_t process) {
     smx_process_t self = SIMIX_process_self();
 
@@ -164,7 +136,7 @@ inline static void simcall_BODY_process_kill(smx_process_t process) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) process;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -185,7 +157,7 @@ inline static void simcall_BODY_process_killall(int reset_pid) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].i = (int) reset_pid;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -206,7 +178,7 @@ inline static void simcall_BODY_process_cleanup(smx_process_t process) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) process;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -227,7 +199,7 @@ inline static void simcall_BODY_process_suspend(smx_process_t process) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) process;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -248,7 +220,7 @@ inline static void simcall_BODY_process_resume(smx_process_t process) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) process;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -270,7 +242,7 @@ inline static void simcall_BODY_process_set_host(smx_process_t process, sg_host_
     self->simcall.args[0].dp = (void*) process;
     self->simcall.args[1].dp = (void*) dest;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -291,7 +263,7 @@ inline static int simcall_BODY_process_is_suspended(smx_process_t process) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) process;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -313,7 +285,7 @@ inline static int simcall_BODY_process_join(smx_process_t process, double timeou
     self->simcall.args[0].dp = (void*) process;
     self->simcall.args[1].d = (double) timeout;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -334,7 +306,7 @@ inline static int simcall_BODY_process_sleep(double duration) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].d = (double) duration;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -359,7 +331,7 @@ inline static smx_synchro_t simcall_BODY_execution_start(const char* name, doubl
     self->simcall.args[3].d = (double) bound;
     self->simcall.args[4].ul = (unsigned long) affinity_mask;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -386,7 +358,7 @@ inline static smx_synchro_t simcall_BODY_execution_parallel_start(const char* na
     self->simcall.args[5].d = (double) amount;
     self->simcall.args[6].d = (double) rate;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -395,27 +367,6 @@ inline static smx_synchro_t simcall_BODY_execution_parallel_start(const char* na
     return (smx_synchro_t) self->simcall.result.dp;
   }
   
-inline static void simcall_BODY_execution_destroy(smx_synchro_t execution) {
-    smx_process_t self = SIMIX_process_self();
-
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_execution_destroy(execution);
-    /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
-
-    self->simcall.call = SIMCALL_EXECUTION_DESTROY;
-    memset(&self->simcall.result, 0, sizeof(self->simcall.result));
-    memset(self->simcall.args, 0, sizeof(self->simcall.args));
-    self->simcall.args[0].dp = (void*) execution;
-    if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
-                SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
-      SIMIX_process_yield(self);
-    } else {
-      SIMIX_simcall_handle(&self->simcall, 0);
-    }    
-    
-  }
-  
 inline static void simcall_BODY_execution_cancel(smx_synchro_t execution) {
     smx_process_t self = SIMIX_process_self();
 
@@ -428,7 +379,7 @@ inline static void simcall_BODY_execution_cancel(smx_synchro_t execution) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) execution;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -437,48 +388,6 @@ inline static void simcall_BODY_execution_cancel(smx_synchro_t execution) {
     
   }
   
-inline static double simcall_BODY_execution_get_remains(smx_synchro_t execution) {
-    smx_process_t self = SIMIX_process_self();
-
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_execution_get_remains(execution);
-    /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
-
-    self->simcall.call = SIMCALL_EXECUTION_GET_REMAINS;
-    memset(&self->simcall.result, 0, sizeof(self->simcall.result));
-    memset(self->simcall.args, 0, sizeof(self->simcall.args));
-    self->simcall.args[0].dp = (void*) execution;
-    if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
-                SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
-      SIMIX_process_yield(self);
-    } else {
-      SIMIX_simcall_handle(&self->simcall, 0);
-    }    
-    return (double) self->simcall.result.d;
-  }
-  
-inline static e_smx_state_t simcall_BODY_execution_get_state(smx_synchro_t execution) {
-    smx_process_t self = SIMIX_process_self();
-
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_execution_get_state(execution);
-    /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
-
-    self->simcall.call = SIMCALL_EXECUTION_GET_STATE;
-    memset(&self->simcall.result, 0, sizeof(self->simcall.result));
-    memset(self->simcall.args, 0, sizeof(self->simcall.args));
-    self->simcall.args[0].dp = (void*) execution;
-    if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
-                SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
-      SIMIX_process_yield(self);
-    } else {
-      SIMIX_simcall_handle(&self->simcall, 0);
-    }    
-    return (e_smx_state_t) self->simcall.result.i;
-  }
-  
 inline static void simcall_BODY_execution_set_priority(smx_synchro_t execution, double priority) {
     smx_process_t self = SIMIX_process_self();
 
@@ -492,7 +401,7 @@ inline static void simcall_BODY_execution_set_priority(smx_synchro_t execution,
     self->simcall.args[0].dp = (void*) execution;
     self->simcall.args[1].d = (double) priority;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -514,7 +423,7 @@ inline static void simcall_BODY_execution_set_bound(smx_synchro_t execution, dou
     self->simcall.args[0].dp = (void*) execution;
     self->simcall.args[1].d = (double) bound;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -537,7 +446,7 @@ inline static void simcall_BODY_execution_set_affinity(smx_synchro_t execution,
     self->simcall.args[1].dp = (void*) ws;
     self->simcall.args[2].ul = (unsigned long) mask;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -558,7 +467,7 @@ inline static int simcall_BODY_execution_wait(smx_synchro_t execution) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) execution;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -581,7 +490,7 @@ inline static void simcall_BODY_process_on_exit(smx_process_t process, int_f_pvo
     self->simcall.args[1].fp = (FPtr) fun;
     self->simcall.args[2].dp = (void*) data;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -603,7 +512,7 @@ inline static void simcall_BODY_process_auto_restart_set(smx_process_t process,
     self->simcall.args[0].dp = (void*) process;
     self->simcall.args[1].i = (int) auto_restart;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -624,7 +533,7 @@ inline static smx_process_t simcall_BODY_process_restart(smx_process_t process)
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) process;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -645,7 +554,7 @@ inline static smx_mailbox_t simcall_BODY_mbox_create(const char* name) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].cc = (const char*) name;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -654,27 +563,6 @@ inline static smx_mailbox_t simcall_BODY_mbox_create(const char* name) {
     return (smx_mailbox_t) self->simcall.result.dp;
   }
   
-inline static smx_synchro_t simcall_BODY_mbox_get_head(smx_mailbox_t mbox) {
-    smx_process_t self = SIMIX_process_self();
-
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_mbox_get_head(mbox);
-    /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
-
-    self->simcall.call = SIMCALL_MBOX_GET_HEAD;
-    memset(&self->simcall.result, 0, sizeof(self->simcall.result));
-    memset(self->simcall.args, 0, sizeof(self->simcall.args));
-    self->simcall.args[0].dp = (void*) mbox;
-    if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
-                SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
-      SIMIX_process_yield(self);
-    } else {
-      SIMIX_simcall_handle(&self->simcall, 0);
-    }    
-    return (smx_synchro_t) self->simcall.result.dp;
-  }
-  
 inline static void simcall_BODY_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t receiver) {
     smx_process_t self = SIMIX_process_self();
 
@@ -688,7 +576,7 @@ inline static void simcall_BODY_mbox_set_receiver(smx_mailbox_t mbox, smx_proces
     self->simcall.args[0].dp = (void*) mbox;
     self->simcall.args[1].dp = (void*) receiver;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -697,27 +585,6 @@ inline static void simcall_BODY_mbox_set_receiver(smx_mailbox_t mbox, smx_proces
     
   }
   
-inline static smx_process_t simcall_BODY_mbox_get_receiver(smx_mailbox_t mbox) {
-    smx_process_t self = SIMIX_process_self();
-
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_mbox_get_receiver(mbox);
-    /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
-
-    self->simcall.call = SIMCALL_MBOX_GET_RECEIVER;
-    memset(&self->simcall.result, 0, sizeof(self->simcall.result));
-    memset(self->simcall.args, 0, sizeof(self->simcall.args));
-    self->simcall.args[0].dp = (void*) mbox;
-    if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
-                SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
-      SIMIX_process_yield(self);
-    } else {
-      SIMIX_simcall_handle(&self->simcall, 0);
-    }    
-    return (smx_process_t) self->simcall.result.dp;
-  }
-  
 inline static smx_synchro_t simcall_BODY_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag, simix_match_func_t match_fun, void* data) {
     smx_process_t self = SIMIX_process_self();
 
@@ -735,7 +602,7 @@ inline static smx_synchro_t simcall_BODY_comm_iprobe(smx_mailbox_t mbox, int typ
     self->simcall.args[4].fp = (FPtr) match_fun;
     self->simcall.args[5].dp = (void*) data;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -765,7 +632,7 @@ inline static void simcall_BODY_comm_send(smx_process_t sender, smx_mailbox_t mb
     self->simcall.args[8].dp = (void*) data;
     self->simcall.args[9].d = (double) timeout;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -796,7 +663,7 @@ inline static smx_synchro_t simcall_BODY_comm_isend(smx_process_t sender, smx_ma
     self->simcall.args[9].dp = (void*) data;
     self->simcall.args[10].i = (int) detached;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -825,7 +692,7 @@ inline static void simcall_BODY_comm_recv(smx_process_t receiver, smx_mailbox_t
     self->simcall.args[7].d = (double) timeout;
     self->simcall.args[8].d = (double) rate;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -853,7 +720,7 @@ inline static smx_synchro_t simcall_BODY_comm_irecv(smx_process_t receiver, smx_
     self->simcall.args[6].dp = (void*) data;
     self->simcall.args[7].d = (double) rate;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -862,27 +729,6 @@ inline static smx_synchro_t simcall_BODY_comm_irecv(smx_process_t receiver, smx_
     return (smx_synchro_t) self->simcall.result.dp;
   }
   
-inline static void simcall_BODY_comm_cancel(smx_synchro_t comm) {
-    smx_process_t self = SIMIX_process_self();
-
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_comm_cancel(comm);
-    /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
-
-    self->simcall.call = SIMCALL_COMM_CANCEL;
-    memset(&self->simcall.result, 0, sizeof(self->simcall.result));
-    memset(self->simcall.args, 0, sizeof(self->simcall.args));
-    self->simcall.args[0].dp = (void*) comm;
-    if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
-                SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
-      SIMIX_process_yield(self);
-    } else {
-      SIMIX_simcall_handle(&self->simcall, 0);
-    }    
-    
-  }
-  
 inline static int simcall_BODY_comm_waitany(xbt_dynar_t comms) {
     smx_process_t self = SIMIX_process_self();
 
@@ -895,7 +741,7 @@ inline static int simcall_BODY_comm_waitany(xbt_dynar_t comms) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) comms;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -917,7 +763,7 @@ inline static void simcall_BODY_comm_wait(smx_synchro_t comm, double timeout) {
     self->simcall.args[0].dp = (void*) comm;
     self->simcall.args[1].d = (double) timeout;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -938,7 +784,7 @@ inline static int simcall_BODY_comm_test(smx_synchro_t comm) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) comm;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -959,7 +805,7 @@ inline static int simcall_BODY_comm_testany(xbt_dynar_t comms) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) comms;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -968,132 +814,6 @@ inline static int simcall_BODY_comm_testany(xbt_dynar_t comms) {
     return (int) self->simcall.result.i;
   }
   
-inline static double simcall_BODY_comm_get_remains(smx_synchro_t comm) {
-    smx_process_t self = SIMIX_process_self();
-
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_comm_get_remains(comm);
-    /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
-
-    self->simcall.call = SIMCALL_COMM_GET_REMAINS;
-    memset(&self->simcall.result, 0, sizeof(self->simcall.result));
-    memset(self->simcall.args, 0, sizeof(self->simcall.args));
-    self->simcall.args[0].dp = (void*) comm;
-    if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
-                SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
-      SIMIX_process_yield(self);
-    } else {
-      SIMIX_simcall_handle(&self->simcall, 0);
-    }    
-    return (double) self->simcall.result.d;
-  }
-  
-inline static e_smx_state_t simcall_BODY_comm_get_state(smx_synchro_t comm) {
-    smx_process_t self = SIMIX_process_self();
-
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_comm_get_state(comm);
-    /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
-
-    self->simcall.call = SIMCALL_COMM_GET_STATE;
-    memset(&self->simcall.result, 0, sizeof(self->simcall.result));
-    memset(self->simcall.args, 0, sizeof(self->simcall.args));
-    self->simcall.args[0].dp = (void*) comm;
-    if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
-                SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
-      SIMIX_process_yield(self);
-    } else {
-      SIMIX_simcall_handle(&self->simcall, 0);
-    }    
-    return (e_smx_state_t) self->simcall.result.i;
-  }
-  
-inline static void* simcall_BODY_comm_get_src_data(smx_synchro_t comm) {
-    smx_process_t self = SIMIX_process_self();
-
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_comm_get_src_data(comm);
-    /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
-
-    self->simcall.call = SIMCALL_COMM_GET_SRC_DATA;
-    memset(&self->simcall.result, 0, sizeof(self->simcall.result));
-    memset(self->simcall.args, 0, sizeof(self->simcall.args));
-    self->simcall.args[0].dp = (void*) comm;
-    if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
-                SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
-      SIMIX_process_yield(self);
-    } else {
-      SIMIX_simcall_handle(&self->simcall, 0);
-    }    
-    return (void*) self->simcall.result.dp;
-  }
-  
-inline static void* simcall_BODY_comm_get_dst_data(smx_synchro_t comm) {
-    smx_process_t self = SIMIX_process_self();
-
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_comm_get_dst_data(comm);
-    /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
-
-    self->simcall.call = SIMCALL_COMM_GET_DST_DATA;
-    memset(&self->simcall.result, 0, sizeof(self->simcall.result));
-    memset(self->simcall.args, 0, sizeof(self->simcall.args));
-    self->simcall.args[0].dp = (void*) comm;
-    if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
-                SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
-      SIMIX_process_yield(self);
-    } else {
-      SIMIX_simcall_handle(&self->simcall, 0);
-    }    
-    return (void*) self->simcall.result.dp;
-  }
-  
-inline static smx_process_t simcall_BODY_comm_get_src_proc(smx_synchro_t comm) {
-    smx_process_t self = SIMIX_process_self();
-
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_comm_get_src_proc(comm);
-    /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
-
-    self->simcall.call = SIMCALL_COMM_GET_SRC_PROC;
-    memset(&self->simcall.result, 0, sizeof(self->simcall.result));
-    memset(self->simcall.args, 0, sizeof(self->simcall.args));
-    self->simcall.args[0].dp = (void*) comm;
-    if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
-                SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
-      SIMIX_process_yield(self);
-    } else {
-      SIMIX_simcall_handle(&self->simcall, 0);
-    }    
-    return (smx_process_t) self->simcall.result.dp;
-  }
-  
-inline static smx_process_t simcall_BODY_comm_get_dst_proc(smx_synchro_t comm) {
-    smx_process_t self = SIMIX_process_self();
-
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_comm_get_dst_proc(comm);
-    /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
-
-    self->simcall.call = SIMCALL_COMM_GET_DST_PROC;
-    memset(&self->simcall.result, 0, sizeof(self->simcall.result));
-    memset(self->simcall.args, 0, sizeof(self->simcall.args));
-    self->simcall.args[0].dp = (void*) comm;
-    if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
-                SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
-      SIMIX_process_yield(self);
-    } else {
-      SIMIX_simcall_handle(&self->simcall, 0);
-    }    
-    return (smx_process_t) self->simcall.result.dp;
-  }
-  
 inline static smx_mutex_t simcall_BODY_mutex_init() {
     smx_process_t self = SIMIX_process_self();
 
@@ -1106,7 +826,7 @@ inline static smx_mutex_t simcall_BODY_mutex_init() {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
 
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1127,7 +847,7 @@ inline static void simcall_BODY_mutex_lock(smx_mutex_t mutex) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) mutex;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1148,7 +868,7 @@ inline static int simcall_BODY_mutex_trylock(smx_mutex_t mutex) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) mutex;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1169,7 +889,7 @@ inline static void simcall_BODY_mutex_unlock(smx_mutex_t mutex) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) mutex;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1190,7 +910,7 @@ inline static smx_cond_t simcall_BODY_cond_init() {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
 
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1211,7 +931,7 @@ inline static void simcall_BODY_cond_signal(smx_cond_t cond) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) cond;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1233,7 +953,7 @@ inline static void simcall_BODY_cond_wait(smx_cond_t cond, smx_mutex_t mutex) {
     self->simcall.args[0].dp = (void*) cond;
     self->simcall.args[1].dp = (void*) mutex;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1256,7 +976,7 @@ inline static void simcall_BODY_cond_wait_timeout(smx_cond_t cond, smx_mutex_t m
     self->simcall.args[1].dp = (void*) mutex;
     self->simcall.args[2].d = (double) timeout;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1277,7 +997,7 @@ inline static void simcall_BODY_cond_broadcast(smx_cond_t cond) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) cond;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1298,7 +1018,7 @@ inline static smx_sem_t simcall_BODY_sem_init(unsigned int capacity) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].ui = (unsigned int) capacity;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1319,7 +1039,7 @@ inline static void simcall_BODY_sem_release(smx_sem_t sem) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) sem;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1340,7 +1060,7 @@ inline static int simcall_BODY_sem_would_block(smx_sem_t sem) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) sem;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1361,7 +1081,7 @@ inline static void simcall_BODY_sem_acquire(smx_sem_t sem) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) sem;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1383,7 +1103,7 @@ inline static void simcall_BODY_sem_acquire_timeout(smx_sem_t sem, double timeou
     self->simcall.args[0].dp = (void*) sem;
     self->simcall.args[1].d = (double) timeout;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1404,7 +1124,7 @@ inline static int simcall_BODY_sem_get_capacity(smx_sem_t sem) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) sem;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1427,7 +1147,7 @@ inline static sg_size_t simcall_BODY_file_read(smx_file_t fd, sg_size_t size, sg
     self->simcall.args[1].sgsz = (sg_size_t) size;
     self->simcall.args[2].dp = (void*) host;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1450,7 +1170,7 @@ inline static sg_size_t simcall_BODY_file_write(smx_file_t fd, sg_size_t size, s
     self->simcall.args[1].sgsz = (sg_size_t) size;
     self->simcall.args[2].dp = (void*) host;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1472,7 +1192,7 @@ inline static smx_file_t simcall_BODY_file_open(const char* fullpath, sg_host_t
     self->simcall.args[0].cc = (const char*) fullpath;
     self->simcall.args[1].dp = (void*) host;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1494,7 +1214,7 @@ inline static int simcall_BODY_file_close(smx_file_t fd, sg_host_t host) {
     self->simcall.args[0].dp = (void*) fd;
     self->simcall.args[1].dp = (void*) host;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1516,7 +1236,7 @@ inline static int simcall_BODY_file_unlink(smx_file_t fd, sg_host_t host) {
     self->simcall.args[0].dp = (void*) fd;
     self->simcall.args[1].dp = (void*) host;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1537,7 +1257,7 @@ inline static sg_size_t simcall_BODY_file_get_size(smx_file_t fd) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) fd;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1558,7 +1278,7 @@ inline static sg_size_t simcall_BODY_file_tell(smx_file_t fd) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) fd;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1581,7 +1301,7 @@ inline static int simcall_BODY_file_seek(smx_file_t fd, sg_offset_t offset, int
     self->simcall.args[1].sgoff = (sg_offset_t) offset;
     self->simcall.args[2].i = (int) origin;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1602,7 +1322,7 @@ inline static xbt_dynar_t simcall_BODY_file_get_info(smx_file_t fd) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) fd;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1624,7 +1344,7 @@ inline static int simcall_BODY_file_move(smx_file_t fd, const char* fullpath) {
     self->simcall.args[0].dp = (void*) fd;
     self->simcall.args[1].cc = (const char*) fullpath;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1645,7 +1365,7 @@ inline static sg_size_t simcall_BODY_storage_get_free_size(smx_storage_t storage
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) storage;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1666,7 +1386,7 @@ inline static sg_size_t simcall_BODY_storage_get_used_size(smx_storage_t name) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) name;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1687,7 +1407,7 @@ inline static xbt_dict_t simcall_BODY_storage_get_properties(smx_storage_t stora
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) storage;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1708,7 +1428,7 @@ inline static xbt_dict_t simcall_BODY_storage_get_content(smx_storage_t storage)
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) storage;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1729,7 +1449,7 @@ inline static xbt_dict_t simcall_BODY_asr_get_properties(const char* name) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].cc = (const char*) name;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1751,7 +1471,7 @@ inline static int simcall_BODY_mc_random(int min, int max) {
     self->simcall.args[0].i = (int) min;
     self->simcall.args[1].i = (int) max;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1773,7 +1493,7 @@ inline static void simcall_BODY_set_category(smx_synchro_t synchro, const char*
     self->simcall.args[0].dp = (void*) synchro;
     self->simcall.args[1].cc = (const char*) category;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
@@ -1794,11 +1514,11 @@ inline static void simcall_BODY_run_kernel(void* code) {
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) code;
     if (self != simix_global->maestro_process) {
-      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
       SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
-  }
\ No newline at end of file
+  }/** @endcond */