From d896265a56dbf34328e32566da1932835d840d27 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Fri, 24 Jul 2015 13:05:15 +0200 Subject: [PATCH] [mc] Do not trigger errors in MC_automaton_new_propositional_symbol() when MC is disabled --- src/mc/mc_client_api.cpp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/mc/mc_client_api.cpp b/src/mc/mc_client_api.cpp index 1605801137..c80d9dd3ec 100644 --- a/src/mc/mc_client_api.cpp +++ b/src/mc/mc_client_api.cpp @@ -61,17 +61,23 @@ void MC_cut(void) void MC_ignore(void* addr, size_t size) { - if (mc_mode == MC_MODE_CLIENT) { - s_mc_ignore_memory_message_t message; - message.type = MC_MESSAGE_IGNORE_MEMORY; - message.addr = (std::uintptr_t) addr; - message.size = size; - MC_client_send_message(&message, sizeof(message)); - } + xbt_assert(mc_mode != MC_MODE_SERVER); + if (mc_mode != MC_MODE_CLIENT) + return; + + s_mc_ignore_memory_message_t message; + message.type = MC_MESSAGE_IGNORE_MEMORY; + message.addr = (std::uintptr_t) addr; + message.size = size; + MC_client_send_message(&message, sizeof(message)); } void MC_automaton_new_propositional_symbol(const char *id, int(*fct)(void)) { + xbt_assert(mc_mode != MC_MODE_SERVER); + if (mc_mode != MC_MODE_CLIENT) + return; + xbt_die("Support for client-side function proposition is not implemented: " "use MC_automaton_new_propositional_symbol_pointer instead." ); @@ -82,6 +88,7 @@ void MC_automaton_new_propositional_symbol_pointer(const char *name, int* value) xbt_assert(mc_mode != MC_MODE_SERVER); if (mc_mode != MC_MODE_CLIENT) return; + s_mc_register_symbol_message_t message; message.type = MC_MESSAGE_REGISTER_SYMBOL; if (strlen(name) + 1 > sizeof(message.name)) -- 2.20.1