X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/26af220e017a088b56105b2f21fadecf7d6e2a88..4c3d4cccb2f5fb04a2bc157ca321e107711cca53:/src/mc/mc_private.h

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index 85e0f21878..b6c36cf3b5 100644
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -1,11 +1,11 @@
-/* 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_PRIVATE_H
-#define MC_PRIVATE_H
+#ifndef SIMGRID_MC_PRIVATE_H
+#define SIMGRID_MC_PRIVATE_H
 
 #include <sys/types.h>
 
@@ -16,7 +16,6 @@
 #ifndef WIN32
 #include <sys/mman.h>
 #endif
-#include <elfutils/libdw.h>
 
 #include "mc/mc.h"
 #include "mc_base.h"
@@ -33,6 +32,7 @@
 #include <simgrid/msg.h>
 #include "xbt/strbuff.h"
 #include "xbt/parmap.h"
+#include <xbt/base.h>
 
 #include "mc_forward.h"
 #include "mc_protocol.h"
@@ -48,30 +48,30 @@ typedef struct s_mc_function_index_item s_mc_function_index_item_t, *mc_function
  * @param pid     PID of the target process
  * @param socket  FD for the communication socket **in server mode** (or -1 otherwise)
  */
-void MC_init_pid(pid_t pid, int socket);
+void MC_init_model_checker(pid_t pid, int socket);
 
-extern FILE *dot_output;
-extern const char* colors[13];
-extern xbt_parmap_t parmap;
+XBT_PRIVATE extern FILE *dot_output;
+XBT_PRIVATE extern const char* colors[13];
+XBT_PRIVATE extern xbt_parmap_t parmap;
 
-extern int user_max_depth_reached;
+XBT_PRIVATE extern int user_max_depth_reached;
 
-int MC_deadlock_check(void);
-void MC_replay(xbt_fifo_t stack);
-void MC_replay_liveness(xbt_fifo_t stack);
-void MC_show_deadlock(smx_simcall_t req);
-void MC_show_stack_safety(xbt_fifo_t stack);
-void MC_dump_stack_safety(xbt_fifo_t stack);
-void MC_show_non_termination(void);
+XBT_PRIVATE int MC_deadlock_check(void);
+XBT_PRIVATE void MC_replay(xbt_fifo_t stack);
+XBT_PRIVATE void MC_replay_liveness(xbt_fifo_t stack);
+XBT_PRIVATE void MC_show_deadlock(smx_simcall_t req);
+XBT_PRIVATE void MC_show_stack_safety(xbt_fifo_t stack);
+XBT_PRIVATE void MC_dump_stack_safety(xbt_fifo_t stack);
+XBT_PRIVATE void MC_show_non_termination(void);
 
 /** Stack (of `mc_state_t`) representing the current position of the
  *  the MC in the exploration graph
  *
  *  It is managed by its head (`xbt_fifo_shift` and `xbt_fifo_unshift`).
  */
-extern xbt_fifo_t mc_stack;
+XBT_PRIVATE extern xbt_fifo_t mc_stack;
 
-int get_search_interval(xbt_dynar_t list, void *ref, int *min, int *max);
+XBT_PRIVATE int get_search_interval(xbt_dynar_t list, void *ref, int *min, int *max);
 
 
 /****************************** Statistics ************************************/
@@ -85,9 +85,9 @@ typedef struct mc_stats {
   unsigned long executed_transitions;
 } s_mc_stats_t, *mc_stats_t;
 
-extern mc_stats_t mc_stats;
+XBT_PRIVATE extern mc_stats_t mc_stats;
 
-void MC_print_statistics(mc_stats_t stats);
+XBT_PRIVATE void MC_print_statistics(mc_stats_t stats);
 
 /********************************** Snapshot comparison **********************************/
 
@@ -100,51 +100,24 @@ typedef struct s_mc_comparison_times{
   double stacks_comparison_time;
 }s_mc_comparison_times_t, *mc_comparison_times_t;
 
-extern __thread mc_comparison_times_t mc_comp_times;
-extern __thread double mc_snapshot_comparison_time;
+extern XBT_PRIVATE __thread mc_comparison_times_t mc_comp_times;
+extern XBT_PRIVATE __thread double mc_snapshot_comparison_time;
 
-int snapshot_compare(void *state1, void *state2);
-void print_comparison_times(void);
+XBT_PRIVATE int snapshot_compare(void *state1, void *state2);
+XBT_PRIVATE void print_comparison_times(void);
 
 //#define MC_DEBUG 1
 #define MC_VERBOSE 1
 
-/********************************** Variables with DWARF **********************************/
-
-void MC_find_object_address(memory_map_t maps, mc_object_info_t result);
-
 /********************************** Miscellaneous **********************************/
 
-typedef struct s_local_variable{
-  dw_frame_t subprogram;
-  unsigned long ip;
-  char *name;
-  dw_type_t type;
-  void *address;
-  int region;
-}s_local_variable_t, *local_variable_t;
-
-/* *********** Hash *********** */
-
-/** \brief Hash the current state
- *  \param num_state number of states
- *  \param stacks stacks (mc_snapshot_stak_t) used fot the stack unwinding informations
- *  \result resulting hash
- * */
-uint64_t mc_hash_processes_state(int num_state, xbt_dynar_t stacks);
-
-/** @brief Dump the stacks of the application processes
- *
- *   This functions is currently not used but it is quite convenient
- *   to call from the debugger.
- *
- *   Does not work when an application thread is running.
- */
-void MC_dump_stacks(FILE* file);
+XBT_PRIVATE void MC_dump_stacks(FILE* file);
+
+XBT_PRIVATE void MC_report_assertion_error(void);
 
-void MC_report_assertion_error(void);
+XBT_PRIVATE void MC_invalidate_cache(void);
 
-void MC_invalidate_cache(void);
+XBT_PRIVATE int MC_important_snapshot(mc_snapshot_t snapshot);
 
 SG_END_DECL()