X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/467a0c53018ee489de1dd7ae61a083d52048b8e8..04f2226028a38d3e30f5d7d30ef53b7274f34cca:/src/simix/popping_accessors.h

diff --git a/src/simix/popping_accessors.h b/src/simix/popping_accessors.h
index 32e906ec8f..fadfc1bb22 100644
--- a/src/simix/popping_accessors.h
+++ b/src/simix/popping_accessors.h
@@ -14,46 +14,11 @@
  */
 
 #include "src/simix/popping_private.h"
-static inline sg_host_t simcall_vm_suspend__get__ind_vm(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<sg_host_t>(simcall->args[0]);
+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 void simcall_vm_suspend__set__ind_vm(smx_simcall_t simcall, sg_host_t arg) {
-    simgrid::simix::marshal<sg_host_t>(simcall->args[0], arg);
-}
-
-static inline sg_host_t simcall_vm_resume__get__ind_vm(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<sg_host_t>(simcall->args[0]);
-}
-static inline void simcall_vm_resume__set__ind_vm(smx_simcall_t simcall, sg_host_t arg) {
-    simgrid::simix::marshal<sg_host_t>(simcall->args[0], arg);
-}
-
-static inline sg_host_t simcall_vm_shutdown__get__ind_vm(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<sg_host_t>(simcall->args[0]);
-}
-static inline void simcall_vm_shutdown__set__ind_vm(smx_simcall_t simcall, sg_host_t arg) {
-    simgrid::simix::marshal<sg_host_t>(simcall->args[0], arg);
-}
-
-static inline sg_host_t simcall_vm_save__get__ind_vm(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<sg_host_t>(simcall->args[0]);
-}
-static inline void simcall_vm_save__set__ind_vm(smx_simcall_t simcall, sg_host_t arg) {
-    simgrid::simix::marshal<sg_host_t>(simcall->args[0], arg);
-}
-
-static inline sg_host_t simcall_vm_restore__get__ind_vm(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<sg_host_t>(simcall->args[0]);
-}
-static inline void simcall_vm_restore__set__ind_vm(smx_simcall_t simcall, sg_host_t arg) {
-    simgrid::simix::marshal<sg_host_t>(simcall->args[0], arg);
-}
-
-static inline smx_process_t simcall_process_kill__get__process(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
-}
-static inline void simcall_process_kill__set__process(smx_simcall_t simcall, smx_process_t arg) {
-    simgrid::simix::marshal<smx_process_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) {
@@ -63,32 +28,32 @@ static inline void simcall_process_killall__set__reset_pid(smx_simcall_t simcall
     simgrid::simix::marshal<int>(simcall->args[0], arg);
 }
 
-static inline smx_process_t simcall_process_cleanup__get__process(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
+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 void simcall_process_cleanup__set__process(smx_simcall_t simcall, smx_process_t arg) {
-    simgrid::simix::marshal<smx_process_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_process_t simcall_process_suspend__get__process(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
+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 void simcall_process_suspend__set__process(smx_simcall_t simcall, smx_process_t arg) {
-    simgrid::simix::marshal<smx_process_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_process_t simcall_process_resume__get__process(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
+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 void simcall_process_resume__set__process(smx_simcall_t simcall, smx_process_t arg) {
-    simgrid::simix::marshal<smx_process_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_process_t simcall_process_set_host__get__process(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
+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 void simcall_process_set_host__set__process(smx_simcall_t simcall, smx_process_t arg) {
-    simgrid::simix::marshal<smx_process_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) {
   return simgrid::simix::unmarshal<sg_host_t>(simcall->args[1]);
@@ -97,11 +62,11 @@ static inline void simcall_process_set_host__set__dest(smx_simcall_t simcall, sg
     simgrid::simix::marshal<sg_host_t>(simcall->args[1], arg);
 }
 
-static inline smx_process_t simcall_process_is_suspended__get__process(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
+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 void simcall_process_is_suspended__set__process(smx_simcall_t simcall, smx_process_t arg) {
-    simgrid::simix::marshal<smx_process_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);
@@ -110,11 +75,11 @@ static inline void simcall_process_is_suspended__set__result(smx_simcall_t simca
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline smx_process_t simcall_process_join__get__process(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
+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 void simcall_process_join__set__process(smx_simcall_t simcall, smx_process_t arg) {
-    simgrid::simix::marshal<smx_process_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) {
   return simgrid::simix::unmarshal<double>(simcall->args[1]);
@@ -166,17 +131,11 @@ static inline double simcall_execution_start__get__bound(smx_simcall_t simcall)
 static inline void simcall_execution_start__set__bound(smx_simcall_t simcall, double arg) {
     simgrid::simix::marshal<double>(simcall->args[3], arg);
 }
-static inline unsigned long simcall_execution_start__get__affinity_mask(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<unsigned long>(simcall->args[4]);
-}
-static inline void simcall_execution_start__set__affinity_mask(smx_simcall_t simcall, unsigned long arg) {
-    simgrid::simix::marshal<unsigned long>(simcall->args[4], arg);
+static inline smx_activity_t simcall_execution_start__get__result(smx_simcall_t simcall){
+    return simgrid::simix::unmarshal<smx_activity_t>(simcall->result);
 }
-static inline smx_synchro_t simcall_execution_start__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<smx_synchro_t>(simcall->result);
-}
-static inline void simcall_execution_start__set__result(smx_simcall_t simcall, smx_synchro_t result){
-    simgrid::simix::marshal<smx_synchro_t>(simcall->result, result);
+static inline void simcall_execution_start__set__result(smx_simcall_t simcall, smx_activity_t result){
+    simgrid::simix::marshal<smx_activity_t>(simcall->result, result);
 }
 
 static inline const char* simcall_execution_parallel_start__get__name(smx_simcall_t simcall) {
@@ -221,25 +180,31 @@ static inline double simcall_execution_parallel_start__get__rate(smx_simcall_t s
 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 smx_synchro_t simcall_execution_parallel_start__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<smx_synchro_t>(simcall->result);
+static inline double simcall_execution_parallel_start__get__timeout(smx_simcall_t simcall) {
+  return simgrid::simix::unmarshal<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 smx_activity_t simcall_execution_parallel_start__get__result(smx_simcall_t simcall){
+    return simgrid::simix::unmarshal<smx_activity_t>(simcall->result);
 }
-static inline void simcall_execution_parallel_start__set__result(smx_simcall_t simcall, smx_synchro_t result){
-    simgrid::simix::marshal<smx_synchro_t>(simcall->result, result);
+static inline void simcall_execution_parallel_start__set__result(smx_simcall_t simcall, smx_activity_t result){
+    simgrid::simix::marshal<smx_activity_t>(simcall->result, result);
 }
 
-static inline smx_synchro_t simcall_execution_cancel__get__execution(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_synchro_t>(simcall->args[0]);
+static inline smx_activity_t simcall_execution_cancel__get__execution(smx_simcall_t simcall) {
+  return simgrid::simix::unmarshal<smx_activity_t>(simcall->args[0]);
 }
-static inline void simcall_execution_cancel__set__execution(smx_simcall_t simcall, smx_synchro_t arg) {
-    simgrid::simix::marshal<smx_synchro_t>(simcall->args[0], arg);
+static inline void simcall_execution_cancel__set__execution(smx_simcall_t simcall, smx_activity_t arg) {
+    simgrid::simix::marshal<smx_activity_t>(simcall->args[0], arg);
 }
 
-static inline smx_synchro_t simcall_execution_set_priority__get__execution(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_synchro_t>(simcall->args[0]);
+static inline smx_activity_t simcall_execution_set_priority__get__execution(smx_simcall_t simcall) {
+  return simgrid::simix::unmarshal<smx_activity_t>(simcall->args[0]);
 }
-static inline void simcall_execution_set_priority__set__execution(smx_simcall_t simcall, smx_synchro_t arg) {
-    simgrid::simix::marshal<smx_synchro_t>(simcall->args[0], arg);
+static inline void simcall_execution_set_priority__set__execution(smx_simcall_t simcall, smx_activity_t arg) {
+    simgrid::simix::marshal<smx_activity_t>(simcall->args[0], arg);
 }
 static inline double simcall_execution_set_priority__get__priority(smx_simcall_t simcall) {
   return simgrid::simix::unmarshal<double>(simcall->args[1]);
@@ -248,11 +213,11 @@ static inline void simcall_execution_set_priority__set__priority(smx_simcall_t s
     simgrid::simix::marshal<double>(simcall->args[1], arg);
 }
 
-static inline smx_synchro_t simcall_execution_set_bound__get__execution(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_synchro_t>(simcall->args[0]);
+static inline smx_activity_t simcall_execution_set_bound__get__execution(smx_simcall_t simcall) {
+  return simgrid::simix::unmarshal<smx_activity_t>(simcall->args[0]);
 }
-static inline void simcall_execution_set_bound__set__execution(smx_simcall_t simcall, smx_synchro_t arg) {
-    simgrid::simix::marshal<smx_synchro_t>(simcall->args[0], arg);
+static inline void simcall_execution_set_bound__set__execution(smx_simcall_t simcall, smx_activity_t arg) {
+    simgrid::simix::marshal<smx_activity_t>(simcall->args[0], arg);
 }
 static inline double simcall_execution_set_bound__get__bound(smx_simcall_t simcall) {
   return simgrid::simix::unmarshal<double>(simcall->args[1]);
@@ -261,30 +226,11 @@ static inline void simcall_execution_set_bound__set__bound(smx_simcall_t simcall
     simgrid::simix::marshal<double>(simcall->args[1], arg);
 }
 
-static inline smx_synchro_t simcall_execution_set_affinity__get__execution(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_synchro_t>(simcall->args[0]);
-}
-static inline void simcall_execution_set_affinity__set__execution(smx_simcall_t simcall, smx_synchro_t arg) {
-    simgrid::simix::marshal<smx_synchro_t>(simcall->args[0], arg);
+static inline smx_activity_t simcall_execution_wait__get__execution(smx_simcall_t simcall) {
+  return simgrid::simix::unmarshal<smx_activity_t>(simcall->args[0]);
 }
-static inline sg_host_t simcall_execution_set_affinity__get__ws(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<sg_host_t>(simcall->args[1]);
-}
-static inline void simcall_execution_set_affinity__set__ws(smx_simcall_t simcall, sg_host_t arg) {
-    simgrid::simix::marshal<sg_host_t>(simcall->args[1], arg);
-}
-static inline unsigned long simcall_execution_set_affinity__get__mask(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<unsigned long>(simcall->args[2]);
-}
-static inline void simcall_execution_set_affinity__set__mask(smx_simcall_t simcall, unsigned long arg) {
-    simgrid::simix::marshal<unsigned long>(simcall->args[2], arg);
-}
-
-static inline smx_synchro_t simcall_execution_wait__get__execution(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_synchro_t>(simcall->args[0]);
-}
-static inline void simcall_execution_wait__set__execution(smx_simcall_t simcall, smx_synchro_t arg) {
-    simgrid::simix::marshal<smx_synchro_t>(simcall->args[0], arg);
+static inline void simcall_execution_wait__set__execution(smx_simcall_t simcall, smx_activity_t arg) {
+    simgrid::simix::marshal<smx_activity_t>(simcall->args[0], arg);
 }
 static inline int simcall_execution_wait__get__result(smx_simcall_t simcall){
     return simgrid::simix::unmarshal<int>(simcall->result);
@@ -293,11 +239,11 @@ static inline void simcall_execution_wait__set__result(smx_simcall_t simcall, in
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline smx_process_t simcall_process_on_exit__get__process(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
+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 void simcall_process_on_exit__set__process(smx_simcall_t simcall, smx_process_t arg) {
-    simgrid::simix::marshal<smx_process_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) {
   return simgrid::simix::unmarshal<int_f_pvoid_pvoid_t>(simcall->args[1]);
@@ -312,11 +258,11 @@ static inline void simcall_process_on_exit__set__data(smx_simcall_t simcall, voi
     simgrid::simix::marshal<void*>(simcall->args[2], arg);
 }
 
-static inline smx_process_t simcall_process_auto_restart_set__get__process(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
+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 void simcall_process_auto_restart_set__set__process(smx_simcall_t simcall, smx_process_t arg) {
-    simgrid::simix::marshal<smx_process_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) {
   return simgrid::simix::unmarshal<int>(simcall->args[1]);
@@ -325,43 +271,17 @@ static inline void simcall_process_auto_restart_set__set__auto_restart(smx_simca
     simgrid::simix::marshal<int>(simcall->args[1], arg);
 }
 
-static inline smx_process_t simcall_process_restart__get__process(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
+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 void simcall_process_restart__set__process(smx_simcall_t simcall, smx_process_t arg) {
-    simgrid::simix::marshal<smx_process_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_process_t simcall_process_restart__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<smx_process_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 void simcall_process_restart__set__result(smx_simcall_t simcall, smx_process_t result){
-    simgrid::simix::marshal<smx_process_t>(simcall->result, result);
-}
-
-static inline const char* simcall_mbox_create__get__name(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<const char*>(simcall->args[0]);
-}
-static inline void simcall_mbox_create__set__name(smx_simcall_t simcall, const char* arg) {
-    simgrid::simix::marshal<const char*>(simcall->args[0], arg);
-}
-static inline smx_mailbox_t simcall_mbox_create__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<smx_mailbox_t>(simcall->result);
-}
-static inline void simcall_mbox_create__set__result(smx_simcall_t simcall, smx_mailbox_t result){
-    simgrid::simix::marshal<smx_mailbox_t>(simcall->result, result);
-}
-
-static inline smx_mailbox_t simcall_mbox_set_receiver__get__mbox(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_mailbox_t>(simcall->args[0]);
-}
-static inline void simcall_mbox_set_receiver__set__mbox(smx_simcall_t simcall, smx_mailbox_t arg) {
-    simgrid::simix::marshal<smx_mailbox_t>(simcall->args[0], arg);
-}
-static inline smx_process_t simcall_mbox_set_receiver__get__receiver(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[1]);
-}
-static inline void simcall_mbox_set_receiver__set__receiver(smx_simcall_t simcall, smx_process_t arg) {
-    simgrid::simix::marshal<smx_process_t>(simcall->args[1], arg);
+static inline void simcall_process_restart__set__result(smx_simcall_t simcall, smx_actor_t result){
+    simgrid::simix::marshal<smx_actor_t>(simcall->result, result);
 }
 
 static inline smx_mailbox_t simcall_comm_iprobe__get__mbox(smx_simcall_t simcall) {
@@ -400,18 +320,18 @@ static inline void* simcall_comm_iprobe__get__data(smx_simcall_t simcall) {
 static inline void simcall_comm_iprobe__set__data(smx_simcall_t simcall, void* arg) {
     simgrid::simix::marshal<void*>(simcall->args[5], arg);
 }
-static inline smx_synchro_t simcall_comm_iprobe__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<smx_synchro_t>(simcall->result);
+static inline smx_activity_t simcall_comm_iprobe__get__result(smx_simcall_t simcall){
+    return simgrid::simix::unmarshal<smx_activity_t>(simcall->result);
 }
-static inline void simcall_comm_iprobe__set__result(smx_simcall_t simcall, smx_synchro_t result){
-    simgrid::simix::marshal<smx_synchro_t>(simcall->result, result);
+static inline void simcall_comm_iprobe__set__result(smx_simcall_t simcall, smx_activity_t result){
+    simgrid::simix::marshal<smx_activity_t>(simcall->result, result);
 }
 
-static inline smx_process_t simcall_comm_send__get__sender(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
+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 void simcall_comm_send__set__sender(smx_simcall_t simcall, smx_process_t arg) {
-    simgrid::simix::marshal<smx_process_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) {
   return simgrid::simix::unmarshal<smx_mailbox_t>(simcall->args[1]);
@@ -468,11 +388,11 @@ static inline void simcall_comm_send__set__timeout(smx_simcall_t simcall, double
     simgrid::simix::marshal<double>(simcall->args[9], arg);
 }
 
-static inline smx_process_t simcall_comm_isend__get__sender(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
+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 void simcall_comm_isend__set__sender(smx_simcall_t simcall, smx_process_t arg) {
-    simgrid::simix::marshal<smx_process_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) {
   return simgrid::simix::unmarshal<smx_mailbox_t>(simcall->args[1]);
@@ -534,18 +454,18 @@ static inline int simcall_comm_isend__get__detached(smx_simcall_t simcall) {
 static inline void simcall_comm_isend__set__detached(smx_simcall_t simcall, int arg) {
     simgrid::simix::marshal<int>(simcall->args[10], arg);
 }
-static inline smx_synchro_t simcall_comm_isend__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<smx_synchro_t>(simcall->result);
+static inline smx_activity_t simcall_comm_isend__get__result(smx_simcall_t simcall){
+    return simgrid::simix::unmarshal<smx_activity_t>(simcall->result);
 }
-static inline void simcall_comm_isend__set__result(smx_simcall_t simcall, smx_synchro_t result){
-    simgrid::simix::marshal<smx_synchro_t>(simcall->result, result);
+static inline void simcall_comm_isend__set__result(smx_simcall_t simcall, smx_activity_t result){
+    simgrid::simix::marshal<smx_activity_t>(simcall->result, result);
 }
 
-static inline smx_process_t simcall_comm_recv__get__receiver(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
+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 void simcall_comm_recv__set__receiver(smx_simcall_t simcall, smx_process_t arg) {
-    simgrid::simix::marshal<smx_process_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) {
   return simgrid::simix::unmarshal<smx_mailbox_t>(simcall->args[1]);
@@ -596,11 +516,11 @@ static inline void simcall_comm_recv__set__rate(smx_simcall_t simcall, double ar
     simgrid::simix::marshal<double>(simcall->args[8], arg);
 }
 
-static inline smx_process_t simcall_comm_irecv__get__receiver(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
+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 void simcall_comm_irecv__set__receiver(smx_simcall_t simcall, smx_process_t arg) {
-    simgrid::simix::marshal<smx_process_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) {
   return simgrid::simix::unmarshal<smx_mailbox_t>(simcall->args[1]);
@@ -644,11 +564,11 @@ static inline double simcall_comm_irecv__get__rate(smx_simcall_t simcall) {
 static inline void simcall_comm_irecv__set__rate(smx_simcall_t simcall, double arg) {
     simgrid::simix::marshal<double>(simcall->args[7], arg);
 }
-static inline smx_synchro_t simcall_comm_irecv__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<smx_synchro_t>(simcall->result);
+static inline smx_activity_t simcall_comm_irecv__get__result(smx_simcall_t simcall){
+    return simgrid::simix::unmarshal<smx_activity_t>(simcall->result);
 }
-static inline void simcall_comm_irecv__set__result(smx_simcall_t simcall, smx_synchro_t result){
-    simgrid::simix::marshal<smx_synchro_t>(simcall->result, result);
+static inline void simcall_comm_irecv__set__result(smx_simcall_t simcall, smx_activity_t result){
+    simgrid::simix::marshal<smx_activity_t>(simcall->result, result);
 }
 
 static inline xbt_dynar_t simcall_comm_waitany__get__comms(smx_simcall_t simcall) {
@@ -657,6 +577,12 @@ static inline xbt_dynar_t simcall_comm_waitany__get__comms(smx_simcall_t simcall
 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) {
+  return simgrid::simix::unmarshal<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 int simcall_comm_waitany__get__result(smx_simcall_t simcall){
     return simgrid::simix::unmarshal<int>(simcall->result);
 }
@@ -664,11 +590,11 @@ static inline void simcall_comm_waitany__set__result(smx_simcall_t simcall, int
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline smx_synchro_t simcall_comm_wait__get__comm(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_synchro_t>(simcall->args[0]);
+static inline smx_activity_t simcall_comm_wait__get__comm(smx_simcall_t simcall) {
+  return simgrid::simix::unmarshal<smx_activity_t>(simcall->args[0]);
 }
-static inline void simcall_comm_wait__set__comm(smx_simcall_t simcall, smx_synchro_t arg) {
-    simgrid::simix::marshal<smx_synchro_t>(simcall->args[0], arg);
+static inline void simcall_comm_wait__set__comm(smx_simcall_t simcall, smx_activity_t arg) {
+    simgrid::simix::marshal<smx_activity_t>(simcall->args[0], arg);
 }
 static inline double simcall_comm_wait__get__timeout(smx_simcall_t simcall) {
   return simgrid::simix::unmarshal<double>(simcall->args[1]);
@@ -677,11 +603,11 @@ static inline void simcall_comm_wait__set__timeout(smx_simcall_t simcall, double
     simgrid::simix::marshal<double>(simcall->args[1], arg);
 }
 
-static inline smx_synchro_t simcall_comm_test__get__comm(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_synchro_t>(simcall->args[0]);
+static inline smx_activity_t simcall_comm_test__get__comm(smx_simcall_t simcall) {
+  return simgrid::simix::unmarshal<smx_activity_t>(simcall->args[0]);
 }
-static inline void simcall_comm_test__set__comm(smx_simcall_t simcall, smx_synchro_t arg) {
-    simgrid::simix::marshal<smx_synchro_t>(simcall->args[0], arg);
+static inline void simcall_comm_test__set__comm(smx_simcall_t simcall, smx_activity_t arg) {
+    simgrid::simix::marshal<smx_activity_t>(simcall->args[0], arg);
 }
 static inline int simcall_comm_test__get__result(smx_simcall_t simcall){
     return simgrid::simix::unmarshal<int>(simcall->result);
@@ -690,11 +616,17 @@ static inline void simcall_comm_test__set__result(smx_simcall_t simcall, int res
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline xbt_dynar_t simcall_comm_testany__get__comms(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<xbt_dynar_t>(simcall->args[0]);
+static inline smx_activity_t* simcall_comm_testany__get__comms(smx_simcall_t simcall) {
+  return simgrid::simix::unmarshal<smx_activity_t*>(simcall->args[0]);
 }
-static inline void simcall_comm_testany__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_testany__set__comms(smx_simcall_t simcall, smx_activity_t* arg) {
+    simgrid::simix::marshal<smx_activity_t*>(simcall->args[0], arg);
+}
+static inline size_t simcall_comm_testany__get__count(smx_simcall_t simcall) {
+  return simgrid::simix::unmarshal<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 int simcall_comm_testany__get__result(smx_simcall_t simcall){
     return simgrid::simix::unmarshal<int>(simcall->result);
@@ -1098,19 +1030,6 @@ static inline void simcall_storage_get_content__set__result(smx_simcall_t simcal
     simgrid::simix::marshal<xbt_dict_t>(simcall->result, result);
 }
 
-static inline const char* simcall_asr_get_properties__get__name(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<const char*>(simcall->args[0]);
-}
-static inline void simcall_asr_get_properties__set__name(smx_simcall_t simcall, const char* arg) {
-    simgrid::simix::marshal<const char*>(simcall->args[0], arg);
-}
-static inline xbt_dict_t simcall_asr_get_properties__get__result(smx_simcall_t simcall){
-    return simgrid::simix::unmarshal<xbt_dict_t>(simcall->result);
-}
-static inline void simcall_asr_get_properties__set__result(smx_simcall_t simcall, xbt_dict_t result){
-    simgrid::simix::marshal<xbt_dict_t>(simcall->result, result);
-}
-
 static inline int simcall_mc_random__get__min(smx_simcall_t simcall) {
   return simgrid::simix::unmarshal<int>(simcall->args[0]);
 }
@@ -1130,11 +1049,11 @@ static inline void simcall_mc_random__set__result(smx_simcall_t simcall, int res
     simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline smx_synchro_t simcall_set_category__get__synchro(smx_simcall_t simcall) {
-  return simgrid::simix::unmarshal<smx_synchro_t>(simcall->args[0]);
+static inline smx_activity_t simcall_set_category__get__synchro(smx_simcall_t simcall) {
+  return simgrid::simix::unmarshal<smx_activity_t>(simcall->args[0]);
 }
-static inline void simcall_set_category__set__synchro(smx_simcall_t simcall, smx_synchro_t arg) {
-    simgrid::simix::marshal<smx_synchro_t>(simcall->args[0], arg);
+static inline void simcall_set_category__set__synchro(smx_simcall_t simcall, smx_activity_t arg) {
+    simgrid::simix::marshal<smx_activity_t>(simcall->args[0], arg);
 }
 static inline const char* simcall_set_category__get__category(smx_simcall_t simcall) {
   return simgrid::simix::unmarshal<const char*>(simcall->args[1]);
@@ -1159,30 +1078,24 @@ static inline void simcall_run_blocking__set__code(smx_simcall_t simcall, std::f
 
 /* The prototype of all simcall handlers, automatically generated for you */
 
-XBT_PRIVATE void simcall_HANDLER_vm_suspend(smx_simcall_t simcall, sg_host_t ind_vm);
-XBT_PRIVATE void simcall_HANDLER_vm_resume(smx_simcall_t simcall, sg_host_t ind_vm);
-XBT_PRIVATE void simcall_HANDLER_vm_shutdown(smx_simcall_t simcall, sg_host_t ind_vm);
-XBT_PRIVATE void simcall_HANDLER_vm_save(smx_simcall_t simcall, sg_host_t ind_vm);
-XBT_PRIVATE void simcall_HANDLER_vm_restore(smx_simcall_t simcall, sg_host_t ind_vm);
-XBT_PRIVATE void simcall_HANDLER_process_kill(smx_simcall_t simcall, smx_process_t process);
+XBT_PRIVATE void simcall_HANDLER_process_kill(smx_simcall_t simcall, smx_actor_t process);
 XBT_PRIVATE void simcall_HANDLER_process_killall(smx_simcall_t simcall, int reset_pid);
-XBT_PRIVATE void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_process_t process);
-XBT_PRIVATE void simcall_HANDLER_process_resume(smx_simcall_t simcall, smx_process_t process);
-XBT_PRIVATE void simcall_HANDLER_process_set_host(smx_simcall_t simcall, smx_process_t process, sg_host_t dest);
-XBT_PRIVATE void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_process_t process, double timeout);
+XBT_PRIVATE void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t process);
+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 smx_synchro_t simcall_HANDLER_execution_start(smx_simcall_t simcall, const char* name, double flops_amount, double priority, double bound, unsigned long affinity_mask);
-XBT_PRIVATE void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_synchro_t execution);
-XBT_PRIVATE smx_process_t simcall_HANDLER_process_restart(smx_simcall_t simcall, smx_process_t process);
-XBT_PRIVATE smx_synchro_t simcall_HANDLER_comm_iprobe(smx_simcall_t simcall, smx_mailbox_t mbox, int type, int src, int tag, simix_match_func_t match_fun, void* data);
-XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_process_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout);
-XBT_PRIVATE smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_process_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_clean_func_t clean_fun, simix_copy_data_func_t copy_data_fun, void* data, int detached);
-XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_process_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout, double rate);
-XBT_PRIVATE smx_synchro_t simcall_HANDLER_comm_irecv(smx_simcall_t simcall, smx_process_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double rate);
-XBT_PRIVATE void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t comms);
-XBT_PRIVATE void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_synchro_t comm, double timeout);
-XBT_PRIVATE void simcall_HANDLER_comm_test(smx_simcall_t simcall, smx_synchro_t comm);
-XBT_PRIVATE void simcall_HANDLER_comm_testany(smx_simcall_t simcall, xbt_dynar_t comms);
+XBT_PRIVATE smx_activity_t simcall_HANDLER_execution_start(smx_simcall_t simcall, const char* name, double flops_amount, double priority, double bound);
+XBT_PRIVATE void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_activity_t execution);
+XBT_PRIVATE smx_actor_t simcall_HANDLER_process_restart(smx_simcall_t simcall, smx_actor_t process);
+XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_iprobe(smx_simcall_t simcall, smx_mailbox_t mbox, int type, int src, int tag, simix_match_func_t match_fun, void* data);
+XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout);
+XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_clean_func_t clean_fun, simix_copy_data_func_t copy_data_fun, void* data, int detached);
+XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout, double rate);
+XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_irecv(smx_simcall_t simcall, smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double rate);
+XBT_PRIVATE void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t comms, double timeout);
+XBT_PRIVATE void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_activity_t comm, double timeout);
+XBT_PRIVATE void simcall_HANDLER_comm_test(smx_simcall_t simcall, smx_activity_t comm);
+XBT_PRIVATE void simcall_HANDLER_comm_testany(smx_simcall_t simcall, smx_activity_t* comms, size_t count);
 XBT_PRIVATE smx_mutex_t simcall_HANDLER_mutex_init(smx_simcall_t simcall);
 XBT_PRIVATE void simcall_HANDLER_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex);
 XBT_PRIVATE int simcall_HANDLER_mutex_trylock(smx_simcall_t simcall, smx_mutex_t mutex);
@@ -1205,5 +1118,4 @@ XBT_PRIVATE xbt_dynar_t simcall_HANDLER_file_get_info(smx_simcall_t simcall, smx
 XBT_PRIVATE int simcall_HANDLER_file_move(smx_simcall_t simcall, smx_file_t fd, const char* fullpath);
 XBT_PRIVATE sg_size_t simcall_HANDLER_storage_get_free_size(smx_simcall_t simcall, smx_storage_t storage);
 XBT_PRIVATE sg_size_t simcall_HANDLER_storage_get_used_size(smx_simcall_t simcall, smx_storage_t name);
-XBT_PRIVATE xbt_dict_t simcall_HANDLER_asr_get_properties(smx_simcall_t simcall, const char* name);
 XBT_PRIVATE int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max);
\ No newline at end of file