-/* Copyright (c) 2008-2014. The SimGrid Team.
+/* Copyright (c) 2008-2015. The 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 "mc_state.h"
-#include "mc_comm_pattern.h"
-#include "mc_request.h"
-#include "mc_safety.h"
-#include "mc_private.h"
-#include "mc_record.h"
-#include "mc_smx.h"
-#include "mc_client.h"
+#include "src/mc/mc_state.h"
+#include "src/mc/mc_comm_pattern.h"
+#include "src/mc/mc_request.h"
+#include "src/mc/mc_safety.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_record.h"
+#include "src/mc/mc_smx.h"
+#include "src/mc/mc_client.h"
+#include "src/mc/mc_exit.h"
using simgrid::mc::remote;
xbt_free(initial_global_state->send_diff);
initial_global_state->send_diff = NULL;
MC_print_statistics(mc_stats);
- xbt_abort();
+ exit(SIMGRID_MC_EXIT_NON_DETERMINISM);
}else if(_sg_mc_comms_determinism && (!initial_global_state->send_deterministic && !initial_global_state->recv_deterministic)) {
XBT_INFO("****************************************************");
XBT_INFO("***** Non-deterministic communications pattern *****");
xbt_free(initial_global_state->recv_diff);
initial_global_state->recv_diff = NULL;
MC_print_statistics(mc_stats);
- xbt_abort();
+ exit(SIMGRID_MC_EXIT_NON_DETERMINISM);
}
}
}
char* remote_name = mc_model_checker->process().read<char*>(
(std::uint64_t)(synchro.comm.rdv ? &synchro.comm.rdv->name : &synchro.comm.rdv_cpy->name));
- pattern->rdv =
- MC_process_read_string(&mc_model_checker->process(), remote_name);
+ pattern->rdv = mc_model_checker->process().read_string(remote_name);
pattern->src_proc = MC_smx_resolve_process(synchro.comm.src_proc)->pid;
pattern->src_host = MC_smx_process_get_host_name(issuer);
char* remote_name;
mc_model_checker->process().read(&remote_name,
remote(synchro.comm.rdv ? &synchro.comm.rdv->name : &synchro.comm.rdv_cpy->name));
- pattern->rdv =
- MC_process_read_string(&mc_model_checker->process(), remote_name);
+ pattern->rdv = mc_model_checker->process().read_string(remote_name);
pattern->dst_proc = MC_smx_resolve_process(synchro.comm.dst_proc)->pid;
pattern->dst_host = MC_smx_process_get_host_name(issuer);
} else {
/************************ Main algorithm ************************/
-static void MC_modelcheck_comm_determinism_main(void);
+static int MC_modelcheck_comm_determinism_main(void);
static void MC_pre_modelcheck_comm_determinism(void)
{
XBT_DEBUG("********* Start communication determinism verification *********");
/* Wait for requests (schedules processes) */
- MC_wait_for_requests();
+ mc_model_checker->wait_for_requests();
/* Get an enabled process and insert it in the interleave set of the initial state */
MC_EACH_SIMIX_PROCESS(process,
xbt_fifo_unshift(mc_stack, initial_state);
}
-static void MC_modelcheck_comm_determinism_main(void)
+static int MC_modelcheck_comm_determinism_main(void)
{
char *req_str = NULL;
MC_handle_comm_pattern(call, req, value, NULL, 0);
/* Wait for requests (schedules processes) */
- MC_wait_for_requests();
+ mc_model_checker->wait_for_requests();
/* Create the new expanded state */
next_state = MC_state_new();
/* Check for deadlocks */
if (MC_deadlock_check()) {
MC_show_deadlock(NULL);
- return;
+ return SIMGRID_MC_EXIT_DEADLOCK;
}
while ((state = (mc_state_t) xbt_fifo_shift(mc_stack)) != NULL) {
}
MC_print_statistics(mc_stats);
- exit(0);
+ return SIMGRID_MC_EXIT_SUCCESS;
}
-void MC_modelcheck_comm_determinism(void)
+int MC_modelcheck_comm_determinism(void)
{
XBT_INFO("Check communication determinism");
mc_reduce_kind = e_mc_reduce_none;
- MC_wait_for_requests();
+ mc_model_checker->wait_for_requests();
if (mc_mode == MC_MODE_CLIENT) {
// This will move somehwere else:
initial_global_state->recv_diff = NULL;
initial_global_state->send_diff = NULL;
- MC_modelcheck_comm_determinism_main();
+ return MC_modelcheck_comm_determinism_main();
}
}