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

diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index e0eb414f1e..b306717bf3 100644
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -1,22 +1,16 @@
-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-2017. 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 <simgrid_config.h>
-#include <xbt/base.h>
-#include <xbt/misc.h>
+#include <src/internal_config.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 */
+#if HAVE_UCONTEXT_H
+#include <ucontext.h>           /* context relative declarations */
 #endif
 
 /* Maximum size of the application heap.
@@ -40,42 +34,36 @@ 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;
 extern XBT_PRIVATE int _sg_mc_max_depth;
-extern XBT_PUBLIC(int) _sg_mc_visited;
+extern XBT_PUBLIC(int) _sg_mc_max_visited_states;
 extern XBT_PRIVATE char* _sg_mc_dot_output_file;
 extern XBT_PUBLIC(int) _sg_mc_comms_determinism;
 extern XBT_PUBLIC(int) _sg_mc_send_determinism;
-extern XBT_PRIVATE int _sg_mc_safety;
-extern XBT_PRIVATE int _sg_mc_liveness;
 extern XBT_PRIVATE int _sg_mc_snapshot_fds;
 extern XBT_PRIVATE int _sg_mc_termination;
 
 /********************************* 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);
-XBT_PRIVATE void _mc_cfg_cb_hash(const char *name, int pos);
-XBT_PRIVATE void _mc_cfg_cb_max_depth(const char *name, int pos);
-XBT_PRIVATE void _mc_cfg_cb_visited(const char *name, int pos);
-XBT_PRIVATE void _mc_cfg_cb_dot_output(const char *name, int pos);
-XBT_PRIVATE void _mc_cfg_cb_comms_determinism(const char *name, int pos);
-XBT_PRIVATE void _mc_cfg_cb_send_determinism(const char *name, int pos);
-XBT_PRIVATE void _mc_cfg_cb_termination(const char *name, int pos);
+XBT_PRIVATE void _mc_cfg_cb_reduce(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_checkpoint(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_sparse_checkpoint(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_ksm(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_property(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_timeout(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_snapshot_fds(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_hash(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_max_depth(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_visited(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_dot_output(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_comms_determinism(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_send_determinism(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_termination(const char *name);
 
-XBT_PUBLIC(void) MC_run(void);
-XBT_PUBLIC(void) MC_init(void);
-XBT_PUBLIC(void) MC_exit(void);
-XBT_PUBLIC(void) MC_process_clock_add(smx_process_t, double);
-XBT_PUBLIC(double) MC_process_clock_get(smx_process_t);
+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);
 
 /****************************** MC ignore **********************************/
@@ -83,13 +71,15 @@ 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, ucontext_t* context, size_t size);
+#if HAVE_UCONTEXT_H
+XBT_PUBLIC(void) MC_register_stack_area(void *stack, smx_actor_t process, ucontext_t* context, size_t size);
+#endif
 
 /********************************* Memory *************************************/
-XBT_PUBLIC(void) MC_memory_init(void);  /* Initialize the memory subsystem */
-XBT_PUBLIC(void) MC_memory_exit(void);
-XBT_PUBLIC(void) MC_memory_init_server(void);
+XBT_PUBLIC(void) MC_memory_init();  /* Initialize the memory subsystem */
+XBT_PUBLIC(void) MC_memory_exit();
+XBT_PUBLIC(void) MC_memory_init_server();
 
 SG_END_DECL()
 
-#endif                          /* _MC_MC_H */
+#endif /* MC_MC_H */