#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 <xbt/automaton.h>
#include "mc/mc.h"
#include "mc/datatypes.h"
#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 DerefAndCompareByNbProcessesAndUsedHeap {
template<class X, class Y>
bool operator()(X const& a, Y const& b)
{
}
};
-/**
- * \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()
+/********************************* MC Global **********************************/
+
+XBT_PRIVATE void MC_init_dot_output();
+
+XBT_PRIVATE extern FILE *dot_output;
+
+XBT_PRIVATE void MC_show_deadlock(void);
+
/****************************** Statistics ************************************/
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 extern mc_stats_t mc_stats;
-XBT_PRIVATE void MC_print_statistics(mc_stats_t stats);
-
/********************************** Snapshot comparison **********************************/
//#define MC_DEBUG 1
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;
+
}
}
