-/* 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
* under the terms of the license (GNU LGPL) which comes with this package. */
-#ifndef MC_SAFETY_H
-#define MC_SAFETY_H
+#ifndef SIMGRID_MC_SAFETY_H
+#define SIMGRID_MC_SAFETY_H
#include <stdint.h>
+#include <vector>
+#include <memory>
+
#include <simgrid_config.h>
-#include <xbt/dict.h>
-#include "mc_forward.h"
-#include "mc_state.h"
-SG_BEGIN_DECL()
+#include <xbt/base.h>
+#include <xbt/dynar.h>
+
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/mc_state.h"
+
+namespace simgrid {
+namespace mc {
-typedef enum {
- e_mc_reduce_unset,
- e_mc_reduce_none,
- e_mc_reduce_dpor
-} e_mc_reduce_t;
+enum class ReductionMode {
+ unset,
+ none,
+ dpor,
+};
-extern e_mc_reduce_t mc_reduce_kind;
+extern XBT_PRIVATE simgrid::mc::ReductionMode reduction_mode;
-void MC_modelcheck_safety(void);
+struct XBT_PRIVATE VisitedState {
+ simgrid::mc::Snapshot* system_state = nullptr;
+ size_t heap_bytes_used = 0;
+ int nb_processes = 0;
+ int num = 0;
+ int other_num = 0; // dot_output for
-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;
+ VisitedState();
+ ~VisitedState();
+};
-extern xbt_dynar_t visited_states;
-mc_visited_state_t is_visited_state(mc_state_t graph_state);
-void visited_state_free(mc_visited_state_t state);
-void visited_state_free_voidp(void *s);
+extern XBT_PRIVATE std::vector<std::unique_ptr<simgrid::mc::VisitedState>> visited_states;
+XBT_PRIVATE std::unique_ptr<simgrid::mc::VisitedState> is_visited_state(mc_state_t graph_state);
+XBT_PRIVATE int snapshot_compare(simgrid::mc::VisitedState* state1, simgrid::mc::VisitedState* state2);
-SG_END_DECL()
+}
+}
#endif
