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

diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index 064a753a3b..7b3cb1d67e 100644
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -1,7 +1,4 @@
-/* 	$Id: simix.h 5497 2008-05-26 12:19:15Z cristianrosa $	 */
-
-/* Copyright (c) 2008 Martin Quinson, Cristian Rosa.
-   All rights reserved.                                          */
+/* Copyright (c) 2008-2012. Da 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. */
@@ -14,24 +11,59 @@
 #include "xbt/dict.h"
 #include "xbt/function_types.h"
 #include "mc/datatypes.h"
-#include "simix/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"
+
+#define STD_HEAP_SIZE   20480000        /* Maximum size of the system's heap */
 
 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;
+
+extern char*_surf_mc_property_file; /* fixme: better location? */
+
+extern xbt_dynar_t mc_heap_comparison_ignore;
+extern xbt_dynar_t stacks_areas;
+
 /********************************* Global *************************************/
-XBT_PUBLIC(void) MC_init(int);
-XBT_PUBLIC(void) MC_assert(int);
-XBT_PUBLIC(void) MC_modelcheck(int);
+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);
 
-/******************************* Transitions **********************************/
-XBT_PUBLIC(mc_transition_t) MC_create_transition(mc_trans_type_t, smx_process_t, smx_rdv_t, smx_comm_t);
-XBT_PUBLIC(void) MC_transition_set_comm(mc_transition_t, smx_comm_t);
+XBT_PUBLIC(void) MC_init(void);
+XBT_PUBLIC(void) MC_exit(void);
+XBT_PUBLIC(void) MC_exit_liveness(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_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);
 
 /********************************* Memory *************************************/
-XBT_PUBLIC(void) MC_memory_init(void);   /* Initialize the memory subsystem */
+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);
 
 SG_END_DECL()