+/* 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 <unistd.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/time.h>
#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)");
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);
}
}
}
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;
}
{
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;
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)){
}
}
- SIMIX_request_pre(req, value);
+ SIMIX_simcall_pre(req, value);
MC_wait_for_requests();
/* Update statistics */
{
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;
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 */
}
- SIMIX_request_pre(req, value);
+ SIMIX_simcall_pre(req, value);
MC_wait_for_requests();
}
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 */
}
- SIMIX_request_pre(req, value);
+ SIMIX_simcall_pre(req, value);
MC_wait_for_requests();
}
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);
}
}
-void MC_show_deadlock(smx_req_t req)
+void MC_show_deadlock(smx_simcall_t req)
{
/*char *req_str = NULL;*/
XBT_INFO("**************************");
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("**************************");
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);
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);
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);
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();
+ }
}
}
int i;
- XBT_INFO("Number of regions : %d", sn->num_reg);
+ XBT_INFO("Number of regions : %u", sn->num_reg);
for(i=0; i<sn->num_reg; i++){