Merge branch 'master' of github.com:mquinson/simgrid

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

diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index 5052281..00d6eb8 100644 (file)
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -7,15 +7,17 @@
 #ifndef _MC_MC_H
 #define _MC_MC_H
 
-#include "xbt/base.h"
-#include "xbt/misc.h"
-#include "xbt/fifo.h"
-#include "xbt/dict.h"
-#include "xbt/function_types.h"
-#include "simgrid/simix.h"
-#include "simgrid/modelchecker.h" /* our public interface (and definition of HAVE_MC) */
-#include "xbt/automaton.h"
-#include "xbt/dynar.h"
+#include <simgrid_config.h>
+#include <xbt/base.h>
+#include <xbt/misc.h>
+#include <simgrid/simix.h>
+#include <simgrid/modelchecker.h> /* our public interface (and definition of HAVE_MC) */
+
+#ifdef _XBT_WIN32
+#  include <xbt/win32_ucontext.h>     /* context relative declarations */
+#else
+#  include <ucontext.h>           /* context relative declarations */
+#endif
 
 /* Maximum size of the application heap.
  *
@@ -36,11 +38,14 @@
 
 SG_BEGIN_DECL()
 
-/********************************** Configuration of MC **************************************/        
+/********************************** Configuration of MC **************************************/  
+
 extern XBT_PUBLIC(int) _sg_do_model_check;
 extern XBT_PRIVATE int _sg_do_model_check_record;
 extern XBT_PRIVATE int _sg_mc_checkpoint;
 extern XBT_PUBLIC(int) _sg_mc_sparse_checkpoint;
+extern XBT_PUBLIC(int) _sg_mc_ksm;
+extern XBT_PUBLIC(int) _sg_mc_soft_dirty;
 extern XBT_PUBLIC(char*) _sg_mc_property_file;
 extern XBT_PRIVATE int _sg_mc_timeout;
 extern XBT_PRIVATE int _sg_mc_hash;
@@ -54,13 +59,13 @@ extern XBT_PRIVATE int _sg_mc_liveness;
 extern XBT_PRIVATE int _sg_mc_snapshot_fds;
 extern XBT_PRIVATE int _sg_mc_termination;
 
-extern XBT_PRIVATE xbt_dynar_t mc_heap_comparison_ignore;
-extern XBT_PRIVATE xbt_dynar_t stacks_areas;
-
 /********************************* Global *************************************/
+
 XBT_PRIVATE void _mc_cfg_cb_reduce(const char *name, int pos);
 XBT_PRIVATE void _mc_cfg_cb_checkpoint(const char *name, int pos);
 XBT_PRIVATE void _mc_cfg_cb_sparse_checkpoint(const char *name, int pos);
+XBT_PRIVATE void _mc_cfg_cb_ksm(const char *name, int pos);
+XBT_PRIVATE void _mc_cfg_cb_soft_dirty(const char *name, int pos);
 XBT_PRIVATE void _mc_cfg_cb_property(const char *name, int pos);
 XBT_PRIVATE void _mc_cfg_cb_timeout(const char *name, int pos);
 XBT_PRIVATE void _mc_cfg_cb_snapshot_fds(const char *name, int pos);
@@ -84,7 +89,7 @@ XBT_PUBLIC(void) MC_ignore_heap(void *address, size_t size);
 XBT_PUBLIC(void) MC_remove_ignore_heap(void *address, size_t size);
 XBT_PUBLIC(void) MC_ignore_local_variable(const char *var_name, const char *frame);
 XBT_PUBLIC(void) MC_ignore_global_variable(const char *var_name);
-XBT_PUBLIC(void) MC_register_stack_area(void *stack, smx_process_t process, void *context, size_t size);
+XBT_PUBLIC(void) MC_register_stack_area(void *stack, smx_process_t process, ucontext_t* context, size_t size);
 
 /********************************* Memory *************************************/
 XBT_PUBLIC(void) MC_memory_init(void);  /* Initialize the memory subsystem */