* under the terms of the license (GNU LGPL) which comes with this package. */
#include <cinttypes>
-
-#include <assert.h>
-#include <string.h>
-#include <stdint.h>
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
#include "mc_base.h"
+#include "mc/mc.h"
+
#ifndef _XBT_WIN32
#include <unistd.h>
#include <sys/wait.h>
#include <sys/time.h>
#endif
-#include "simgrid/sg_config.h"
-#include "../surf/surf_private.h"
-#include "../simix/smx_private.h"
-#include "xbt/fifo.h"
-#include "xbt/automaton.h"
-#include "xbt/dict.h"
-#include "mc_record.h"
+#include <xbt/fifo.h>
+#include <xbt/automaton.h>
+
+#include "src/simix/smx_process_private.h"
#ifdef HAVE_MC
-#include "mc_server.h"
#include <libunwind.h>
-#include <xbt/mmalloc.h>
-#include "../xbt/mmalloc/mmprivate.h"
-#include "mc_object_info.h"
-#include "mc_comm_pattern.h"
-#include "mc_request.h"
-#include "mc_safety.h"
-#include "mc_memory_map.h"
-#include "mc_snapshot.h"
-#include "mc_liveness.h"
-#include "mc_private.h"
-#include "mc_unw.h"
-#include "mc_smx.h"
-#include "mcer_ignore.h"
+#include "src/mc/mc_comm_pattern.h"
+#include "src/mc/mc_request.h"
+#include "src/mc/mc_safety.h"
+#include "src/mc/mc_snapshot.h"
+#include "src/mc/mc_liveness.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_unw.h"
+#include "src/mc/mc_smx.h"
#endif
-#include "mc_record.h"
-#include "mc_protocol.h"
-#include "mc_client.h"
+
+#include "src/mc/mc_record.h"
+#include "src/mc/mc_protocol.h"
+#include "src/mc/mc_client.h"
extern "C" {
mc_state_t mc_current_state = NULL;
char mc_replay_mode = FALSE;
-__thread mc_comparison_times_t mc_comp_times = NULL;
-__thread double mc_snapshot_comparison_time;
mc_stats_t mc_stats = NULL;
mc_global_t initial_global_state = NULL;
xbt_fifo_t mc_stack = NULL;
/******************************* Initialisation of MC *******************************/
/*********************************************************************************/
-static void MC_init_dot_output()
+void MC_init_dot_output()
{ /* FIXME : more colors */
colors[0] = "blue";
}
}
-void MC_init_model_checker(pid_t pid, int socket)
-{
- mc_model_checker = new simgrid::mc::ModelChecker(pid, socket);
-
- mc_comp_times = xbt_new0(s_mc_comparison_times_t, 1);
-
- /* Initialize statistics */
- mc_stats = xbt_new0(s_mc_stats_t, 1);
- mc_stats->state_size = 1;
-
- if ((_sg_mc_dot_output_file != NULL) && (_sg_mc_dot_output_file[0] != '\0'))
- MC_init_dot_output();
-
- /* Init parmap */
- //parmap = xbt_parmap_mc_new(xbt_os_get_numcores(), XBT_PARMAP_DEFAULT);
-
- /* Ignore some variables from xbt/ex.h used by exception e for stacks comparison */
- MC_ignore_local_variable("e", "*");
- MC_ignore_local_variable("__ex_cleanup", "*");
- MC_ignore_local_variable("__ex_mctx_en", "*");
- MC_ignore_local_variable("__ex_mctx_me", "*");
- MC_ignore_local_variable("__xbt_ex_ctx_ptr", "*");
- MC_ignore_local_variable("_log_ev", "*");
- MC_ignore_local_variable("_throw_ctx", "*");
- MC_ignore_local_variable("ctx", "*");
-
- MC_ignore_local_variable("self", "simcall_BODY_mc_snapshot");
- MC_ignore_local_variable("next_cont"
- "ext", "smx_ctx_sysv_suspend_serial");
- MC_ignore_local_variable("i", "smx_ctx_sysv_suspend_serial");
-
- /* Ignore local variable about time used for tracing */
- MC_ignore_local_variable("start_time", "*");
-
- /* Static variable used for tracing */
- MCer_ignore_global_variable("counter");
-
- /* SIMIX */
- MCer_ignore_global_variable("smx_total_comms");
-}
#endif
/******************************* Core of MC *******************************/
start_item = xbt_fifo_get_first_item(stack);
state = (mc_state_t)xbt_fifo_get_item_content(start_item);
if(state->system_state){
- MC_restore_snapshot(state->system_state);
+ simgrid::mc::restore_snapshot(state->system_state);
if(_sg_mc_comms_determinism || _sg_mc_send_determinism)
MC_restore_communications_pattern(state);
return;
/* Restore the initial state */
- MC_restore_snapshot(initial_global_state->snapshot);
+ simgrid::mc::restore_snapshot(initial_global_state->snapshot);
/* At the moment of taking the snapshot the raw heap was set, so restoring
* it will set it back again, we have to unset it to continue */
if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
MC_handle_comm_pattern(call, req, value, NULL, 1);
- MC_wait_for_requests();
+ mc_model_checker->wait_for_requests();
count++;
}
item = xbt_fifo_get_first_item(stack);
pair = (mc_pair_t) xbt_fifo_get_item_content(item);
if(pair->graph_state->system_state){
- MC_restore_snapshot(pair->graph_state->system_state);
+ simgrid::mc::restore_snapshot(pair->graph_state->system_state);
return;
}
}
/* Restore the initial state */
- MC_restore_snapshot(initial_global_state->snapshot);
+ simgrid::mc::restore_snapshot(initial_global_state->snapshot);
/* Traverse the stack from the initial state and re-execute the transitions */
for (item = xbt_fifo_get_last_item(stack);
}
MC_simcall_handle(req, value);
- MC_wait_for_requests();
+ mc_model_checker->wait_for_requests();
}
/* Update statistics */
if (_sg_mc_comms_determinism)
XBT_INFO("Recv-deterministic : %s", !initial_global_state->recv_deterministic ? "No" : "Yes");
}
+ if (getenv("SIMGRID_MC_SYSTEM_STATISTICS")){
+ int ret=system("free");
+ if(ret!=0)XBT_WARN("system call did not return 0, but %d",ret);
+ }
}
void MC_automaton_load(const char *file)
}
// TODO, fix cross-process access (this function is not used)
-void MC_dump_stacks(FILE* file)
+static void MC_dump_stacks(FILE* file)
{
int nstack = 0;
- stack_region_t current_stack;
- unsigned cursor;
- xbt_dynar_foreach(stacks_areas, cursor, current_stack) {
- unw_context_t * context = (unw_context_t *)current_stack->context;
+ for (auto const& stack : mc_model_checker->process().stack_areas()) {
+
+ xbt_die("Fix cross-process access to the context");
+ unw_context_t * context = (unw_context_t *)stack.context;
fprintf(file, "Stack %i:\n", nstack);
int nframe = 0;
unw_get_reg(&c, UNW_X86_64_RIP, &rip);
unw_get_reg(&c, UNW_X86_64_RSP, &rsp);
fprintf(file, " %i: %s (RIP=0x%" PRIx64 " RSP=0x%" PRIx64 ")\n",
- nframe, name, rip, rsp);
+ nframe, name, (std::uint64_t) rip, (std::uint64_t) rsp);
#else
fprintf(file, " %i: %s\n", nframe, name);
#endif
MC_print_statistics(mc_stats);
}
-void MC_invalidate_cache(void)
+void MC_report_crash(int status)
{
- if (mc_model_checker)
- mc_model_checker->process().cache_flags = 0;
+ XBT_INFO("**************************");
+ XBT_INFO("** CRASH IN THE PROGRAM **");
+ XBT_INFO("**************************");
+ if (WIFSIGNALED(status))
+ XBT_INFO("From signal: %s", strsignal(WTERMSIG(status)));
+ else if (WIFEXITED(status))
+ XBT_INFO("From exit: %i", WEXITSTATUS(status));
+ if (WCOREDUMP(status))
+ XBT_INFO("A core dump was generated by the system.");
+ else
+ XBT_INFO("No core dump was generated by the system.");
+ XBT_INFO("Counter-example execution trace:");
+ MC_record_dump_path(mc_stack);
+ MC_dump_stack_safety(mc_stack);
+ MC_print_statistics(mc_stats);
}
+
#endif
}
