X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/539916de848562683cf2e5425d5160c2a43f135a..638d55dcb8d944f7c74127725f1acb7b8e1449de:/src/simix/popping_generated.c diff --git a/src/simix/popping_generated.c b/src/simix/popping_generated.c index e4cc8a5a21..9f8e55c92f 100644 --- a/src/simix/popping_generated.c +++ b/src/simix/popping_generated.c @@ -15,7 +15,7 @@ #include "smx_private.h" #ifdef HAVE_MC -#include "mc/mc_private.h" +#include "mc/mc_process.h" #endif XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping); @@ -140,18 +140,15 @@ const char* simcall_names[] = { [SIMCALL_STORAGE_GET_PROPERTIES] = "SIMCALL_STORAGE_GET_PROPERTIES", [SIMCALL_STORAGE_GET_CONTENT] = "SIMCALL_STORAGE_GET_CONTENT", [SIMCALL_ASR_GET_PROPERTIES] = "SIMCALL_ASR_GET_PROPERTIES", + [SIMCALL_MC_RANDOM] = "SIMCALL_MC_RANDOM", + [SIMCALL_SET_CATEGORY] = "SIMCALL_SET_CATEGORY", #ifdef HAVE_LATENCY_BOUND_TRACKING [SIMCALL_COMM_IS_LATENCY_BOUNDED] = "SIMCALL_COMM_IS_LATENCY_BOUNDED", #endif -#ifdef HAVE_TRACING - [SIMCALL_SET_CATEGORY] = "SIMCALL_SET_CATEGORY", -#endif - #ifdef HAVE_MC [SIMCALL_MC_SNAPSHOT] = "SIMCALL_MC_SNAPSHOT", [SIMCALL_MC_COMPARE_SNAPSHOTS] = "SIMCALL_MC_COMPARE_SNAPSHOTS", - [SIMCALL_MC_RANDOM] = "SIMCALL_MC_RANDOM", #endif [SIMCALL_NONE] = "NONE" }; @@ -163,6 +160,11 @@ const char* simcall_names[] = { */ void SIMIX_simcall_handle(smx_simcall_t simcall, int value) { XBT_DEBUG("Handling simcall %p: %s", simcall, SIMIX_simcall_name(simcall->call)); + #ifdef HAVE_MC + if (mc_model_checker) { + MC_invalidate_cache(); + } + #endif SIMCALL_SET_MC_VALUE(simcall, value); if (simcall->issuer->context->iwannadie && simcall->call != SIMCALL_PROCESS_CLEANUP) return; @@ -738,20 +740,22 @@ case SIMCALL_ASR_GET_PROPERTIES: SIMIX_simcall_answer(simcall); break; -#ifdef HAVE_LATENCY_BOUND_TRACKING -case SIMCALL_COMM_IS_LATENCY_BOUNDED: - simcall->result.i = SIMIX_comm_is_latency_bounded((smx_synchro_t) simcall->args[0].dp); +case SIMCALL_MC_RANDOM: + simcall->result.i = simcall_HANDLER_mc_random(simcall , simcall->args[0].i, simcall->args[1].i); SIMIX_simcall_answer(simcall); break; -#endif - -#ifdef HAVE_TRACING case SIMCALL_SET_CATEGORY: SIMIX_set_category((smx_synchro_t) simcall->args[0].dp, simcall->args[1].cc); SIMIX_simcall_answer(simcall); break; +#ifdef HAVE_LATENCY_BOUND_TRACKING +case SIMCALL_COMM_IS_LATENCY_BOUNDED: + simcall->result.i = SIMIX_comm_is_latency_bounded((smx_synchro_t) simcall->args[0].dp); + SIMIX_simcall_answer(simcall); + break; + #endif #ifdef HAVE_MC @@ -765,11 +769,6 @@ case SIMCALL_MC_COMPARE_SNAPSHOTS: SIMIX_simcall_answer(simcall); break; -case SIMCALL_MC_RANDOM: - simcall->result.i = simcall_HANDLER_mc_random(simcall , simcall->args[0].i, simcall->args[1].i); - SIMIX_simcall_answer(simcall); - break; - #endif case NUM_SIMCALLS: break;