X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/655040c6a7e0502c81e30219b8619e0c70b575dd..f816b895e4b1219c3dcd0443a55ef90690a849ef:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index d124b0e6dc..c0b7acddda 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -1,14 +1,19 @@ +/* Copyright (c) 2008-2012 Da 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 "../surf/surf_private.h" -#include "../simix/private.h" +#include "../simix/smx_private.h" #include "xbt/fifo.h" -#include "private.h" - +#include "mc_private.h" +XBT_LOG_NEW_CATEGORY(mc, "All MC categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)"); @@ -178,15 +183,15 @@ int MC_random(int min, int max) void MC_wait_for_requests(void) { smx_process_t process; - smx_req_t req; + 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->request; - if (req->call != REQ_NO_REQ && !MC_request_is_visible(req)) - SIMIX_request_pre(req, 0); + req = &process->simcall; + if (req->call != SIMCALL_NONE && !MC_request_is_visible(req)) + SIMIX_simcall_pre(req, 0); } } } @@ -198,8 +203,8 @@ int MC_deadlock_check() if(xbt_swag_size(simix_global->process_list)){ deadlock = TRUE; xbt_swag_foreach(process, simix_global->process_list){ - if(process->request.call != REQ_NO_REQ - && MC_request_is_enabled(&process->request)){ + if(process->simcall.call != SIMCALL_NONE + && MC_request_is_enabled(&process->simcall)){ deadlock = FALSE; break; } @@ -217,7 +222,7 @@ void MC_replay(xbt_fifo_t stack) { int value; char *req_str; - smx_req_t req = NULL, saved_req = NULL; + smx_simcall_t req = NULL, saved_req = NULL; xbt_fifo_item_t item; mc_state_t state; @@ -240,7 +245,7 @@ void MC_replay(xbt_fifo_t stack) 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->request; + req = &saved_req->issuer->simcall; /* Debug information */ if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){ @@ -250,7 +255,7 @@ void MC_replay(xbt_fifo_t stack) } } - SIMIX_request_pre(req, value); + SIMIX_simcall_pre(req, value); MC_wait_for_requests(); /* Update statistics */ @@ -264,7 +269,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) { int value; char *req_str; - smx_req_t req = NULL, saved_req = NULL; + smx_simcall_t req = NULL, saved_req = NULL; xbt_fifo_item_t item; mc_state_t state; mc_pair_stateless_t pair; @@ -295,7 +300,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) 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->request; + req = &saved_req->issuer->simcall; //XBT_DEBUG("Req->call %u", req->call); /* Debug information */ @@ -307,7 +312,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) } - SIMIX_request_pre(req, value); + SIMIX_simcall_pre(req, value); MC_wait_for_requests(); } @@ -337,7 +342,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) 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->request; + req = &saved_req->issuer->simcall; //XBT_DEBUG("Req->call %u", req->call); /* Debug information */ @@ -349,7 +354,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) } - SIMIX_request_pre(req, value); + SIMIX_simcall_pre(req, value); MC_wait_for_requests(); } @@ -387,7 +392,7 @@ void MC_show_stack_safety_stateless(xbt_fifo_t stack) int value; mc_state_t state; xbt_fifo_item_t item; - smx_req_t req; + smx_simcall_t req; char *req_str = NULL; for (item = xbt_fifo_get_last_item(stack); @@ -402,7 +407,7 @@ void MC_show_stack_safety_stateless(xbt_fifo_t stack) } } -void MC_show_deadlock(smx_req_t req) +void MC_show_deadlock(smx_simcall_t req) { /*char *req_str = NULL;*/ XBT_INFO("**************************"); @@ -416,7 +421,7 @@ void MC_show_deadlock(smx_req_t req) MC_dump_stack_safety_stateless(mc_stack_safety_stateless); } -void MC_show_deadlock_stateful(smx_req_t req) +void MC_show_deadlock_stateful(smx_simcall_t req) { /*char *req_str = NULL;*/ XBT_INFO("**************************"); @@ -448,7 +453,7 @@ void MC_show_stack_safety_stateful(xbt_fifo_t stack) int value; mc_state_ws_t state; xbt_fifo_item_t item; - smx_req_t req; + smx_simcall_t req; char *req_str = NULL; for (item = xbt_fifo_get_last_item(stack); @@ -468,7 +473,7 @@ void MC_show_stack_liveness(xbt_fifo_t stack){ int value; mc_pair_stateless_t pair; xbt_fifo_item_t item; - smx_req_t req; + smx_simcall_t req; char *req_str = NULL; for (item = xbt_fifo_get_last_item(stack); @@ -499,7 +504,7 @@ void MC_dump_stack_liveness(xbt_fifo_t stack){ void MC_print_statistics(mc_stats_t stats) { - XBT_INFO("State space size ~= %lu", stats->state_size); + //XBT_INFO("State space size ~= %lu", stats->state_size); XBT_INFO("Expanded states = %lu", stats->expanded_states); XBT_INFO("Visited states = %lu", stats->visited_states); XBT_INFO("Executed transitions = %lu", stats->executed_transitions); @@ -522,14 +527,19 @@ void MC_print_statistics_pairs(mc_stats_pair_t stats) void MC_assert(int prop) { - if (MC_IS_ENABLED && !prop) { - XBT_INFO("**************************"); - XBT_INFO("*** PROPERTY NOT VALID ***"); - XBT_INFO("**************************"); - XBT_INFO("Counter-example execution trace:"); - MC_dump_stack_safety_stateless(mc_stack_safety_stateless); - MC_print_statistics(mc_stats); - xbt_abort(); + if (MC_IS_ENABLED ){ + if(!prop) { + XBT_INFO("**************************"); + XBT_INFO("*** PROPERTY NOT VALID ***"); + XBT_INFO("**************************"); + XBT_INFO("Counter-example execution trace:"); + MC_dump_stack_safety_stateless(mc_stack_safety_stateless); + MC_print_statistics(mc_stats); + xbt_abort(); + }else{ + MC_print_statistics(mc_stats); + xbt_abort(); + } } } @@ -580,7 +590,7 @@ void MC_diff(void){ int i; - XBT_INFO("Number of regions : %d", sn->num_reg); + XBT_INFO("Number of regions : %u", sn->num_reg); for(i=0; inum_reg; i++){