X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/49514a74128a35ed4c0ba6dc190d70d35dd9fd7a..fe9ec44b78f1d4b5a89db951d025bb33d0cd73d1:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index 4614ac9c77..178fee19eb 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -4,35 +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 - -#define UNW_LOCAL_ONLY -#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 "mc_record.h" #include "xbt/automaton.h" #include "xbt/dict.h" +#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; @@ -42,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]; @@ -87,47 +99,21 @@ static void MC_init_dot_output() } -static void MC_init_debug_info(void) +void MC_init() { - 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_free_memory_map(maps); - XBT_INFO("Get debug information done !"); + MC_init_pid(getpid(), -1); } - -mc_model_checker_t mc_model_checker = NULL; - -mc_model_checker_t MC_model_checker_new() +void MC_init_pid(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; - return mc; -} - -void MC_model_checker_delete(mc_model_checker_t mc) { - mc_pages_store_delete(mc->pages); - if(mc->record) - xbt_dynar_free(&mc->record); -} + if (mc_mode == MC_MODE_NONE) { + if (getenv(MC_ENV_SOCKET_FD)) { + mc_mode = MC_MODE_CLIENT; + } else { + mc_mode = MC_MODE_STANDALONE; + } + } -void MC_init() -{ int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); mc_time = xbt_new0(double, simix_process_maxpid); @@ -137,7 +123,7 @@ void MC_init() MC_SET_MC_HEAP; - mc_model_checker = MC_model_checker_new(); + mc_model_checker = MC_model_checker_new(pid, socket); mc_comp_times = xbt_new0(s_mc_comparison_times_t, 1); @@ -145,9 +131,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(); @@ -175,35 +158,44 @@ 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"); - - // Mot of those things could be moved into mc_model_checker: - MC_ignore_global_variable("compared_pointers"); - MC_ignore_global_variable("mc_comp_times"); - MC_ignore_global_variable("mc_snapshot_comparison_time"); - 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"); + + /* 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"); - MC_ignore_heap(mc_time, simix_process_maxpid * sizeof(double)); + /* This MC state is used in MC replay as well: */ + MC_ignore_global_variable("mc_time"); - smx_process_t process; - xbt_swag_foreach(process, simix_global->process_list) { - MC_ignore_heap(&(process->process_hookup), - sizeof(process->process_hookup)); - } + /* Static variable used for tracing */ + MC_ignore_global_variable("counter"); + + /* SIMIX */ + MC_ignore_global_variable("smx_total_comms"); + + if (mc_mode == MC_MODE_STANDALONE || mc_mode == MC_MODE_CLIENT) { + 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)); + } + } } 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 *******************************/ @@ -738,42 +730,6 @@ void MC_print_statistics(mc_stats_t stats) mmalloc_set_current_heap(previous_heap); } -void MC_assert(int prop) -{ - if (MC_is_active() && !prop) { - XBT_INFO("**************************"); - 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(); - } -} - -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) { @@ -841,3 +797,21 @@ void MC_dump_stacks(FILE* file) 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; +}