#ifndef SIMGRID_MC_PRIVATE_H
#define SIMGRID_MC_PRIVATE_H
+#include "simgrid_config.h"
+
#include <sys/types.h>
-#include "simgrid_config.h"
#include <stdio.h>
-#include <stdint.h>
-#include <stdbool.h>
#ifndef WIN32
#include <sys/mman.h>
#endif
+
#include <elfutils/libdw.h>
+#include <simgrid/msg.h>
+#include <xbt/fifo.h>
+#include <xbt/config.h>
+#include <xbt/base.h>
+
#include "mc/mc.h"
-#include "mc_base.h"
#include "mc/datatypes.h"
-#include "xbt/fifo.h"
-#include "xbt/config.h"
+#include "src/mc/mc_base.h"
+
+#include "src/simix/smx_private.h"
+#include "src/xbt/mmalloc/mmprivate.h"
#ifdef __cplusplus
-#include "../xbt/memory_map.hpp"
+#include "src/mc/mc_forward.hpp"
+#include "src/xbt/memory_map.hpp"
#endif
-#include "xbt/function_types.h"
-#include "xbt/mmalloc.h"
-#include "../simix/smx_private.h"
-#include "../xbt/mmalloc/mmprivate.h"
-#include "xbt/automaton.h"
-#include "xbt/hash.h"
-#include <simgrid/msg.h>
-#include "xbt/strbuff.h"
-#include "xbt/parmap.h"
-#include <xbt/base.h>
-
-#include "mc_forward.h"
-#include "mc_protocol.h"
+#include "src/mc/mc_protocol.h"
SG_BEGIN_DECL()
-typedef struct s_mc_function_index_item s_mc_function_index_item_t, *mc_function_index_item_t;
-
/********************************* MC Global **********************************/
XBT_PRIVATE void MC_init_dot_output();
XBT_PRIVATE extern FILE *dot_output;
XBT_PRIVATE extern const char* colors[13];
-XBT_PRIVATE extern xbt_parmap_t parmap;
XBT_PRIVATE extern int user_max_depth_reached;
/********************************** Snapshot comparison **********************************/
-typedef struct s_mc_comparison_times{
- double nb_processes_comparison_time;
- double bytes_used_comparison_time;
- double stacks_sizes_comparison_time;
- double global_variables_comparison_time;
- double heap_comparison_time;
- double stacks_comparison_time;
-}s_mc_comparison_times_t, *mc_comparison_times_t;
-
-extern XBT_PRIVATE __thread mc_comparison_times_t mc_comp_times;
-extern XBT_PRIVATE __thread double mc_snapshot_comparison_time;
-
XBT_PRIVATE int snapshot_compare(void *state1, void *state2);
-XBT_PRIVATE void print_comparison_times(void);
//#define MC_DEBUG 1
#define MC_VERBOSE 1
/********************************** Miscellaneous **********************************/
-XBT_PRIVATE void MC_dump_stacks(FILE* file);
-
XBT_PRIVATE void MC_report_assertion_error(void);
XBT_PRIVATE void MC_report_crash(int status);
-XBT_PRIVATE void MC_invalidate_cache(void);
-
#ifdef __cplusplus
-XBT_PRIVATE void MC_find_object_address(
+namespace simgrid {
+namespace mc {
+
+XBT_PRIVATE void find_object_address(
std::vector<simgrid::xbt::VmMap> const& maps, simgrid::mc::ObjectInformation* result);
+}
+}
+
#endif
SG_END_DECL()