X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d098dd9e12ee321b061421f535b2b56ce7691673..e6ca184e99d50d0ee8fe405a83ee5277e2ecfce6:/src/mc/mc_safety.cpp diff --git a/src/mc/mc_safety.cpp b/src/mc/mc_safety.cpp index 1642b3add9..bd63a0ab69 100644 --- a/src/mc/mc_safety.cpp +++ b/src/mc/mc_safety.cpp @@ -4,7 +4,14 @@ /* 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 "src/mc/mc_state.h" #include "src/mc/mc_request.h" @@ -28,7 +35,7 @@ static int is_exploration_stack_state(mc_state_t current_state){ xbt_fifo_item_t item; mc_state_t stack_state; - for(item = xbt_fifo_get_first_item(mc_stack); item != NULL; item = xbt_fifo_get_next_item(item)) { + for(item = xbt_fifo_get_first_item(mc_stack); item != nullptr; item = xbt_fifo_get_next_item(item)) { stack_state = (mc_state_t) xbt_fifo_get_item_content(item); if(snapshot_compare(stack_state, current_state) == 0){ XBT_INFO("Non-progressive cycle : state %d -> state %d", stack_state->num, current_state->num); @@ -57,14 +64,12 @@ static void MC_pre_modelcheck_safety() mc_model_checker->wait_for_requests(); /* Get an enabled process and insert it in the interleave set of the initial state */ - smx_process_t process; - MC_EACH_SIMIX_PROCESS(process, - if (MC_process_is_enabled(process)) { - MC_state_interleave_process(initial_state, process); + for (auto& p : mc_model_checker->process().simix_processes()) + if (simgrid::mc::process_is_enabled(&p.copy)) { + MC_state_interleave_process(initial_state, &p.copy); if (mc_reduce_kind != e_mc_reduce_none) break; } - ); xbt_fifo_unshift(mc_stack, initial_state); } @@ -77,12 +82,12 @@ int MC_modelcheck_safety(void) { MC_modelcheck_safety_init(); - char *req_str = NULL; + char *req_str = nullptr; int value; - smx_simcall_t req = NULL; - mc_state_t state = NULL, prev_state = NULL, next_state = NULL; - xbt_fifo_item_t item = NULL; - mc_visited_state_t visited_state = NULL; + smx_simcall_t req = nullptr; + mc_state_t state = nullptr, prev_state = NULL, next_state = NULL; + xbt_fifo_item_t item = nullptr; + mc_visited_state_t visited_state = nullptr; while (xbt_fifo_size(mc_stack) > 0) { @@ -101,15 +106,14 @@ int MC_modelcheck_safety(void) /* If there are processes to interleave and the maximum depth has not been reached then perform one step of the exploration algorithm */ if (xbt_fifo_size(mc_stack) <= _sg_mc_max_depth && !user_max_depth_reached - && (req = MC_state_get_request(state, &value)) && visited_state == NULL) { + && (req = MC_state_get_request(state, &value)) && visited_state == nullptr) { - req_str = MC_request_to_string(req, value, MC_REQUEST_SIMIX); + req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix); XBT_DEBUG("Execute: %s", req_str); xbt_free(req_str); - if (dot_output != NULL) { - req_str = MC_request_get_dot_output(req, value); - } + if (dot_output != nullptr) + req_str = simgrid::mc::request_get_dot_output(req, value); MC_state_set_executed_request(state, req, value); mc_stats->executed_transitions++; @@ -118,7 +122,7 @@ int MC_modelcheck_safety(void) // MC_execute_transition(req, value) /* Answer the request */ - MC_simcall_handle(req, value); + simgrid::mc::handle_simcall(req, value); mc_model_checker->wait_for_requests(); /* Create the new expanded state */ @@ -129,31 +133,26 @@ int MC_modelcheck_safety(void) return SIMGRID_MC_EXIT_NON_TERMINATION; } - if ((visited_state = is_visited_state(next_state)) == NULL) { + if ((visited_state = is_visited_state(next_state)) == nullptr) { /* Get an enabled process and insert it in the interleave set of the next state */ - smx_process_t process = NULL; - MC_EACH_SIMIX_PROCESS(process, - if (MC_process_is_enabled(process)) { - MC_state_interleave_process(next_state, process); + for (auto& p : mc_model_checker->process().simix_processes()) + if (simgrid::mc::process_is_enabled(&p.copy)) { + MC_state_interleave_process(next_state, &p.copy); if (mc_reduce_kind != e_mc_reduce_none) break; } - ); - - if (dot_output != NULL) - fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num, next_state->num, req_str); - } else { + if (dot_output != nullptr) + std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num, next_state->num, req_str); - if (dot_output != NULL) - fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num, visited_state->other_num == -1 ? visited_state->num : visited_state->other_num, req_str); + } else if (dot_output != nullptr) + std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num, visited_state->other_num == -1 ? visited_state->num : visited_state->other_num, req_str); - } xbt_fifo_unshift(mc_stack, next_state); - if (dot_output != NULL) + if (dot_output != nullptr) xbt_free(req_str); /* Let's loop again */ @@ -161,31 +160,28 @@ int MC_modelcheck_safety(void) /* The interleave set is empty or the maximum depth is reached, let's back-track */ } else { - if ((xbt_fifo_size(mc_stack) > _sg_mc_max_depth) || user_max_depth_reached || visited_state != NULL) { + if ((xbt_fifo_size(mc_stack) > _sg_mc_max_depth) || user_max_depth_reached || visited_state != nullptr) { - if (user_max_depth_reached && visited_state == NULL) + if (user_max_depth_reached && visited_state == nullptr) XBT_DEBUG("User max depth reached !"); - else if (visited_state == NULL) + else if (visited_state == nullptr) XBT_WARN("/!\\ Max depth reached ! /!\\ "); else XBT_DEBUG("State already visited (equal to state %d), exploration stopped on this path.", visited_state->other_num == -1 ? visited_state->num : visited_state->other_num); - } else { - + } else XBT_DEBUG("There are no more processes to interleave. (depth %d)", xbt_fifo_size(mc_stack) + 1); - } - /* Trash the current state, no longer needed */ xbt_fifo_shift(mc_stack); XBT_DEBUG("Delete state %d at depth %d", state->num, xbt_fifo_size(mc_stack) + 1); MC_state_delete(state, !state->in_visited_states ? 1 : 0); - visited_state = NULL; + visited_state = nullptr; /* Check for deadlocks */ if (MC_deadlock_check()) { - MC_show_deadlock(NULL); + MC_show_deadlock(nullptr); return SIMGRID_MC_EXIT_DEADLOCK; } @@ -204,15 +200,15 @@ int MC_modelcheck_safety(void) "use --cfg=model-check/reduction:none"); const smx_process_t issuer = MC_smx_simcall_get_issuer(req); xbt_fifo_foreach(mc_stack, item, prev_state, mc_state_t) { - if (MC_request_depend(req, MC_state_get_internal_request(prev_state))) { + if (simgrid::mc::request_depend(req, MC_state_get_internal_request(prev_state))) { if (XBT_LOG_ISENABLED(mc_safety, xbt_log_priority_debug)) { XBT_DEBUG("Dependent Transitions:"); smx_simcall_t prev_req = MC_state_get_executed_request(prev_state, &value); - req_str = MC_request_to_string(prev_req, value, MC_REQUEST_INTERNAL); + req_str = simgrid::mc::request_to_string(prev_req, value, simgrid::mc::RequestType::internal); XBT_DEBUG("%s (state=%d)", req_str, prev_state->num); xbt_free(req_str); prev_req = MC_state_get_executed_request(state, &value); - req_str = MC_request_to_string(prev_req, value, MC_REQUEST_EXECUTED); + req_str = simgrid::mc::request_to_string(prev_req, value, simgrid::mc::RequestType::executed); XBT_DEBUG("%s (state=%d)", req_str, state->num); xbt_free(req_str); } @@ -286,5 +282,5 @@ static void MC_modelcheck_safety_init(void) /* Save the initial state */ initial_global_state = xbt_new0(s_mc_global_t, 1); - initial_global_state->snapshot = MC_take_snapshot(0); + initial_global_state->snapshot = simgrid::mc::take_snapshot(0); }