From 6845924a6746f86020c07fd2f8ce2e4c16a55ed2 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 11 Oct 2014 22:47:30 +0200 Subject: [PATCH] rename SIMIX_simcall_{pre,post} to SIMIX_simcall_{enter,exit} --- buildtools/Cmake/DefinePackages.cmake | 4 +- buildtools/Cmake/MaintainerMode.cmake | 6 +- doc/Doxyfile.in | 2 +- src/mc/mc_comm_determinism.c | 2 +- src/mc/mc_global.c | 6 +- src/mc/mc_liveness.c | 2 +- src/mc/mc_safety.c | 2 +- src/simix/simcalls.py | 10 +- src/simix/simcalls_generated_body.c | 246 +++++++++--------- src/simix/smx_global.c | 6 +- ...s_generated_case.c => smx_simcall_enter.c} | 6 +- src/simix/smx_smurf.c | 4 +- src/simix/smx_smurf_private.h | 4 +- 13 files changed, 154 insertions(+), 146 deletions(-) rename src/simix/{simcalls_generated_case.c => smx_simcall_enter.c} (99%) diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index b831f0195b..8cd8172570 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -31,7 +31,7 @@ set(EXTRA_DIST src/simix/simcalls.py src/simix/simcalls_generated_args_getter_setter.h src/simix/simcalls_generated_body.c - src/simix/simcalls_generated_case.c + src/simix/smx_simcall_enter.c src/simix/simcalls_generated_enum.h src/simix/simcalls_generated_res_getter_setter.h src/simix/simcalls_generated_string.c @@ -361,7 +361,7 @@ set(SURF_SRC ) set(SIMIX_GENERATED_SRC - src/simix/simcalls_generated_case.c + src/simix/smx_simcall_enter.c ) set(SIMIX_SRC src/simix/smx_context.c diff --git a/buildtools/Cmake/MaintainerMode.cmake b/buildtools/Cmake/MaintainerMode.cmake index ebc8ef797a..66f019028b 100644 --- a/buildtools/Cmake/MaintainerMode.cmake +++ b/buildtools/Cmake/MaintainerMode.cmake @@ -14,7 +14,7 @@ if(enable_maintainer_mode AND NOT WIN32) ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_string.c ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_res_getter_setter.h ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_args_getter_setter.h - ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_case.c + ${CMAKE_HOME_DIRECTORY}/src/simix/smx_simcall_enter.c ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_body.c DEPENDS @@ -32,12 +32,12 @@ if(enable_maintainer_mode AND NOT WIN32) ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_string.c ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_res_getter_setter.h ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_args_getter_setter.h - ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_case.c + ${CMAKE_HOME_DIRECTORY}/src/simix/smx_simcall_enter.c ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_body.c ) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES - "${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_enum.h;${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_string.c;${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_res_getter_setter.h;${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_args_getter_setter.h;${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_case.c;${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_body.c" + "${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_enum.h;${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_string.c;${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_res_getter_setter.h;${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_args_getter_setter.h;${CMAKE_HOME_DIRECTORY}/src/simix/smx_simcall_enter.c;${CMAKE_HOME_DIRECTORY}/src/simix/simcalls_generated_body.c" ) endif() endif() diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 0ec8546a23..6101f99f14 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -751,7 +751,7 @@ RECURSIVE = NO # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = @top_srcdir@/src/simix/simcalls_generated_case.c +EXCLUDE = # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded diff --git a/src/mc/mc_comm_determinism.c b/src/mc/mc_comm_determinism.c index cfbf3f32bb..1555981ab1 100644 --- a/src/mc/mc_comm_determinism.c +++ b/src/mc/mc_comm_determinism.c @@ -365,7 +365,7 @@ void MC_modelcheck_comm_determinism(void) } /* Answer the request */ - SIMIX_simcall_pre(req, value); /* After this call req is no longer usefull */ + SIMIX_simcall_enter(req, value); /* After this call req is no longer usefull */ MC_SET_MC_HEAP; current_pattern = !initial_global_state->initial_communications_pattern_done ? initial_communications_pattern : communications_pattern; diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index a97857f546..cdbec20437 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -481,7 +481,7 @@ void MC_wait_for_requests(void) xbt_dynar_foreach(simix_global->process_that_ran, iter, process) { req = &process->simcall; if (req->call != SIMCALL_NONE && !MC_request_is_visible(req)) - SIMIX_simcall_pre(req, 0); + SIMIX_simcall_enter(req, 0); } } } @@ -606,7 +606,7 @@ void MC_replay(xbt_fifo_t stack, int start) call = 4; } - SIMIX_simcall_pre(req, value); + SIMIX_simcall_enter(req, value); if (_sg_mc_comms_determinism || _sg_mc_send_determinism) { MC_SET_MC_HEAP; @@ -715,7 +715,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) } - SIMIX_simcall_pre(req, value); + SIMIX_simcall_enter(req, value); MC_wait_for_requests(); } diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index 4717fcd02c..15e552a416 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -391,7 +391,7 @@ void MC_modelcheck_liveness() mc_stats->executed_transitions++; /* Answer the request */ - SIMIX_simcall_pre(req, value); + SIMIX_simcall_enter(req, value); /* Wait for requests (schedules processes) */ MC_wait_for_requests(); diff --git a/src/mc/mc_safety.c b/src/mc/mc_safety.c index 6f671f2bdf..7807097581 100644 --- a/src/mc/mc_safety.c +++ b/src/mc/mc_safety.c @@ -141,7 +141,7 @@ void MC_modelcheck_safety(void) } /* Answer the request */ - SIMIX_simcall_pre(req, value); + SIMIX_simcall_enter(req, value); /* Wait for requests (schedules processes) */ MC_wait_for_requests(); diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py index 89de0a4d7e..0b12f49afc 100755 --- a/src/simix/simcalls.py +++ b/src/simix/simcalls.py @@ -167,7 +167,7 @@ class Simcall(object): SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } %s }'''%(self.res.ret() @@ -247,7 +247,8 @@ NUM_SIMCALLS write('simcalls_generated_args_getter_setter.h', Simcall.args_getter_setter, simcalls, simcalls_dict) - write('simcalls_generated_case.c', Simcall.case, simcalls, simcalls_dict,""" + write('smx_simcall_enter.c', Simcall.case, simcalls, simcalls_dict,""" + #include "smx_private.h" #ifdef HAVE_MC #include "mc/mc_private.h" @@ -255,7 +256,10 @@ NUM_SIMCALLS XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_smurf); -void SIMIX_simcall_pre(smx_simcall_t simcall, int value) +/** + * @brief unpack the simcall and activate the handler in kernel mode + */ +void SIMIX_simcall_enter(smx_simcall_t simcall, int value) { XBT_DEBUG("Handling simcall %p: %s", simcall, SIMIX_simcall_name(simcall->call)); SIMCALL_SET_MC_VALUE(simcall, value); diff --git a/src/simix/simcalls_generated_body.c b/src/simix/simcalls_generated_body.c index 1f509b5a38..d1e2a6da79 100644 --- a/src/simix/simcalls_generated_body.c +++ b/src/simix/simcalls_generated_body.c @@ -21,7 +21,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -41,7 +41,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.cc; } @@ -61,7 +61,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -81,7 +81,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -101,7 +101,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -121,7 +121,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -141,7 +141,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -161,7 +161,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.d; } @@ -181,7 +181,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.d; } @@ -201,7 +201,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -221,7 +221,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.d; } @@ -242,7 +242,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.d; } @@ -262,7 +262,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -283,7 +283,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -303,7 +303,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.d; } @@ -328,7 +328,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -354,7 +354,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -374,7 +374,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -394,7 +394,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -414,7 +414,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.d; } @@ -434,7 +434,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -455,7 +455,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -476,7 +476,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -498,7 +498,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -518,7 +518,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -538,7 +538,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -558,7 +558,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -579,7 +579,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -600,7 +600,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -621,7 +621,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -641,7 +641,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -661,7 +661,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -682,7 +682,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -702,7 +702,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -723,7 +723,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -745,7 +745,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -765,7 +765,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -785,7 +785,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -805,7 +805,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -825,7 +825,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -845,7 +845,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -865,7 +865,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -894,7 +894,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -914,7 +914,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -934,7 +934,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -954,7 +954,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -975,7 +975,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -995,7 +995,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -1015,7 +1015,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -1035,7 +1035,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -1055,7 +1055,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -1075,7 +1075,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -1095,7 +1095,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -1116,7 +1116,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -1136,7 +1136,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -1156,7 +1156,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.cc; } @@ -1176,7 +1176,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -1196,7 +1196,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -1217,7 +1217,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -1237,7 +1237,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -1259,7 +1259,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -1280,7 +1280,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -1300,7 +1300,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -1320,7 +1320,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -1340,7 +1340,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -1361,7 +1361,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.ui; } @@ -1381,7 +1381,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -1402,7 +1402,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -1422,7 +1422,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -1447,7 +1447,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -1476,7 +1476,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -1506,7 +1506,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -1533,7 +1533,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -1559,7 +1559,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -1579,7 +1579,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -1599,7 +1599,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -1620,7 +1620,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -1640,7 +1640,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -1660,7 +1660,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -1680,7 +1680,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.d; } @@ -1700,7 +1700,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -1720,7 +1720,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -1740,7 +1740,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -1760,7 +1760,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -1780,7 +1780,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -1800,7 +1800,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -1820,7 +1820,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -1840,7 +1840,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -1860,7 +1860,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -1880,7 +1880,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -1900,7 +1900,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -1920,7 +1920,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -1940,7 +1940,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -1961,7 +1961,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -1983,7 +1983,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -2003,7 +2003,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -2023,7 +2023,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -2043,7 +2043,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -2063,7 +2063,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -2083,7 +2083,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -2103,7 +2103,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -2124,7 +2124,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -2144,7 +2144,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -2166,7 +2166,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.sgsz; } @@ -2188,7 +2188,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.sgsz; } @@ -2209,7 +2209,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -2230,7 +2230,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -2251,7 +2251,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -2271,7 +2271,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.sgsz; } @@ -2291,7 +2291,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.sgsz; } @@ -2313,7 +2313,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -2333,7 +2333,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -2354,7 +2354,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -2374,7 +2374,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.sgsz; } @@ -2394,7 +2394,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.sgsz; } @@ -2414,7 +2414,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -2434,7 +2434,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -2454,7 +2454,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -2475,7 +2475,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -2499,7 +2499,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -2522,7 +2522,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.dp; } @@ -2543,7 +2543,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } @@ -2564,7 +2564,7 @@ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); SIMIX_process_yield(self); } else { - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } return self->simcall.result.i; } diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c index 3bb6bff54a..627075a227 100644 --- a/src/simix/smx_global.c +++ b/src/simix/smx_global.c @@ -394,7 +394,7 @@ void SIMIX_run(void) xbt_dynar_foreach(simix_global->process_that_ran, iter, process) { if (process->simcall.call != SIMCALL_NONE) { - SIMIX_simcall_pre(&process->simcall, 0); + SIMIX_simcall_enter(&process->simcall, 0); } } } @@ -420,13 +420,13 @@ void SIMIX_run(void) /* Wake up all processes waiting for a Surf action to finish */ xbt_dynar_foreach(model_list, iter, model) { while ((action = surf_model_extract_failed_action_set(model))) - SIMIX_simcall_post((smx_action_t) surf_action_get_data(action)); + SIMIX_simcall_exit((smx_action_t) surf_action_get_data(action)); while ((action = surf_model_extract_done_action_set(model))) if (surf_action_get_data(action) == NULL) XBT_DEBUG("probably vcpu's action %p, skip", action); else - SIMIX_simcall_post((smx_action_t) surf_action_get_data(action)); + SIMIX_simcall_exit((smx_action_t) surf_action_get_data(action)); } /* Autorestart all process */ diff --git a/src/simix/simcalls_generated_case.c b/src/simix/smx_simcall_enter.c similarity index 99% rename from src/simix/simcalls_generated_case.c rename to src/simix/smx_simcall_enter.c index dd2f3cf88a..71abd9122a 100644 --- a/src/simix/simcalls_generated_case.c +++ b/src/simix/smx_simcall_enter.c @@ -6,6 +6,7 @@ *********************************************/ + #include "smx_private.h" #ifdef HAVE_MC #include "mc/mc_private.h" @@ -13,7 +14,10 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_smurf); -void SIMIX_simcall_pre(smx_simcall_t simcall, int value) +/** + * @brief unpack the simcall and activate the handler in kernel mode + */ +void SIMIX_simcall_enter(smx_simcall_t simcall, int value) { XBT_DEBUG("Handling simcall %p: %s", simcall, SIMIX_simcall_name(simcall->call)); SIMCALL_SET_MC_VALUE(simcall, value); diff --git a/src/simix/smx_smurf.c b/src/simix/smx_smurf.c index b08b0b4dfc..2b65704c34 100644 --- a/src/simix/smx_smurf.c +++ b/src/simix/smx_smurf.c @@ -34,7 +34,7 @@ void SIMIX_simcall_push(smx_process_t self) SIMIX_process_yield(self); } else { XBT_DEBUG("I'm the maestro, execute the simcall directly"); - SIMIX_simcall_pre(&self->simcall, 0); + SIMIX_simcall_enter(&self->simcall, 0); } } @@ -53,7 +53,7 @@ void SIMIX_simcall_answer(smx_simcall_t simcall) } } -void SIMIX_simcall_post(smx_action_t action) +void SIMIX_simcall_exit(smx_action_t action) { switch (action->type) { diff --git a/src/simix/smx_smurf_private.h b/src/simix/smx_smurf_private.h index 5b07a129db..bc10372c18 100644 --- a/src/simix/smx_smurf_private.h +++ b/src/simix/smx_smurf_private.h @@ -83,8 +83,8 @@ typedef struct s_smx_simcall { void SIMIX_simcall_push(smx_process_t self); void SIMIX_simcall_answer(smx_simcall_t); -void SIMIX_simcall_pre(smx_simcall_t, int); -void SIMIX_simcall_post(smx_action_t); +void SIMIX_simcall_enter(smx_simcall_t, int); +void SIMIX_simcall_exit(smx_action_t); smx_simcall_t SIMIX_simcall_mine(void); const char *SIMIX_simcall_name(e_smx_simcall_t kind); //TOFIX put it in a better place -- 2.20.1