[mc] Make s_local_variable::name a std::string

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

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index 4d2e916..631681d 100644 (file)
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -23,8 +23,6 @@
 #include "mc/datatypes.h"
 #include "xbt/fifo.h"
 #include "xbt/config.h"
-#include <libunwind.h>
-#include <dwarf.h>
 
 #include "xbt/function_types.h"
 #include "xbt/mmalloc.h"
@@ -50,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_INTERNAL extern FILE *dot_output;
+XBT_INTERNAL extern const char* colors[13];
+XBT_INTERNAL extern xbt_parmap_t parmap;
 
-extern int user_max_depth_reached;
+XBT_INTERNAL 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_INTERNAL int MC_deadlock_check(void);
+XBT_INTERNAL void MC_replay(xbt_fifo_t stack);
+XBT_INTERNAL void MC_replay_liveness(xbt_fifo_t stack);
+XBT_INTERNAL void MC_show_deadlock(smx_simcall_t req);
+XBT_INTERNAL void MC_show_stack_safety(xbt_fifo_t stack);
+XBT_INTERNAL void MC_dump_stack_safety(xbt_fifo_t stack);
+XBT_INTERNAL 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_INTERNAL extern xbt_fifo_t mc_stack;
 
-int get_search_interval(xbt_dynar_t list, void *ref, int *min, int *max);
+XBT_INTERNAL int get_search_interval(xbt_dynar_t list, void *ref, int *min, int *max);
 
 
 /****************************** Statistics ************************************/
@@ -87,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_INTERNAL extern mc_stats_t mc_stats;
 
-void MC_print_statistics(mc_stats_t stats);
+XBT_INTERNAL void MC_print_statistics(mc_stats_t stats);
 
 /********************************** Snapshot comparison **********************************/
 
@@ -102,39 +100,17 @@ 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_INTERNAL __thread mc_comparison_times_t mc_comp_times;
+extern XBT_INTERNAL __thread double mc_snapshot_comparison_time;
 
-int snapshot_compare(void *state1, void *state2);
-void print_comparison_times(void);
+XBT_INTERNAL int snapshot_compare(void *state1, void *state2);
+XBT_INTERNAL 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;
-
-/* *********** Sets *********** */
-
-typedef struct s_mc_address_set *mc_address_set_t;
-
-mc_address_set_t mc_address_set_new(void);
-void mc_address_set_free(mc_address_set_t* p);
-void mc_address_add(mc_address_set_t p, const void* value);
-bool mc_address_test(mc_address_set_t p, const void* value);
-
 /* *********** Hash *********** */
 
 /** \brief Hash the current state
@@ -142,7 +118,7 @@ bool mc_address_test(mc_address_set_t p, const void* value);
  *  \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);
+XBT_INTERNAL uint64_t mc_hash_processes_state(int num_state, xbt_dynar_t stacks);
 
 /** @brief Dump the stacks of the application processes
  *
@@ -151,9 +127,11 @@ uint64_t mc_hash_processes_state(int num_state, xbt_dynar_t stacks);
  *
  *   Does not work when an application thread is running.
  */
-void MC_dump_stacks(FILE* file);
+XBT_INTERNAL void MC_dump_stacks(FILE* file);
+
+XBT_INTERNAL void MC_report_assertion_error(void);
 
-void MC_report_assertion_error(void);
+XBT_INTERNAL void MC_invalidate_cache(void);
 
 SG_END_DECL()