[smpi] Better implementation of predefined attributes

[simgrid.git] / src / simix / popping_accessors.h

diff --git a/src/simix/popping_accessors.h b/src/simix/popping_accessors.h
index aa44bae..be8bd66 100644 (file)
--- a/src/simix/popping_accessors.h
+++ b/src/simix/popping_accessors.h
@@ -215,10 +215,10 @@ static inline smx_host_t simcall_host_execute__get__host(smx_simcall_t simcall)
 static inline void simcall_host_execute__set__host(smx_simcall_t simcall, void* arg) {
     simcall->args[1].dp = arg;
 }
-static inline double simcall_host_execute__get__computation_amount(smx_simcall_t simcall) {
+static inline double simcall_host_execute__get__flops_amount(smx_simcall_t simcall) {
   return  simcall->args[2].d;
 }
-static inline void simcall_host_execute__set__computation_amount(smx_simcall_t simcall, double arg) {
+static inline void simcall_host_execute__set__flops_amount(smx_simcall_t simcall, double arg) {
     simcall->args[2].d = arg;
 }
 static inline double simcall_host_execute__get__priority(smx_simcall_t simcall) {
@@ -264,16 +264,16 @@ static inline smx_host_t* simcall_host_parallel_execute__get__host_list(smx_simc
 static inline void simcall_host_parallel_execute__set__host_list(smx_simcall_t simcall, void* arg) {
     simcall->args[2].dp = arg;
 }
-static inline double* simcall_host_parallel_execute__get__computation_amount(smx_simcall_t simcall) {
+static inline double* simcall_host_parallel_execute__get__flops_amount(smx_simcall_t simcall) {
   return (double*) simcall->args[3].dp;
 }
-static inline void simcall_host_parallel_execute__set__computation_amount(smx_simcall_t simcall, void* arg) {
+static inline void simcall_host_parallel_execute__set__flops_amount(smx_simcall_t simcall, void* arg) {
     simcall->args[3].dp = arg;
 }
-static inline double* simcall_host_parallel_execute__get__communication_amount(smx_simcall_t simcall) {
+static inline double* simcall_host_parallel_execute__get__bytes_amount(smx_simcall_t simcall) {
   return (double*) simcall->args[4].dp;
 }
-static inline void simcall_host_parallel_execute__set__communication_amount(smx_simcall_t simcall, void* arg) {
+static inline void simcall_host_parallel_execute__set__bytes_amount(smx_simcall_t simcall, void* arg) {
     simcall->args[4].dp = arg;
 }
 static inline double simcall_host_parallel_execute__get__amount(smx_simcall_t simcall) {
@@ -1799,23 +1799,25 @@ static inline xbt_dict_t simcall_asr_get_properties__get__result(smx_simcall_t s
 static inline void simcall_asr_get_properties__set__result(smx_simcall_t simcall, void* result){
     simcall->result.dp = result;
 }
-#ifdef HAVE_LATENCY_BOUND_TRACKING
 
-static inline smx_synchro_t simcall_comm_is_latency_bounded__get__comm(smx_simcall_t simcall) {
-  return (smx_synchro_t) simcall->args[0].dp;
+static inline int simcall_mc_random__get__min(smx_simcall_t simcall) {
+  return  simcall->args[0].i;
 }
-static inline void simcall_comm_is_latency_bounded__set__comm(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_mc_random__set__min(smx_simcall_t simcall, int arg) {
+    simcall->args[0].i = arg;
 }
-static inline int simcall_comm_is_latency_bounded__get__result(smx_simcall_t simcall){
+static inline int simcall_mc_random__get__max(smx_simcall_t simcall) {
+  return  simcall->args[1].i;
+}
+static inline void simcall_mc_random__set__max(smx_simcall_t simcall, int arg) {
+    simcall->args[1].i = arg;
+}
+static inline int simcall_mc_random__get__result(smx_simcall_t simcall){
     return  simcall->result.i;
 }
-static inline void simcall_comm_is_latency_bounded__set__result(smx_simcall_t simcall, int result){
+static inline void simcall_mc_random__set__result(smx_simcall_t simcall, int result){
     simcall->result.i = result;
 }
-#endif
-
-#ifdef HAVE_TRACING
 
 static inline smx_synchro_t simcall_set_category__get__synchro(smx_simcall_t simcall) {
   return (smx_synchro_t) simcall->args[0].dp;
@@ -1829,6 +1831,20 @@ static inline const char* simcall_set_category__get__category(smx_simcall_t simc
 static inline void simcall_set_category__set__category(smx_simcall_t simcall, const char* arg) {
     simcall->args[1].cc = arg;
 }
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+
+static inline smx_synchro_t simcall_comm_is_latency_bounded__get__comm(smx_simcall_t simcall) {
+  return (smx_synchro_t) simcall->args[0].dp;
+}
+static inline void simcall_comm_is_latency_bounded__set__comm(smx_simcall_t simcall, void* arg) {
+    simcall->args[0].dp = arg;
+}
+static inline int simcall_comm_is_latency_bounded__get__result(smx_simcall_t simcall){
+    return  simcall->result.i;
+}
+static inline void simcall_comm_is_latency_bounded__set__result(smx_simcall_t simcall, int result){
+    simcall->result.i = result;
+}
 #endif
 
 #ifdef HAVE_MC
@@ -1858,25 +1874,6 @@ static inline int simcall_mc_compare_snapshots__get__result(smx_simcall_t simcal
 static inline void simcall_mc_compare_snapshots__set__result(smx_simcall_t simcall, int result){
     simcall->result.i = result;
 }
-
-static inline int simcall_mc_random__get__min(smx_simcall_t simcall) {
-  return  simcall->args[0].i;
-}
-static inline void simcall_mc_random__set__min(smx_simcall_t simcall, int arg) {
-    simcall->args[0].i = arg;
-}
-static inline int simcall_mc_random__get__max(smx_simcall_t simcall) {
-  return  simcall->args[1].i;
-}
-static inline void simcall_mc_random__set__max(smx_simcall_t simcall, int arg) {
-    simcall->args[1].i = arg;
-}
-static inline int simcall_mc_random__get__result(smx_simcall_t simcall){
-    return  simcall->result.i;
-}
-static inline void simcall_mc_random__set__result(smx_simcall_t simcall, int result){
-    simcall->result.i = result;
-}
 #endif
 
 
@@ -1930,16 +1927,12 @@ int simcall_HANDLER_file_move(smx_simcall_t simcall, smx_file_t fd, const char*
 sg_size_t simcall_HANDLER_storage_get_free_size(smx_simcall_t simcall, smx_storage_t storage);
 sg_size_t simcall_HANDLER_storage_get_used_size(smx_simcall_t simcall, smx_storage_t name);
 xbt_dict_t simcall_HANDLER_asr_get_properties(smx_simcall_t simcall, const char* name);
+int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max);
 #ifdef HAVE_LATENCY_BOUND_TRACKING
 
 #endif
 
-#ifdef HAVE_TRACING
-
-#endif
-
 #ifdef HAVE_MC
 mc_snapshot_t simcall_HANDLER_mc_snapshot(smx_simcall_t simcall);
 int simcall_HANDLER_mc_compare_snapshots(smx_simcall_t simcall, mc_snapshot_t s1, mc_snapshot_t s2);
-int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max);
 #endif