code simplification around simgrid::surf::NetCardImpl

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

diff --git a/src/mc/mc_safety.h b/src/mc/mc_safety.h
index 00e4a0f..d6c907d 100644 (file)
--- a/src/mc/mc_safety.h
+++ b/src/mc/mc_safety.h
@@ -1,18 +1,19 @@
-/* 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 <simgrid_config.h>
+#include <xbt/base.h>
 #include <xbt/dict.h>
-#include "mc_forward.h"
-#include "mc_state.h"
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/mc_state.h"
 
 SG_BEGIN_DECL()
 
@@ -22,11 +23,11 @@ typedef enum {
   e_mc_reduce_dpor
 } e_mc_reduce_t;
 
-extern XBT_INTERNAL e_mc_reduce_t mc_reduce_kind;
+extern XBT_PRIVATE e_mc_reduce_t mc_reduce_kind;
 
-void MC_modelcheck_safety(void);
+int MC_modelcheck_safety(void);
 
-typedef struct s_mc_visited_state{
+typedef struct XBT_PRIVATE s_mc_visited_state{
   mc_snapshot_t system_state;
   size_t heap_bytes_used;
   int nb_processes;
@@ -34,10 +35,10 @@ typedef struct s_mc_visited_state{
   int other_num; // dot_output for
 }s_mc_visited_state_t, *mc_visited_state_t;
 
-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 xbt_dynar_t visited_states;
+XBT_PRIVATE mc_visited_state_t is_visited_state(mc_state_t graph_state);
+XBT_PRIVATE void visited_state_free(mc_visited_state_t state);
+XBT_PRIVATE void visited_state_free_voidp(void *s);
 
 SG_END_DECL()