X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ab1a5770e72e90720fb1f2dc0901cda2573b208b..bae076147bfc88ce8607f15761149f42d0443585:/src/mc/mc_global.cpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index 5440a688e3..86039ca696 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2014. The SimGrid Team. +/* Copyright (c) 2008-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ #include #include #include "../xbt/mmalloc/mmprivate.h" -#include "mc_object_info.h" +#include "mc_dwarf.hpp" #include "mc_comm_pattern.h" #include "mc_request.h" #include "mc_safety.h" @@ -517,38 +517,6 @@ void MC_automaton_load(const char *file) xbt_automaton_load(_mc_property_automaton, file); } -static void register_symbol(xbt_automaton_propositional_symbol_t symbol) -{ - if (mc_mode != MC_MODE_CLIENT) - return; - s_mc_register_symbol_message_t message; - message.type = MC_MESSAGE_REGISTER_SYMBOL; - const char* name = xbt_automaton_propositional_symbol_get_name(symbol); - if (strlen(name) + 1 > sizeof(message.name)) - xbt_die("Symbol is too long"); - strncpy(message.name, name, sizeof(message.name)); - message.callback = xbt_automaton_propositional_symbol_get_callback(symbol); - message.data = xbt_automaton_propositional_symbol_get_data(symbol); - MC_client_send_message(&message, sizeof(message)); -} - -void MC_automaton_new_propositional_symbol(const char *id, int(*fct)(void)) -{ - if (_mc_property_automaton == NULL) - _mc_property_automaton = xbt_automaton_new(); - - xbt_automaton_propositional_symbol_t symbol = xbt_automaton_propositional_symbol_new(_mc_property_automaton, id, fct); - register_symbol(symbol); -} - -void MC_automaton_new_propositional_symbol_pointer(const char *id, int* value) -{ - if (_mc_property_automaton == NULL) - _mc_property_automaton = xbt_automaton_new(); - xbt_automaton_propositional_symbol_t symbol = xbt_automaton_propositional_symbol_new_pointer(_mc_property_automaton, id, value); - register_symbol(symbol); -} - // TODO, fix cross-process access (this function is not used) void MC_dump_stacks(FILE* file) {