X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/63c371bbca5afccc4708761d83af6fc2443ca553..49b1303645f1ec4a07a561ce1e747a094cfb86d0:/src/mc/mc_client_api.cpp diff --git a/src/mc/mc_client_api.cpp b/src/mc/mc_client_api.cpp index 7fd76d2e87..fee19b6d45 100644 --- a/src/mc/mc_client_api.cpp +++ b/src/mc/mc_client_api.cpp @@ -4,8 +4,8 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include -#include +#include "xbt/log.h" +#include "xbt/sysdep.h" #include #include "src/mc/ModelChecker.hpp" @@ -29,14 +29,14 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client_api, mc, void MC_assert(int prop) { xbt_assert(mc_model_checker == nullptr); - if (MC_is_active() && !prop) + if (MC_is_active() && not prop) simgrid::mc::Client::get()->reportAssertionFailure(); } -void MC_cut(void) +void MC_cut() { xbt_assert(mc_model_checker == nullptr); - if (!MC_is_active()) + if (not MC_is_active()) return; // FIXME, We want to do this in the model-checker: xbt_die("MC_cut() not implemented"); @@ -45,15 +45,15 @@ void MC_cut(void) void MC_ignore(void* addr, size_t size) { xbt_assert(mc_model_checker == nullptr); - if (!MC_is_active()) + if (not MC_is_active()) return; simgrid::mc::Client::get()->ignoreMemory(addr, size); } -void MC_automaton_new_propositional_symbol(const char *id, int(*fct)(void)) +void MC_automaton_new_propositional_symbol(const char* id, int (*fct)()) { xbt_assert(mc_model_checker == nullptr); - if (!MC_is_active()) + if (not MC_is_active()) return; xbt_die("Support for client-side function proposition is not implemented: " "use MC_automaton_new_propositional_symbol_pointer instead."); @@ -62,34 +62,34 @@ void MC_automaton_new_propositional_symbol(const char *id, int(*fct)(void)) void MC_automaton_new_propositional_symbol_pointer(const char *name, int* value) { xbt_assert(mc_model_checker == nullptr); - if (!MC_is_active()) + if (not MC_is_active()) return; simgrid::mc::Client::get()->declareSymbol(name, value); } /** @brief Register a stack in the model checker * - * The stacks are allocated in the heap. The MC handle them especially + * The stacks are allocated in the heap. The MC handle them specifically * when we analyze/compare the content of the heap so it must be told where * they are with this function. * - * @param stack - * @param process Process owning the stack - * @param context + * @param stack Where the stack is + * @param actor Actor owning the stack + * @param context The context associated to that stack * @param size Size of the stack */ -void MC_register_stack_area(void *stack, smx_actor_t process, ucontext_t* context, size_t size) +void MC_register_stack_area(void* stack, smx_actor_t actor, ucontext_t* context, size_t size) { xbt_assert(mc_model_checker == nullptr); - if (!MC_is_active()) + if (not MC_is_active()) return; - simgrid::mc::Client::get()->declareStack(stack, size, process, context); + simgrid::mc::Client::get()->declareStack(stack, size, actor, context); } void MC_ignore_global_variable(const char *name) { xbt_assert(mc_model_checker == nullptr); - if (!MC_is_active()) + if (not MC_is_active()) return; // TODO, send a message to the model_checker xbt_die("Unimplemented"); @@ -98,15 +98,15 @@ void MC_ignore_global_variable(const char *name) void MC_ignore_heap(void *address, size_t size) { xbt_assert(mc_model_checker == nullptr); - if (!MC_is_active()) + if (not MC_is_active()) return; simgrid::mc::Client::get()->ignoreHeap(address, size); } -void MC_remove_ignore_heap(void *address, size_t size) +void MC_unignore_heap(void* address, size_t size) { xbt_assert(mc_model_checker == nullptr); - if (!MC_is_active()) + if (not MC_is_active()) return; simgrid::mc::Client::get()->unignoreHeap(address, size); }