* under the terms of the license (GNU LGPL) which comes with this package. */
#include <cinttypes>
-
#include <cassert>
#include <cstddef>
#include <cstdint>
-#include <cstring>
#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 "src/surf/surf_private.h"
-#include "src/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 <libunwind.h>
-#include <xbt/mmalloc.h>
-#include "src/xbt/mmalloc/mmprivate.h"
-#include "src/mc/mc_object_info.h"
#include "src/mc/mc_comm_pattern.h"
#include "src/mc/mc_request.h"
#include "src/mc/mc_safety.h"
#include "src/mc/mc_unw.h"
#include "src/mc/mc_smx.h"
#endif
+
#include "src/mc/mc_record.h"
#include "src/mc/mc_protocol.h"
#include "src/mc/mc_client.h"
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 */
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);