X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/28d7faa60b9789a70d99c922e163c4aa7de363de..954676b700e711f38ec4d286d33d5427d3f4ca46:/src/mc/mc_global.cpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index 3565626380..7ead3c543c 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -1,12 +1,15 @@ -/* 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 * under the terms of the license (GNU LGPL) which comes with this package. */ -#include -#include -#include +#include + +#include +#include +#include +#include #include "mc_base.h" @@ -190,11 +193,10 @@ int MC_deadlock_check() { if (mc_mode == MC_MODE_SERVER) { int res; - if ((res = MC_protocol_send_simple_message(mc_model_checker->process().socket, - MC_MESSAGE_DEADLOCK_CHECK))) + if ((res = mc_model_checker->process().send_message(MC_MESSAGE_DEADLOCK_CHECK))) xbt_die("Could not check deadlock state"); s_mc_int_message_t message; - ssize_t s = MC_receive_message(mc_model_checker->process().socket, &message, sizeof(message), 0); + ssize_t s = mc_model_checker->process().receive_message(message); if (s == -1) xbt_die("Could not receive message"); else if (s != sizeof(message) || message.type != MC_MESSAGE_DEADLOCK_CHECK_REPLY) { @@ -232,8 +234,6 @@ int MC_deadlock_check() */ void MC_replay(xbt_fifo_t stack) { - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - int value, count = 1; char *req_str; smx_simcall_t req = NULL, saved_req = NULL; @@ -250,7 +250,6 @@ void MC_replay(xbt_fifo_t stack) MC_restore_snapshot(state->system_state); if(_sg_mc_comms_determinism || _sg_mc_send_determinism) MC_restore_communications_pattern(state); - mmalloc_set_current_heap(std_heap); return; } } @@ -260,11 +259,8 @@ void MC_replay(xbt_fifo_t stack) MC_restore_snapshot(initial_global_state->snapshot); /* At the moment of taking the snapshot the raw heap was set, so restoring * it will set it back again, we have to unset it to continue */ - mmalloc_set_current_heap(std_heap); start_item = xbt_fifo_get_last_item(stack); - - mmalloc_set_current_heap(mc_heap); if (_sg_mc_comms_determinism || _sg_mc_send_determinism) { // int n = xbt_dynar_length(incomplete_communications_pattern); @@ -277,8 +273,6 @@ void MC_replay(xbt_fifo_t stack) } } - mmalloc_set_current_heap(std_heap); - /* Traverse the stack from the state at position start and re-execute the transitions */ for (item = start_item; item != xbt_fifo_get_first_item(stack); @@ -308,10 +302,8 @@ void MC_replay(xbt_fifo_t stack) MC_simcall_handle(req, value); - mmalloc_set_current_heap(mc_heap); if (_sg_mc_comms_determinism || _sg_mc_send_determinism) MC_handle_comm_pattern(call, req, value, NULL, 1); - mmalloc_set_current_heap(std_heap); MC_wait_for_requests(); @@ -325,14 +317,10 @@ void MC_replay(xbt_fifo_t stack) } XBT_DEBUG("**** End Replay ****"); - mmalloc_set_current_heap(heap); } void MC_replay_liveness(xbt_fifo_t stack) { - - initial_global_state->raw_mem_set = (mmalloc_get_current_heap() == mc_heap); - xbt_fifo_item_t item; mc_pair_t pair = NULL; mc_state_t state = NULL; @@ -348,7 +336,6 @@ void MC_replay_liveness(xbt_fifo_t stack) pair = (mc_pair_t) xbt_fifo_get_item_content(item); if(pair->graph_state->system_state){ MC_restore_snapshot(pair->graph_state->system_state); - mmalloc_set_current_heap(std_heap); return; } } @@ -356,11 +343,6 @@ void MC_replay_liveness(xbt_fifo_t stack) /* Restore the initial state */ MC_restore_snapshot(initial_global_state->snapshot); - /* At the moment of taking the snapshot the raw heap was set, so restoring - * it will set it back again, we have to unset it to continue */ - if (!initial_global_state->raw_mem_set) - mmalloc_set_current_heap(std_heap); - /* Traverse the stack from the initial state and re-execute the transitions */ for (item = xbt_fifo_get_last_item(stack); item != xbt_fifo_get_first_item(stack); @@ -402,12 +384,6 @@ void MC_replay_liveness(xbt_fifo_t stack) } XBT_DEBUG("**** End Replay ****"); - - if (initial_global_state->raw_mem_set) - mmalloc_set_current_heap(mc_heap); - else - mmalloc_set_current_heap(std_heap); - } /** @@ -417,23 +393,17 @@ void MC_replay_liveness(xbt_fifo_t stack) */ void MC_dump_stack_safety(xbt_fifo_t stack) { - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - MC_show_stack_safety(stack); mc_state_t state; - - mmalloc_set_current_heap(mc_heap); + while ((state = (mc_state_t) xbt_fifo_pop(stack)) != NULL) MC_state_delete(state, !state->in_visited_states ? 1 : 0); - mmalloc_set_current_heap(heap); } void MC_show_stack_safety(xbt_fifo_t stack) { - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - int value; mc_state_t state; xbt_fifo_item_t item; @@ -441,8 +411,8 @@ void MC_show_stack_safety(xbt_fifo_t stack) char *req_str = NULL; for (item = xbt_fifo_get_last_item(stack); - (item ? (state = (mc_state_t) (xbt_fifo_get_item_content(item))) - : (NULL)); item = xbt_fifo_get_prev_item(item)) { + item; item = xbt_fifo_get_prev_item(item)) { + state = (mc_state_t)xbt_fifo_get_item_content(item); req = MC_state_get_executed_request(state, &value); if (req) { req_str = MC_request_to_string(req, value, MC_REQUEST_EXECUTED); @@ -450,8 +420,6 @@ void MC_show_stack_safety(xbt_fifo_t stack) xbt_free(req_str); } } - - mmalloc_set_current_heap(heap); } void MC_show_deadlock(smx_simcall_t req) @@ -488,8 +456,8 @@ void MC_show_stack_liveness(xbt_fifo_t stack) char *req_str = NULL; for (item = xbt_fifo_get_last_item(stack); - (item ? (pair = (mc_pair_t) (xbt_fifo_get_item_content(item))) : (NULL)); - item = xbt_fifo_get_prev_item(item)) { + item; item = xbt_fifo_get_prev_item(item)) { + pair = (mc_pair_t) xbt_fifo_get_item_content(item); req = MC_state_get_executed_request(pair->graph_state, &value); if (req && req->call != SIMCALL_NONE) { req_str = MC_request_to_string(req, value, MC_REQUEST_EXECUTED); @@ -502,11 +470,9 @@ void MC_show_stack_liveness(xbt_fifo_t stack) void MC_dump_stack_liveness(xbt_fifo_t stack) { - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); mc_pair_t pair; while ((pair = (mc_pair_t) xbt_fifo_pop(stack)) != NULL) MC_pair_delete(pair); - mmalloc_set_current_heap(heap); } void MC_print_statistics(mc_stats_t stats) @@ -533,7 +499,6 @@ void MC_print_statistics(mc_stats_t stats) XBT_INFO("Visited pairs = %lu", stats->visited_pairs); } XBT_INFO("Executed transitions = %lu", stats->executed_transitions); - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); if ((_sg_mc_dot_output_file != NULL) && (_sg_mc_dot_output_file[0] != '\0')) { fprintf(dot_output, "}\n"); fclose(dot_output); @@ -543,75 +508,23 @@ void MC_print_statistics(mc_stats_t stats) if (_sg_mc_comms_determinism) XBT_INFO("Recv-deterministic : %s", !initial_global_state->recv_deterministic ? "No" : "Yes"); } - mmalloc_set_current_heap(heap); + if (getenv("SIMGRID_MC_SYSTEM_STATISTICS")){ + int ret=system("free"); + if(ret!=0)XBT_WARN("system call did not return 0, but %d",ret); + } } void MC_automaton_load(const char *file) { - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - if (_mc_property_automaton == NULL) _mc_property_automaton = xbt_automaton_new(); xbt_automaton_load(_mc_property_automaton, file); - mmalloc_set_current_heap(heap); -} - -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)) -{ - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - - 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); - mmalloc_set_current_heap(heap); -} - -void MC_automaton_new_propositional_symbol_pointer(const char *id, int* value) -{ - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - 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); - mmalloc_set_current_heap(heap); -} - -void MC_automaton_new_propositional_symbol_callback(const char* id, - xbt_automaton_propositional_symbol_callback_type callback, - void* data, xbt_automaton_propositional_symbol_free_function_type free_function) -{ - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - if (_mc_property_automaton == NULL) - _mc_property_automaton = xbt_automaton_new(); - xbt_automaton_propositional_symbol_t symbol = xbt_automaton_propositional_symbol_new_callback( - _mc_property_automaton, id, callback, data, free_function); - register_symbol(symbol); - mmalloc_set_current_heap(heap); } // TODO, fix cross-process access (this function is not used) void MC_dump_stacks(FILE* file) { - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - int nstack = 0; stack_region_t current_stack; unsigned cursor; @@ -632,7 +545,7 @@ void MC_dump_stacks(FILE* file) unw_get_reg(&c, UNW_X86_64_RIP, &rip); unw_get_reg(&c, UNW_X86_64_RSP, &rsp); fprintf(file, " %i: %s (RIP=0x%" PRIx64 " RSP=0x%" PRIx64 ")\n", - nframe, name, rip, rsp); + nframe, name, (std::uint64_t) rip, (std::uint64_t) rsp); #else fprintf(file, " %i: %s\n", nframe, name); #endif @@ -641,7 +554,6 @@ void MC_dump_stacks(FILE* file) ++nstack; } - mmalloc_set_current_heap(heap); } #endif