From 52fd4a51d500956bc7103d0f778b765bcdef2948 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Fri, 24 Jul 2015 13:09:09 +0200 Subject: [PATCH 1/1] [mc] Move MC_random() in mc_client_api.cpp --- src/mc/mc_base.cpp | 6 ------ src/mc/mc_client_api.cpp | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index bc0e31470c..c0f9ab9f14 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -177,12 +177,6 @@ int MC_request_is_visible(smx_simcall_t req) ; } -int MC_random(int min, int max) -{ - /*FIXME: return mc_current_state->executed_transition->random.value; */ - return simcall_mc_random(min, max); -} - static int prng_random(int min, int max) { unsigned long output_size = ((unsigned long) max - (unsigned long) min) + 1; diff --git a/src/mc/mc_client_api.cpp b/src/mc/mc_client_api.cpp index c80d9dd3ec..cac60bcd61 100644 --- a/src/mc/mc_client_api.cpp +++ b/src/mc/mc_client_api.cpp @@ -28,6 +28,14 @@ extern "C" { XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client_api, mc, "Public API for the model-checked application"); +int MC_random(int min, int max) +{ + xbt_assert(mc_mode != MC_MODE_SERVER); + // TODO, if the MC is disabled we do not really need to make a simcall for this :) + /* FIXME: return mc_current_state->executed_transition->random.value; */ + return simcall_mc_random(min, max); +} + void MC_assert(int prop) { if (MC_is_active() && !prop) { -- 2.20.1