X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c8880fd8bfe302109bdec0629929499479d714b0..cf9a823f1cfd8b0098a039bff8ff6567e9beac91:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index dbdbc7cc6d..3b1367023b 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -4,32 +4,55 @@ /* 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 "mc_base.h" + +#ifndef _XBT_WIN32 #include -#include #include #include -#include -#include +#endif #include "simgrid/sg_config.h" #include "../surf/surf_private.h" #include "../simix/smx_private.h" -#include "../xbt/mmalloc/mmprivate.h" #include "xbt/fifo.h" -#include "mc_private.h" #include "xbt/automaton.h" #include "xbt/dict.h" -XBT_LOG_NEW_CATEGORY(mc, "All MC categories"); +#ifdef HAVE_MC +#include + +#include "../xbt/mmalloc/mmprivate.h" +#include "mc_object_info.h" +#include "mc_comm_pattern.h" +#include "mc_request.h" +#include "mc_safety.h" +#include "mc_memory_map.h" +#include "mc_snapshot.h" +#include "mc_liveness.h" +#include "mc_private.h" +#include "mc_unw.h" +#endif +#include "mc_record.h" +#include "mc_protocol.h" +#include "mc_client.h" + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)"); +e_mc_mode_t mc_mode; + +double *mc_time = NULL; + +#ifdef HAVE_MC int user_max_depth_reached = 0; /* MC global data structures */ mc_state_t mc_current_state = NULL; char mc_replay_mode = FALSE; -double *mc_time = NULL; + __thread mc_comparison_times_t mc_comp_times = NULL; __thread double mc_snapshot_comparison_time; mc_stats_t mc_stats = NULL; @@ -39,14 +62,6 @@ xbt_fifo_t mc_stack = NULL; /* Liveness */ xbt_automaton_t _mc_property_automaton = NULL; -/* Variables */ -mc_object_info_t mc_libsimgrid_info = NULL; -mc_object_info_t mc_binary_info = NULL; - -mc_object_info_t mc_object_infos[2] = { NULL, NULL }; - -size_t mc_object_infos_size = 2; - /* Dot output */ FILE *dot_output = NULL; const char *colors[13]; @@ -84,32 +99,41 @@ static void MC_init_dot_output() } -static void MC_init_debug_info(void) -{ - XBT_INFO("Get debug information ..."); - - memory_map_t maps = MC_get_memory_map(); - - /* Get local variables for state equality detection */ - mc_binary_info = MC_find_object_info(maps, xbt_binary_name, 1); - mc_object_infos[0] = mc_binary_info; - - mc_libsimgrid_info = MC_find_object_info(maps, libsimgrid_path, 0); - mc_object_infos[1] = mc_libsimgrid_info; - - // Use information of the other objects: - MC_post_process_object_info(mc_binary_info); - MC_post_process_object_info(mc_libsimgrid_info); +mc_model_checker_t mc_model_checker = NULL; - MC_free_memory_map(maps); - XBT_INFO("Get debug information done !"); +mc_model_checker_t MC_model_checker_new(pid_t pid, int socket) +{ + mc_model_checker_t mc = xbt_new0(s_mc_model_checker_t, 1); + mc->pages = mc_pages_store_new(); + mc->fd_clear_refs = -1; + mc->fd_pagemap = -1; + MC_process_init(&mc->process, pid, socket); + return mc; } - -mc_model_checker_t mc_model_checker = NULL; +void MC_model_checker_delete(mc_model_checker_t mc) +{ + mc_pages_store_delete(mc->pages); + if(mc->record) + xbt_dynar_free(&mc->record); + MC_process_clear(&mc->process); +} void MC_init() { + MC_init_pid(getpid(), -1); +} + +void MC_init_pid(pid_t pid, int socket) +{ + if (mc_mode == MC_MODE_NONE) { + if (getenv(MC_ENV_SOCKET_FD)) { + mc_mode = MC_MODE_CLIENT; + } else { + mc_mode = MC_MODE_STANDALONE; + } + } + int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); mc_time = xbt_new0(double, simix_process_maxpid); @@ -119,10 +143,7 @@ void MC_init() MC_SET_MC_HEAP; - mc_model_checker = xbt_new0(s_mc_model_checker_t, 1); - mc_model_checker->pages = mc_pages_store_new(); - mc_model_checker->fd_clear_refs = -1; - mc_model_checker->fd_pagemap = -1; + mc_model_checker = MC_model_checker_new(pid, socket); mc_comp_times = xbt_new0(s_mc_comparison_times_t, 1); @@ -130,9 +151,6 @@ void MC_init() mc_stats = xbt_new0(s_mc_stats_t, 1); mc_stats->state_size = 1; - MC_init_memory_map_info(); - MC_init_debug_info(); /* FIXME : get debug information only if liveness verification or visited state reduction */ - if ((_sg_mc_dot_output_file != NULL) && (_sg_mc_dot_output_file[0] != '\0')) MC_init_dot_output(); @@ -160,38 +178,49 @@ void MC_init() /* Ignore local variable about time used for tracing */ MC_ignore_local_variable("start_time", "*"); + /* Main MC state: */ MC_ignore_global_variable("mc_model_checker"); + MC_ignore_global_variable("communications_pattern"); + MC_ignore_global_variable("initial_communications_pattern"); + MC_ignore_global_variable("incomplete_communications_pattern"); - // Mot of those things could be moved into mc_model_checker: - MC_ignore_global_variable("compared_pointers"); + /* MC __thread variables: */ + MC_ignore_global_variable("mc_diff_info"); MC_ignore_global_variable("mc_comp_times"); MC_ignore_global_variable("mc_snapshot_comparison_time"); + + /* This MC state is used in MC replay as well: */ MC_ignore_global_variable("mc_time"); - MC_ignore_global_variable("smpi_current_rank"); - MC_ignore_global_variable("counter"); /* Static variable used for tracing */ - MC_ignore_global_variable("maestro_stack_start"); - MC_ignore_global_variable("maestro_stack_end"); - MC_ignore_global_variable("smx_total_comms"); - MC_ignore_global_variable("communications_pattern"); - MC_ignore_global_variable("initial_communications_pattern"); - MC_ignore_global_variable("incomplete_communications_pattern"); - if (MC_is_active()) { - MC_ignore_global_variable("mc_diff_info"); - } + /* Static variable used for tracing */ + MC_ignore_global_variable("counter"); + + /* SIMIX */ + MC_ignore_global_variable("smx_total_comms"); MC_ignore_heap(mc_time, simix_process_maxpid * sizeof(double)); smx_process_t process; - xbt_swag_foreach(process, simix_global->process_list) { - MC_ignore_heap(&(process->process_hookup), - sizeof(process->process_hookup)); - } + // FIXME, cross-process support (simix_global->process_list) + + if (mc_mode == MC_MODE_STANDALONE || mc_mode == MC_MODE_CLIENT) { + xbt_swag_foreach(process, simix_global->process_list) { + MC_ignore_heap(&(process->process_hookup), + sizeof(process->process_hookup)); + } + } else { + // TODO + } } if (raw_mem_set) MC_SET_MC_HEAP; + if (mc_mode == MC_MODE_CLIENT) { + // This will move somehwere else: + MC_client_handle_messages(); + } + } /******************************* Core of MC *******************************/ @@ -322,38 +351,6 @@ void MC_exit(void) //xbt_abort(); } -int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max) -{ - - return simcall->mc_value; -} - - -int MC_random(int min, int max) -{ - /*FIXME: return mc_current_state->executed_transition->random.value; */ - return simcall_mc_random(min, max); -} - -/** - * \brief Schedules all the process that are ready to run - */ -void MC_wait_for_requests(void) -{ - smx_process_t process; - smx_simcall_t req; - unsigned int iter; - - while (!xbt_dynar_is_empty(simix_global->process_to_run)) { - SIMIX_process_runall(); - xbt_dynar_foreach(simix_global->process_that_ran, iter, process) { - req = &process->simcall; - if (req->call != SIMCALL_NONE && !MC_request_is_visible(req)) - SIMIX_simcall_handle(req, 0); - } - } -} - int MC_deadlock_check() { int deadlock = FALSE; @@ -400,6 +397,13 @@ void mc_update_comm_pattern(mc_call_type call_type, smx_simcall_t req, int value * a given model-checker stack. * \param stack The stack with the transitions to execute. * \param start Start index to begin the re-execution. + * + * If start==-1, restore the initial state and replay the actions the + * the transitions in the stack. + * + * Otherwise, we only replay a part of the transitions of the stacks + * without restoring the state: it is assumed that the current state + * match with the transitions to execute. */ void MC_replay(xbt_fifo_t stack, int start) { @@ -455,7 +459,6 @@ void MC_replay(xbt_fifo_t stack, int start) MC_SET_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); @@ -759,6 +762,7 @@ void MC_assert(int prop) XBT_INFO("*** PROPERTY NOT VALID ***"); XBT_INFO("**************************"); XBT_INFO("Counter-example execution trace:"); + MC_record_dump_path(mc_stack); MC_dump_stack_safety(mc_stack); MC_print_statistics(mc_stats); xbt_abort(); @@ -770,23 +774,6 @@ void MC_cut(void) user_max_depth_reached = 1; } -void MC_process_clock_add(smx_process_t process, double amount) -{ - mc_time[process->pid] += amount; -} - -double MC_process_clock_get(smx_process_t process) -{ - if (mc_time) { - if (process != NULL) - return mc_time[process->pid]; - else - return -1; - } else { - return 0; - } -} - void MC_automaton_load(const char *file) { @@ -824,3 +811,51 @@ void MC_automaton_new_propositional_symbol(const char *id, void *fct) MC_SET_MC_HEAP; } + +void MC_dump_stacks(FILE* file) +{ + int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); + MC_SET_MC_HEAP; + + int nstack = 0; + stack_region_t current_stack; + unsigned cursor; + xbt_dynar_foreach(stacks_areas, cursor, current_stack) { + unw_context_t * context = (unw_context_t *)current_stack->context; + fprintf(file, "Stack %i:\n", nstack); + + int nframe = 0; + char buffer[100]; + unw_cursor_t c; + unw_init_local (&c, context); + unw_word_t off; + do { + const char * name = !unw_get_proc_name(&c, buffer, 100, &off) ? buffer : "?"; + fprintf(file, " %i: %s\n", nframe, name); + ++nframe; + } while(unw_step(&c)); + + ++nstack; + } + + if (raw_mem_set) + MC_SET_MC_HEAP; +} +#endif + +double MC_process_clock_get(smx_process_t process) +{ + if (mc_time) { + if (process != NULL) + return mc_time[process->pid]; + else + return -1; + } else { + return 0; + } +} + +void MC_process_clock_add(smx_process_t process, double amount) +{ + mc_time[process->pid] += amount; +}