X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/65fb3bd8de358e97a3a971de6781661456de302d..5fd27b8ad8089c48410010f4a39f7fb4eb0ca4b5:/src/mc/mc_private.h

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index cc31c85d69..0bdeb53563 100644
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-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. */
@@ -7,137 +6,39 @@
 #ifndef SIMGRID_MC_PRIVATE_H
 #define SIMGRID_MC_PRIVATE_H
 
-#include "simgrid_config.h"
-
-#include <sys/types.h>
-
-#include <stdio.h>
-#ifndef WIN32
-#include <sys/mman.h>
-#endif
-
-#ifdef __cpluscplus
-#include <algorithm>
-#endif
-
-#include <elfutils/libdw.h>
-
-#include <simgrid/msg.h>
-#include <xbt/fifo.h>
-#include <xbt/config.h>
-#include <xbt/base.h>
-
 #include "mc/mc.h"
-#include "mc/datatypes.h"
-#include "src/mc/mc_base.h"
-
-#include "src/simix/smx_private.h"
-#include "src/xbt/mmalloc/mmprivate.h"
+#include "xbt/automaton.h"
 
 #ifdef __cplusplus
 #include "src/mc/mc_forward.hpp"
 #include "src/xbt/memory_map.hpp"
 #endif
 
-#include "src/mc/mc_protocol.h"
-
-SG_BEGIN_DECL()
-
-/********************************* MC Global **********************************/
-
-XBT_PRIVATE void MC_init_dot_output();
-
-XBT_PRIVATE extern FILE *dot_output;
-
-XBT_PRIVATE extern int user_max_depth_reached;
-
-XBT_PRIVATE void MC_replay(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`).
- */
-XBT_PRIVATE extern xbt_fifo_t mc_stack;
-
 #ifdef __cplusplus
-
-SG_END_DECL()
-
 namespace simgrid {
 namespace mc {
 
-struct DerefAndCompareByNbProcessesAndUsedHead {
+struct DerefAndCompareByActorsCountAndUsedHeap {
   template<class X, class Y>
   bool operator()(X const& a, Y const& b)
   {
-    return std::make_pair(a->nb_processes, a->heap_bytes_used) <
-      std::make_pair(b->nb_processes, b->heap_bytes_used);
+    return std::make_pair(a->actors_count, a->heap_bytes_used) < std::make_pair(b->actors_count, b->heap_bytes_used);
   }
 };
 
-/**
- *  \brief Find a suitable subrange of candidate duplicates for a given state
- *  \param list dynamic array of states/pairs with candidate duplicates of the current state;
- *  \param ref current state/pair;
- *  \param min (output) index of the beginning of the the subrange
- *  \param max (output) index of the enf of the subrange
- *
- *  Given a suitably ordered array of states/pairs, this function extracts a subrange
- *  (with index *min <= i <= *max) with candidate duplicates of the given state/pair.
- *  This function uses only fast discriminating criterions and does not use the
- *  full state/pair comparison algorithms.
- *
- *  The states/pairs in list MUST be ordered using a (given) weak order
- *  (based on nb_processes and heap_bytes_used).
- *  The subrange is the subrange of "equivalence" of the given state/pair.
- */
-// TODO, it would make sense to use std::set instead
-// U = some pointer of T (T*, unique_ptr<T>, shared_ptr<T>)
-template<class U, class T>
-int get_search_interval(
-  U* list, std::size_t count, T *ref, int *min, int *max)
-{
-  auto res = std::equal_range(
-    list, list + count, ref, DerefAndCompareByNbProcessesAndUsedHead());
-
-  // Not found, but we have the insertion point:
-  if (res.first == res.second)
-    return res.first - list;
-
-  // Found, we have the whole matching range:
-  else {
-    *min = res.first - list;
-    *max = (res.second - 1) - list;
-    return -1;
-  }
-}
-
 }
 }
-
 #endif
 
 SG_BEGIN_DECL()
 
-/****************************** Statistics ************************************/
+/********************************* MC Global **********************************/
 
-typedef struct mc_stats {
-  unsigned long state_size;
-  unsigned long visited_states;
-  unsigned long visited_pairs;
-  unsigned long expanded_states;
-  unsigned long expanded_pairs;
-  unsigned long executed_transitions;
-} s_mc_stats_t, *mc_stats_t;
+XBT_PRIVATE void MC_init_dot_output();
 
-XBT_PRIVATE extern mc_stats_t mc_stats;
+XBT_PRIVATE extern FILE *dot_output;
 
-XBT_PRIVATE void MC_print_statistics(mc_stats_t stats);
+XBT_PRIVATE void MC_show_deadlock(void);
 
 /********************************** Snapshot comparison **********************************/
 
@@ -146,9 +47,6 @@ XBT_PRIVATE void MC_print_statistics(mc_stats_t stats);
 
 /********************************** Miscellaneous **********************************/
 
-XBT_PRIVATE void MC_report_assertion_error(void);
-XBT_PRIVATE void MC_report_crash(int status);
-
 SG_END_DECL()
 
 #ifdef __cplusplus
@@ -162,6 +60,9 @@ XBT_PRIVATE void find_object_address(
 XBT_PRIVATE
 int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc::Snapshot* s2);
 
+// Move is somewhere else (in the LivenessChecker class, in the Session class?):
+extern XBT_PRIVATE xbt_automaton_t property_automaton;
+
 }
 }