X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/56f5a23d5d25cb404de3326bc2128ac64bff2ad5..e0300cbd373040c590de77e64cc6c6e5fc3c28bb:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index cdbec20437..c867495992 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -4,164 +4,57 @@ /* 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"); -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, - "Logging specific to MC (global)"); - -/* Configuration support */ -e_mc_reduce_t mc_reduce_kind = e_mc_reduce_unset; - -int _sg_do_model_check = 0; -int _sg_mc_checkpoint = 0; -int _sg_mc_sparse_checkpoint = 0; -int _sg_mc_soft_dirty = 0; -char *_sg_mc_property_file = NULL; -int _sg_mc_timeout = 0; -int _sg_mc_hash = 0; -int _sg_mc_max_depth = 1000; -int _sg_mc_visited = 0; -char *_sg_mc_dot_output_file = NULL; -int _sg_mc_comms_determinism = 0; -int _sg_mc_send_determinism = 0; -int _sg_mc_safety = 0; -int _sg_mc_liveness = 0; - -int user_max_depth_reached = 0; - -void _mc_cfg_cb_reduce(const char *name, int pos) -{ - if (_sg_cfg_init_status && !_sg_do_model_check) { - xbt_die - ("You are specifying a reduction strategy after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); - } - char *val = xbt_cfg_get_string(_sg_cfg_set, name); - if (!strcasecmp(val, "none")) { - mc_reduce_kind = e_mc_reduce_none; - } else if (!strcasecmp(val, "dpor")) { - mc_reduce_kind = e_mc_reduce_dpor; - } else { - xbt_die("configuration option %s can only take 'none' or 'dpor' as a value", - name); - } -} - -void _mc_cfg_cb_checkpoint(const char *name, int pos) -{ - if (_sg_cfg_init_status && !_sg_do_model_check) { - xbt_die - ("You are specifying a checkpointing value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); - } - _sg_mc_checkpoint = xbt_cfg_get_int(_sg_cfg_set, name); -} - -void _mc_cfg_cb_sparse_checkpoint(const char *name, int pos) { - if (_sg_cfg_init_status && !_sg_do_model_check) { - xbt_die("You are specifying a checkpointing value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); - } - _sg_mc_sparse_checkpoint = xbt_cfg_get_boolean(_sg_cfg_set, name); -} - -void _mc_cfg_cb_soft_dirty(const char *name, int pos) { - if (_sg_cfg_init_status && !_sg_do_model_check) { - xbt_die("You are specifying a soft dirty value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); - } - _sg_mc_soft_dirty = xbt_cfg_get_boolean(_sg_cfg_set, name); -} - -void _mc_cfg_cb_property(const char *name, int pos) -{ - if (_sg_cfg_init_status && !_sg_do_model_check) { - xbt_die - ("You are specifying a property after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); - } - _sg_mc_property_file = xbt_cfg_get_string(_sg_cfg_set, name); -} - -void _mc_cfg_cb_timeout(const char *name, int pos) -{ - if (_sg_cfg_init_status && !_sg_do_model_check) { - xbt_die - ("You are specifying a value to enable/disable timeout for wait requests after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); - } - _sg_mc_timeout = xbt_cfg_get_boolean(_sg_cfg_set, name); -} - -void _mc_cfg_cb_hash(const char *name, int pos) -{ - if (_sg_cfg_init_status && !_sg_do_model_check) { - xbt_die - ("You are specifying a value to enable/disable the use of global hash to speedup state comparaison, but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); - } - _sg_mc_hash = xbt_cfg_get_boolean(_sg_cfg_set, name); -} +#ifdef HAVE_MC +#include +#include -void _mc_cfg_cb_max_depth(const char *name, int pos) -{ - if (_sg_cfg_init_status && !_sg_do_model_check) { - xbt_die - ("You are specifying a max depth value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); - } - _sg_mc_max_depth = xbt_cfg_get_int(_sg_cfg_set, name); -} +#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" +#include "mc_smx.h" +#endif +#include "mc_record.h" +#include "mc_protocol.h" +#include "mc_client.h" -void _mc_cfg_cb_visited(const char *name, int pos) -{ - if (_sg_cfg_init_status && !_sg_do_model_check) { - xbt_die - ("You are specifying a number of stored visited states after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); - } - _sg_mc_visited = xbt_cfg_get_int(_sg_cfg_set, name); -} +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, + "Logging specific to MC (global)"); -void _mc_cfg_cb_dot_output(const char *name, int pos) -{ - if (_sg_cfg_init_status && !_sg_do_model_check) { - xbt_die - ("You are specifying a file name for a dot output of graph state after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); - } - _sg_mc_dot_output_file = xbt_cfg_get_string(_sg_cfg_set, name); -} +e_mc_mode_t mc_mode; -void _mc_cfg_cb_comms_determinism(const char *name, int pos) -{ - if (_sg_cfg_init_status && !_sg_do_model_check) { - xbt_die - ("You are specifying a value to enable/disable the detection of determinism in the communications schemes after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); - } - _sg_mc_comms_determinism = xbt_cfg_get_boolean(_sg_cfg_set, name); - mc_reduce_kind = e_mc_reduce_none; -} +double *mc_time = NULL; -void _mc_cfg_cb_send_determinism(const char *name, int pos) -{ - if (_sg_cfg_init_status && !_sg_do_model_check) { - xbt_die - ("You are specifying a value to enable/disable the detection of send-determinism in the communications schemes after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); - } - _sg_mc_send_determinism = xbt_cfg_get_boolean(_sg_cfg_set, name); - mc_reduce_kind = e_mc_reduce_none; -} +#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; @@ -171,14 +64,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]; @@ -216,45 +101,37 @@ 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; - -void MC_init() +void MC_init_pid(pid_t pid, int socket) { - int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); - - mc_time = xbt_new0(double, simix_process_maxpid); + if (mc_mode == MC_MODE_NONE) { + if (getenv(MC_ENV_SOCKET_FD)) { + mc_mode = MC_MODE_CLIENT; + } else { + mc_mode = MC_MODE_STANDALONE; + } + } /* Initialize the data structures that must be persistent across every iteration of the model-checker (in RAW memory) */ - MC_SET_MC_HEAP; + xbt_mheap_t heap = mmalloc_set_current_heap(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); + if (mc_mode == MC_MODE_SERVER) { + int maxpid; + MC_process_read_variable(&mc_model_checker->process, "simix_process_maxpid", + &maxpid, sizeof(maxpid)); + simix_process_maxpid = maxpid; + } + + mmalloc_set_current_heap(std_heap); + mc_time = xbt_new0(double, MC_smx_get_maxpid()); + mmalloc_set_current_heap(mc_heap); mc_comp_times = xbt_new0(s_mc_comparison_times_t, 1); @@ -262,9 +139,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(); @@ -273,7 +147,7 @@ void MC_init() MC_SET_STD_HEAP; - if (_sg_mc_visited > 0 || _sg_mc_liveness) { + if (_sg_mc_visited > 0 || _sg_mc_liveness || _sg_mc_termination) { /* Ignore some variables from xbt/ex.h used by exception e for stacks comparison */ MC_ignore_local_variable("e", "*"); MC_ignore_local_variable("__ex_cleanup", "*"); @@ -292,37 +166,46 @@ 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("initial_communications_pattern"); + MC_ignore_global_variable("incomplete_communications_pattern"); + MC_ignore_global_variable("nb_comm_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"); + + /* Static variable used for tracing */ + MC_ignore_global_variable("counter"); + + /* SIMIX */ 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"); - } + if (mc_mode == MC_MODE_STANDALONE || mc_mode == MC_MODE_CLIENT) { + /* Those requests are handled on the client side and propagated by message + * to the server: */ - MC_ignore_heap(mc_time, simix_process_maxpid * sizeof(double)); + MC_ignore_heap(mc_time, MC_smx_get_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)); + } + } - 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; + mmalloc_set_current_heap(heap); + + if (mc_mode == MC_MODE_CLIENT) { + // This will move somehwere else: + MC_client_handle_messages(); + } } @@ -331,13 +214,9 @@ void MC_init() static void MC_modelcheck_comm_determinism_init(void) { - - int mc_mem_set = (mmalloc_get_current_heap() == mc_heap); - MC_init(); - if (!mc_mem_set) - MC_SET_MC_HEAP; + xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); /* Create exploration stack */ mc_stack = xbt_fifo_new(); @@ -350,27 +229,25 @@ static void MC_modelcheck_comm_determinism_init(void) initial_global_state = xbt_new0(s_mc_global_t, 1); initial_global_state->snapshot = MC_take_snapshot(0); initial_global_state->initial_communications_pattern_done = 0; - initial_global_state->comm_deterministic = 1; + initial_global_state->recv_deterministic = 1; initial_global_state->send_deterministic = 1; + initial_global_state->recv_diff = NULL; + initial_global_state->send_diff = NULL; + MC_SET_STD_HEAP; MC_modelcheck_comm_determinism(); - if(mc_mem_set) - MC_SET_MC_HEAP; - + mmalloc_set_current_heap(heap); } static void MC_modelcheck_safety_init(void) { - int mc_mem_set = (mmalloc_get_current_heap() == mc_heap); - _sg_mc_safety = 1; MC_init(); - if (!mc_mem_set) - MC_SET_MC_HEAP; + xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); /* Create exploration stack */ mc_stack = xbt_fifo_new(); @@ -387,8 +264,7 @@ static void MC_modelcheck_safety_init(void) MC_modelcheck_safety(); - if (mc_mem_set) - MC_SET_MC_HEAP; + mmalloc_set_current_heap(heap); xbt_abort(); //MC_exit(); @@ -396,15 +272,11 @@ static void MC_modelcheck_safety_init(void) static void MC_modelcheck_liveness_init() { - - int mc_mem_set = (mmalloc_get_current_heap() == mc_heap); - _sg_mc_liveness = 1; MC_init(); - if (!mc_mem_set) - MC_SET_MC_HEAP; + xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); /* Create exploration stack */ mc_stack = xbt_fifo_new(); @@ -420,8 +292,7 @@ static void MC_modelcheck_liveness_init() MC_print_statistics(mc_stats); xbt_free(mc_time); - if (mc_mem_set) - MC_SET_MC_HEAP; + mmalloc_set_current_heap(heap); } @@ -430,11 +301,15 @@ void MC_do_the_modelcheck_for_real() if (_sg_mc_comms_determinism || _sg_mc_send_determinism) { XBT_INFO("Check communication determinism"); + mc_reduce_kind = e_mc_reduce_none; MC_modelcheck_comm_determinism_init(); } else if (!_sg_mc_property_file || _sg_mc_property_file[0] == '\0') { - if (mc_reduce_kind == e_mc_reduce_unset) - mc_reduce_kind = e_mc_reduce_dpor; - XBT_INFO("Check a safety property"); + if(_sg_mc_termination){ + XBT_INFO("Check non progressive cycles"); + mc_reduce_kind = e_mc_reduce_none; + }else{ + XBT_INFO("Check a safety property"); + } MC_modelcheck_safety_init(); } else { if (mc_reduce_kind == e_mc_reduce_unset) @@ -454,117 +329,117 @@ void MC_exit(void) //xbt_abort(); } -int SIMIX_pre_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) +int MC_deadlock_check() { - 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_enter(req, 0); + if (mc_mode == MC_MODE_SERVER) { + int res; + if ((res = MC_protocol_send_simple_message(mc_model_checker->process.socket, + 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)); + if (s == -1) + xbt_die("Could not receive message"); + else if (s != sizeof(message) || message.type != MC_MESSAGE_DEADLOCK_CHECK_REPLY) { + xbt_die("Unexpected message, expected MC_MESSAGE_DEADLOCK_CHECK_REPLY %i %i vs %i %i", + (int) s, (int) message.type, (int) sizeof(message), (int) MC_MESSAGE_DEADLOCK_CHECK_REPLY + ); } + else + return message.value; } -} -int MC_deadlock_check() -{ int deadlock = FALSE; smx_process_t process; if (xbt_swag_size(simix_global->process_list)) { deadlock = TRUE; - xbt_swag_foreach(process, simix_global->process_list) { - if (process->simcall.call != SIMCALL_NONE - && MC_request_is_enabled(&process->simcall)) { + MC_EACH_SIMIX_PROCESS(process, + if (MC_process_is_enabled(process)) { deadlock = FALSE; break; } - } + ); } return deadlock; } +void handle_comm_pattern(e_mc_call_type_t call_type, smx_simcall_t req, int value, xbt_dynar_t pattern, int backtracking) { + + switch(call_type) { + case MC_CALL_TYPE_NONE: + break; + case MC_CALL_TYPE_SEND: + case MC_CALL_TYPE_RECV: + get_comm_pattern(pattern, req, call_type, backtracking); + break; + case MC_CALL_TYPE_WAIT: + case MC_CALL_TYPE_WAITANY: + { + smx_synchro_t current_comm = NULL; + if (call_type == MC_CALL_TYPE_WAIT) + current_comm = simcall_comm_wait__get__comm(req); + else + current_comm = xbt_dynar_get_as(simcall_comm_waitany__get__comms(req), value, smx_synchro_t); + complete_comm_pattern(pattern, current_comm, req->issuer->pid, backtracking); + } + break; + default: + xbt_die("Unexpected call type %i", (int)call_type); + } + +} + /** * \brief Re-executes from the state at position start all the transitions indicated by * a given model-checker stack. * \param stack The stack with the transitions to execute. * \param start Start index to begin the re-execution. */ -void MC_replay(xbt_fifo_t stack, int start) +void MC_replay(xbt_fifo_t stack) { - int raw_mem = (mmalloc_get_current_heap() == mc_heap); + xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - int value, i = 1, count = 1, call = 0, j; + int value, count = 1, j; char *req_str; smx_simcall_t req = NULL, saved_req = NULL; xbt_fifo_item_t item, start_item; mc_state_t state; - smx_process_t process = NULL; - smx_action_t current_comm; - + XBT_DEBUG("**** Begin Replay ****"); - if (start == -1) { - /* 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 */ - MC_SET_STD_HEAP; - } - - start_item = xbt_fifo_get_last_item(stack); - if (start != -1) { - while (i != start) { - start_item = xbt_fifo_get_prev_item(start_item); - i++; + /* Intermediate backtracking */ + if(_sg_mc_checkpoint > 0 || _sg_mc_termination || _sg_mc_visited > 0) { + start_item = xbt_fifo_get_first_item(stack); + state = (mc_state_t)xbt_fifo_get_item_content(start_item); + if(state->system_state){ + MC_restore_snapshot(state->system_state); + if(_sg_mc_comms_determinism || _sg_mc_send_determinism) + MC_restore_communications_pattern(state); + MC_SET_STD_HEAP; + return; } } - MC_SET_MC_HEAP; - if (mc_reduce_kind == e_mc_reduce_dpor) { - xbt_dict_reset(first_enabled_state); - xbt_swag_foreach(process, simix_global->process_list) { - if (MC_process_is_enabled(process)) { - char *key = bprintf("%lu", process->pid); - char *data = bprintf("%d", count); - xbt_dict_set(first_enabled_state, key, data, NULL); - xbt_free(key); - } - } - } + /* 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 */ + MC_SET_STD_HEAP; + + start_item = xbt_fifo_get_last_item(stack); + + MC_SET_MC_HEAP; if (_sg_mc_comms_determinism || _sg_mc_send_determinism) { - for (j=0; jindex_comm = 0; } } 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); @@ -572,20 +447,13 @@ void MC_replay(xbt_fifo_t stack, int start) state = (mc_state_t) xbt_fifo_get_item_content(item); saved_req = MC_state_get_executed_request(state, &value); - - if (mc_reduce_kind == e_mc_reduce_dpor) { - MC_SET_MC_HEAP; - char *key = bprintf("%lu", saved_req->issuer->pid); - if(xbt_dict_get_or_null(first_enabled_state, key)) - xbt_dict_remove(first_enabled_state, key); - xbt_free(key); - MC_SET_STD_HEAP; - } - + if (saved_req) { /* because we got a copy of the executed request, we have to fetch the real one, pointed by the request field of the issuer process */ - req = &saved_req->issuer->simcall; + + const smx_process_t issuer = MC_smx_simcall_get_issuer(saved_req); + req = &issuer->simcall; /* Debug information */ if (XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)) { @@ -595,58 +463,20 @@ void MC_replay(xbt_fifo_t stack, int start) } /* TODO : handle test and testany simcalls */ - if (_sg_mc_comms_determinism || _sg_mc_send_determinism) { - if (req->call == SIMCALL_COMM_ISEND) - call = 1; - else if (req->call == SIMCALL_COMM_IRECV) - call = 2; - else if (req->call == SIMCALL_COMM_WAIT) - call = 3; - else if (req->call == SIMCALL_COMM_WAITANY) - call = 4; - } - - SIMIX_simcall_enter(req, value); - - if (_sg_mc_comms_determinism || _sg_mc_send_determinism) { - MC_SET_MC_HEAP; - if (call == 1) { /* Send */ - get_comm_pattern(communications_pattern, req, call); - } else if (call == 2) { /* Recv */ - get_comm_pattern(communications_pattern, req, call); - } else if (call == 3) { /* Wait */ - current_comm = simcall_comm_wait__get__comm(req); - if (current_comm->comm.refcount == 1) /* First wait only must be considered */ - complete_comm_pattern(communications_pattern, current_comm); - } else if (call == 4) { /* WaitAny */ - current_comm = xbt_dynar_get_as(simcall_comm_waitany__get__comms(req), value, smx_action_t); - if (current_comm->comm.refcount == 1) /* First wait only must be considered */ - complete_comm_pattern(communications_pattern, current_comm); - } - MC_SET_STD_HEAP; - call = 0; - } + e_mc_call_type_t call = MC_CALL_TYPE_NONE; + if (_sg_mc_comms_determinism || _sg_mc_send_determinism) + call = mc_get_call_type(req); + MC_simcall_handle(req, value); + MC_SET_MC_HEAP; + if (_sg_mc_comms_determinism || _sg_mc_send_determinism) + handle_comm_pattern(call, req, value, NULL, 1); + MC_SET_STD_HEAP; + MC_wait_for_requests(); count++; - - if (mc_reduce_kind == e_mc_reduce_dpor) { - MC_SET_MC_HEAP; - /* Insert in dict all enabled processes */ - xbt_swag_foreach(process, simix_global->process_list) { - if (MC_process_is_enabled(process) ) { - char *key = bprintf("%lu", process->pid); - if (xbt_dict_get_or_null(first_enabled_state, key) == NULL) { - char *data = bprintf("%d", count); - xbt_dict_set(first_enabled_state, key, data, NULL); - } - xbt_free(key); - } - } - MC_SET_STD_HEAP; - } } /* Update statistics */ @@ -656,25 +486,34 @@ void MC_replay(xbt_fifo_t stack, int start) } XBT_DEBUG("**** End Replay ****"); - - if (raw_mem) - MC_SET_MC_HEAP; - else - MC_SET_STD_HEAP; - - + mmalloc_set_current_heap(heap); } -void MC_replay_liveness(xbt_fifo_t stack, int all_stack) +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; - int depth = 1; + mc_pair_t pair = NULL; + mc_state_t state = NULL; + smx_simcall_t req = NULL, saved_req = NULL; + int value, depth = 1; + char *req_str; XBT_DEBUG("**** Begin Replay ****"); + /* Intermediate backtracking */ + if(_sg_mc_checkpoint > 0) { + item = xbt_fifo_get_first_item(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); + MC_SET_STD_HEAP; + return; + } + } + /* Restore the initial state */ MC_restore_snapshot(initial_global_state->snapshot); @@ -685,26 +524,22 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) /* Traverse the stack from the initial state and re-execute the transitions */ for (item = xbt_fifo_get_last_item(stack); - all_stack ? depth <= xbt_fifo_size(stack) : item != xbt_fifo_get_first_item(stack); + item != xbt_fifo_get_first_item(stack); item = xbt_fifo_get_prev_item(item)) { - mc_pair_t pair = (mc_pair_t) xbt_fifo_get_item_content(item); + pair = (mc_pair_t) xbt_fifo_get_item_content(item); - mc_state_t state = (mc_state_t) pair->graph_state; - smx_simcall_t req = NULL, saved_req = NULL; - int value; - char *req_str; + state = (mc_state_t) pair->graph_state; - if (pair->requests > 0) { + if (pair->exploration_started) { saved_req = MC_state_get_executed_request(state, &value); - //XBT_DEBUG("SavedReq->call %u", saved_req->call); if (saved_req != NULL) { /* because we got a copy of the executed request, we have to fetch the real one, pointed by the request field of the issuer process */ - req = &saved_req->issuer->simcall; - //XBT_DEBUG("Req->call %u", req->call); + const smx_process_t issuer = MC_smx_simcall_get_issuer(saved_req); + req = &issuer->simcall; /* Debug information */ if (XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)) { @@ -715,7 +550,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) } - SIMIX_simcall_enter(req, value); + MC_simcall_handle(req, value); MC_wait_for_requests(); } @@ -724,7 +559,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) mc_stats->executed_transitions++; depth++; - + } XBT_DEBUG("**** End Replay ****"); @@ -743,36 +578,22 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) */ void MC_dump_stack_safety(xbt_fifo_t stack) { - - int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); + xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); MC_show_stack_safety(stack); - - if (!_sg_mc_checkpoint) { - - mc_state_t state; - - MC_SET_MC_HEAP; - while ((state = (mc_state_t) xbt_fifo_pop(stack)) != NULL) - MC_state_delete(state); - MC_SET_STD_HEAP; - - } - - if (raw_mem_set) - MC_SET_MC_HEAP; - else - MC_SET_STD_HEAP; - + + mc_state_t state; + + MC_SET_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) { - - int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); - - MC_SET_MC_HEAP; + xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); int value; mc_state_t state; @@ -791,8 +612,7 @@ void MC_show_stack_safety(xbt_fifo_t stack) } } - if (!raw_mem_set) - MC_SET_STD_HEAP; + mmalloc_set_current_heap(heap); } void MC_show_deadlock(smx_simcall_t req) @@ -810,6 +630,15 @@ void MC_show_deadlock(smx_simcall_t req) MC_print_statistics(mc_stats); } +void MC_show_non_termination(void){ + XBT_INFO("******************************************"); + XBT_INFO("*** NON-PROGRESSIVE CYCLE DETECTED ***"); + XBT_INFO("******************************************"); + XBT_INFO("Counter-example execution trace:"); + MC_dump_stack_safety(mc_stack); + MC_print_statistics(mc_stats); +} + void MC_show_stack_liveness(xbt_fifo_t stack) { @@ -820,42 +649,42 @@ 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 ? (pair = (mc_pair_t) (xbt_fifo_get_item_content(item))) : (NULL)); + item = xbt_fifo_get_prev_item(item)) { req = MC_state_get_executed_request(pair->graph_state, &value); - if (req) { - if (pair->requests > 0) { - req_str = MC_request_to_string(req, value); - XBT_INFO("%s", req_str); - xbt_free(req_str); - } else { - XBT_INFO("End of system requests but evolution in Büchi automaton"); - } + if (req && req->call != SIMCALL_NONE) { + req_str = MC_request_to_string(req, value); + XBT_INFO("%s", req_str); + xbt_free(req_str); } } } + void MC_dump_stack_liveness(xbt_fifo_t stack) { - - int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); - + xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); mc_pair_t pair; - - MC_SET_MC_HEAP; while ((pair = (mc_pair_t) xbt_fifo_pop(stack)) != NULL) MC_pair_delete(pair); - MC_SET_STD_HEAP; - - if (raw_mem_set) - MC_SET_MC_HEAP; - + mmalloc_set_current_heap(heap); } - void MC_print_statistics(mc_stats_t stats) { - xbt_mheap_t previous_heap = mmalloc_get_current_heap(); + if(_sg_mc_comms_determinism) { + if (!initial_global_state->recv_deterministic && initial_global_state->send_deterministic){ + XBT_INFO("******************************************************"); + XBT_INFO("**** Only-send-deterministic communication pattern ****"); + XBT_INFO("******************************************************"); + XBT_INFO("%s", initial_global_state->recv_diff); + }else if(!initial_global_state->send_deterministic && initial_global_state->recv_deterministic) { + XBT_INFO("******************************************************"); + XBT_INFO("**** Only-recv-deterministic communication pattern ****"); + XBT_INFO("******************************************************"); + XBT_INFO("%s", initial_global_state->send_diff); + } + } if (stats->expanded_pairs == 0) { XBT_INFO("Expanded states = %lu", stats->expanded_states); @@ -865,45 +694,108 @@ void MC_print_statistics(mc_stats_t stats) XBT_INFO("Visited pairs = %lu", stats->visited_pairs); } XBT_INFO("Executed transitions = %lu", stats->executed_transitions); - MC_SET_MC_HEAP; + 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); } - if (initial_global_state != NULL) { + if (initial_global_state != NULL && (_sg_mc_comms_determinism || _sg_mc_send_determinism)) { + XBT_INFO("Send-deterministic : %s", !initial_global_state->send_deterministic ? "No" : "Yes"); if (_sg_mc_comms_determinism) - XBT_INFO("Communication-deterministic : %s", - !initial_global_state->comm_deterministic ? "No" : "Yes"); - if (_sg_mc_send_determinism) - XBT_INFO("Send-deterministic : %s", - !initial_global_state->send_deterministic ? "No" : "Yes"); + XBT_INFO("Recv-deterministic : %s", !initial_global_state->recv_deterministic ? "No" : "Yes"); } - mmalloc_set_current_heap(previous_heap); + mmalloc_set_current_heap(heap); } -void MC_assert(int prop) +void MC_automaton_load(const char *file) { - if (MC_is_active() && !prop) { - XBT_INFO("**************************"); - XBT_INFO("*** PROPERTY NOT VALID ***"); - XBT_INFO("**************************"); - XBT_INFO("Counter-example execution trace:"); - MC_dump_stack_safety(mc_stack); - MC_print_statistics(mc_stats); - xbt_abort(); - } + 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); } -void MC_cut(void) +static void register_symbol(xbt_automaton_propositional_symbol_t symbol) { - user_max_depth_reached = 1; + 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_process_clock_add(smx_process_t process, double amount) +void MC_automaton_new_propositional_symbol(const char *id, int(*fct)(void)) { - mc_time[process->pid] += amount; + 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); +} + +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; + 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; + } + mmalloc_set_current_heap(heap); +} +#endif + double MC_process_clock_get(smx_process_t process) { if (mc_time) { @@ -916,40 +808,7 @@ double MC_process_clock_get(smx_process_t process) } } -void MC_automaton_load(const char *file) -{ - - int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); - - MC_SET_MC_HEAP; - - if (_mc_property_automaton == NULL) - _mc_property_automaton = xbt_automaton_new(); - - xbt_automaton_load(_mc_property_automaton, file); - - MC_SET_STD_HEAP; - - if (raw_mem_set) - MC_SET_MC_HEAP; - -} - -void MC_automaton_new_propositional_symbol(const char *id, void *fct) +void MC_process_clock_add(smx_process_t process, double amount) { - - int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); - - MC_SET_MC_HEAP; - - if (_mc_property_automaton == NULL) - _mc_property_automaton = xbt_automaton_new(); - - xbt_automaton_propositional_symbol_new(_mc_property_automaton, id, fct); - - MC_SET_STD_HEAP; - - if (raw_mem_set) - MC_SET_MC_HEAP; - + mc_time[process->pid] += amount; }