X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4e78565ea6b354a0e6250a87b483f909665a0ac3..a4b9c2131bcbd81e935a03d9f3bb0b7d0ae48c31:/src/include/mc/mc.h

diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index 8be2fd4e74..b502542fb8 100644
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -1,70 +1,38 @@
-/* Copyright (c) 2008-2012. Da SimGrid Team. All rights reserved.           */
+/* Copyright (c) 2008-2019. 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_MC_H
-#define _MC_MC_H
+#ifndef MC_MC_H
+#define MC_MC_H
 
-#include "xbt/misc.h"
-#include "xbt/fifo.h"
-#include "xbt/dict.h"
-#include "xbt/function_types.h"
-#include "mc/datatypes.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/forward.h>
+#include <simgrid/modelchecker.h> /* our public interface (and definition of SIMGRID_HAVE_MC) */
 
-#define STD_HEAP_SIZE   20480000        /* Maximum size of the system's heap */
+/* Maximum size of the application heap.
+ *
+ * The model-checker heap is placed at this offset from the beginning of the application heap.
+ *
+ * In the current implementation, if the application uses more than this for the application heap the application heap
+ * will smash the beginning of the model-checker heap and bad things will happen.
+ *
+ * For 64 bits systems, we have a lot of virtual memory available so we wan use a much bigger value in order to avoid
+ * bad things from happening.
+ * */
 
-SG_BEGIN_DECL()
-
-/********************************** Configuration of MC **************************************/	
-extern int _sg_do_model_check;
-extern int _sg_mc_checkpoint;
-extern char* _sg_mc_property_file;
-extern int _sg_mc_timeout;
-extern int _sg_mc_max_depth;
-extern int _sg_mc_visited;
+#define STD_HEAP_SIZE   (sizeof(void*)<=4 ? (100*1024*1024) : (1ll*1024*1024*1024*1024))
 
-extern xbt_dynar_t mc_heap_comparison_ignore;
-extern xbt_dynar_t stacks_areas;
-extern void *maestro_stack_start;
-extern void *maestro_stack_end;
+SG_BEGIN_DECL()
 
 /********************************* Global *************************************/
-void _mc_cfg_cb_reduce(const char *name, int pos);
-void _mc_cfg_cb_checkpoint(const char *name, int pos);
-void _mc_cfg_cb_property(const char *name, int pos);
-void _mc_cfg_cb_timeout(const char *name, int pos);
-void _mc_cfg_cb_max_depth(const char *name, int pos);
-void _mc_cfg_cb_visited(const char *name, int pos);
-
-XBT_PUBLIC(void) MC_do_the_modelcheck_for_real(void);
-
-XBT_PUBLIC(void) MC_init(void);
-XBT_PUBLIC(void) MC_exit(void);
-XBT_PUBLIC(void) MC_modelcheck_safety(void);
-XBT_PUBLIC(void) MC_modelcheck_liveness(void);
-XBT_PUBLIC(void) MC_process_clock_add(smx_process_t, double);
-XBT_PUBLIC(double) MC_process_clock_get(smx_process_t);
-void MC_automaton_load(const char *file);
-
-/****************************** MC ignore **********************************/
-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_stack(const char *var_name, const char *frame);
-XBT_PUBLIC(void) MC_ignore_data_bss(void *address, size_t size);
-void MC_new_stack_area(void *stack, char *name, void *context, size_t size);
+XBT_ATTRIB_NORETURN XBT_PUBLIC void MC_run();
+XBT_PUBLIC void MC_process_clock_add(smx_actor_t, double);
+XBT_PUBLIC double MC_process_clock_get(smx_actor_t);
+XBT_PRIVATE void MC_automaton_load(const char *file);
 
 /********************************* Memory *************************************/
-XBT_PUBLIC(void) MC_memory_init(void);  /* Initialize the memory subsystem */
-XBT_PUBLIC(void) MC_memory_exit(void);
-
-/* Trigger for state equality detection (check potential cycle in application) */
-void MC_compare(void);
+XBT_PUBLIC void MC_memory_init(); /* Initialize the memory subsystem */
 
 SG_END_DECL()
 
-#endif                          /* _MC_MC_H */
+#endif