Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / mc / mc_safety.h

diff --git a/src/mc/mc_safety.h b/src/mc/mc_safety.h
index bd5ab1f..8e0e164 100644 (file)
--- a/src/mc/mc_safety.h
+++ b/src/mc/mc_safety.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,36 +9,27 @@
 
 #include <stdint.h>
 
-#include <simgrid_config.h>
-#include <xbt/dict.h>
-#include "mc_forward.h"
-#include "mc_state.h"
+#include <memory>
 
-SG_BEGIN_DECL()
+#include <simgrid_config.h>
 
-typedef enum {
-  e_mc_reduce_unset,
-  e_mc_reduce_none,
-  e_mc_reduce_dpor
-} e_mc_reduce_t;
+#include <xbt/base.h>
 
-extern XBT_INTERNAL e_mc_reduce_t mc_reduce_kind;
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/mc_state.h"
 
-void MC_modelcheck_safety(void);
+namespace simgrid {
+namespace mc {
 
-typedef struct s_mc_visited_state{
-  mc_snapshot_t system_state;
-  size_t heap_bytes_used;
-  int nb_processes;
-  int num;
-  int other_num; // dot_output for
-}s_mc_visited_state_t, *mc_visited_state_t;
+enum class ReductionMode {
+  unset,
+  none,
+  dpor,
+};
 
-extern XBT_INTERNAL xbt_dynar_t visited_states;
-XBT_INTERNAL mc_visited_state_t is_visited_state(mc_state_t graph_state);
-XBT_INTERNAL void visited_state_free(mc_visited_state_t state);
-XBT_INTERNAL void visited_state_free_voidp(void *s);
+extern XBT_PRIVATE simgrid::mc::ReductionMode reduction_mode;
 
-SG_END_DECL()
+}
+}
 
 #endif