#include <cstddef>
#include <cstdint>
+#include <vector>
+
#include "mc_base.h"
#include "mc/mc.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc,
"Logging specific to MC (global)");
+}
+
e_mc_mode_t mc_mode;
-double *mc_time = nullptr;
+namespace simgrid {
+namespace mc {
+
+std::vector<double> processes_time;
+
+}
+}
#ifdef HAVE_MC
int user_max_depth_reached = 0;
xbt_fifo_t mc_stack = nullptr;
/* Liveness */
-xbt_automaton_t _mc_property_automaton = nullptr;
+
+namespace simgrid {
+namespace mc {
+
+xbt_automaton_t property_automaton = nullptr;
+
+}
+}
/* Dot output */
FILE *dot_output = nullptr;
#ifdef HAVE_MC
void MC_init()
{
- mc_time = xbt_new0(double, simix_process_maxpid);
+ simgrid::mc::processes_time.resize(simix_process_maxpid);
if (_sg_mc_visited > 0 || _sg_mc_liveness || _sg_mc_termination || mc_mode == MC_MODE_SERVER) {
/* 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(simgrid::mc::processes_time.data(),
+ simix_process_maxpid * sizeof(double));
smx_process_t process;
xbt_swag_foreach(process, simix_global->process_list)
void MC_exit(void)
{
- xbt_free(mc_time);
-
+ simgrid::mc::processes_time.clear();
MC_memory_exit();
//xbt_abort();
}
ssize_t s = mc_model_checker->process().receive_message(message);
if (s == -1)
xbt_die("Could not receive message");
- else if (s != sizeof(message) || message.type != MC_MESSAGE_DEADLOCK_CHECK_REPLY) {
+ if (s != sizeof(message) || message.type != MC_MESSAGE_DEADLOCK_CHECK_REPLY)
xbt_die("%s received unexpected message %s (%i, size=%i) "
"expected MC_MESSAGE_DEADLOCK_CHECK_REPLY (%i, size=%i)",
MC_mode_name(mc_mode),
MC_message_type_name(message.type), (int) message.type, (int) s,
(int) MC_MESSAGE_DEADLOCK_CHECK_REPLY, (int) sizeof(message)
);
- }
- else
- return message.value;
+ return message.value;
}
int deadlock = FALSE;
if (xbt_swag_size(simix_global->process_list)) {
deadlock = TRUE;
xbt_swag_foreach(process, simix_global->process_list)
- if (MC_process_is_enabled(process)) {
+ if (simgrid::mc::process_is_enabled(process)) {
deadlock = FALSE;
break;
}
/* Debug information */
if (XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)) {
- 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("Replay: %s (%p)", req_str, state);
xbt_free(req_str);
}
if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
call = MC_get_call_type(req);
- MC_simcall_handle(req, value);
+ simgrid::mc::handle_simcall(req, value);
if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
MC_handle_comm_pattern(call, req, value, nullptr, 1);
void MC_replay_liveness(xbt_fifo_t stack)
{
xbt_fifo_item_t item;
- mc_pair_t pair = nullptr;
+ simgrid::mc::Pair* pair = nullptr;
mc_state_t state = nullptr;
smx_simcall_t req = nullptr, saved_req = NULL;
int value, depth = 1;
/* Intermediate backtracking */
if(_sg_mc_checkpoint > 0) {
item = xbt_fifo_get_first_item(stack);
- pair = (mc_pair_t) xbt_fifo_get_item_content(item);
+ pair = (simgrid::mc::Pair*) xbt_fifo_get_item_content(item);
if(pair->graph_state->system_state){
simgrid::mc::restore_snapshot(pair->graph_state->system_state);
return;
item != xbt_fifo_get_first_item(stack);
item = xbt_fifo_get_prev_item(item)) {
- pair = (mc_pair_t) xbt_fifo_get_item_content(item);
+ pair = (simgrid::mc::Pair*) xbt_fifo_get_item_content(item);
state = (mc_state_t) pair->graph_state;
/* Debug information */
if (XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)) {
- 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("Replay (depth = %d) : %s (%p)", depth, req_str, state);
xbt_free(req_str);
}
}
- MC_simcall_handle(req, value);
+ simgrid::mc::handle_simcall(req, value);
mc_model_checker->wait_for_requests();
}
state = (mc_state_t)xbt_fifo_get_item_content(item);
req = MC_state_get_executed_request(state, &value);
if (req) {
- req_str = MC_request_to_string(req, value, MC_REQUEST_EXECUTED);
+ req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::executed);
XBT_INFO("%s", req_str);
xbt_free(req_str);
}
XBT_INFO("*** DEAD-LOCK DETECTED ***");
XBT_INFO("**************************");
XBT_INFO("Locked request:");
- /*req_str = MC_request_to_string(req);
+ /*req_str = simgrid::mc::request_to_string(req);
XBT_INFO("%s", req_str);
xbt_free(req_str); */
XBT_INFO("Counter-example execution trace:");
MC_print_statistics(mc_stats);
}
+namespace simgrid {
+namespace mc {
-void MC_show_stack_liveness(xbt_fifo_t stack)
+void show_stack_liveness(xbt_fifo_t stack)
{
int value;
- mc_pair_t pair;
+ simgrid::mc::Pair* pair;
xbt_fifo_item_t item;
smx_simcall_t req;
char *req_str = nullptr;
for (item = xbt_fifo_get_last_item(stack);
item; item = xbt_fifo_get_prev_item(item)) {
- pair = (mc_pair_t) xbt_fifo_get_item_content(item);
+ pair = (simgrid::mc::Pair*) xbt_fifo_get_item_content(item);
req = MC_state_get_executed_request(pair->graph_state, &value);
if (req && req->call != SIMCALL_NONE) {
- req_str = MC_request_to_string(req, value, MC_REQUEST_EXECUTED);
+ req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::executed);
XBT_INFO("%s", req_str);
xbt_free(req_str);
}
}
}
-
-void MC_dump_stack_liveness(xbt_fifo_t stack)
+void dump_stack_liveness(xbt_fifo_t stack)
{
- mc_pair_t pair;
- while ((pair = (mc_pair_t) xbt_fifo_pop(stack)) != nullptr)
- MC_pair_delete(pair);
+ simgrid::mc::Pair* pair;
+ while ((pair = (simgrid::mc::Pair*) xbt_fifo_pop(stack)) != nullptr)
+ delete pair;
+}
+
+}
}
void MC_print_statistics(mc_stats_t stats)
void MC_automaton_load(const char *file)
{
- if (_mc_property_automaton == nullptr)
- _mc_property_automaton = xbt_automaton_new();
+ if (simgrid::mc::property_automaton == nullptr)
+ simgrid::mc::property_automaton = xbt_automaton_new();
- xbt_automaton_load(_mc_property_automaton, file);
+ xbt_automaton_load(simgrid::mc::property_automaton, file);
}
// TODO, fix cross-process access (this function is not used)
double MC_process_clock_get(smx_process_t process)
{
- if (mc_time) {
- if (process != nullptr)
- return mc_time[process->pid];
- else
- return -1;
- } else
+ if (simgrid::mc::processes_time.empty())
return 0;
+ if (process != nullptr)
+ return simgrid::mc::processes_time[process->pid];
+ return -1;
}
void MC_process_clock_add(smx_process_t process, double amount)
{
- mc_time[process->pid] += amount;
+ simgrid::mc::processes_time[process->pid] += amount;
}
#ifdef HAVE_MC
}
#endif
-
-}
