#ifndef SIMGRID_MC_PRIVATE_H
#define SIMGRID_MC_PRIVATE_H
+#include "simgrid_config.h"
+
#include <sys/types.h>
-#include "simgrid_config.h"
#include <stdio.h>
-#include <stdint.h>
-#include <stdbool.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_base.h"
#include "mc/datatypes.h"
-#include "xbt/fifo.h"
-#include "xbt/config.h"
+#include "src/mc/mc_base.h"
+
+#include "src/simix/smx_private.h"
+#include "src/xbt/mmalloc/mmprivate.h"
#ifdef __cplusplus
-#include "../xbt/memory_map.hpp"
+#include "src/mc/mc_forward.hpp"
+#include "src/xbt/memory_map.hpp"
#endif
-#include "xbt/function_types.h"
-#include "xbt/mmalloc.h"
-#include "../simix/smx_private.h"
-#include "../xbt/mmalloc/mmprivate.h"
-#include "xbt/automaton.h"
-#include "xbt/hash.h"
-#include <simgrid/msg.h>
-#include "xbt/strbuff.h"
-#include "xbt/parmap.h"
-#include <xbt/base.h>
-
-#include "mc_forward.h"
-#include "mc_protocol.h"
+#include "src/mc/mc_protocol.h"
SG_BEGIN_DECL()
-typedef struct s_mc_function_index_item s_mc_function_index_item_t, *mc_function_index_item_t;
-
/********************************* MC Global **********************************/
XBT_PRIVATE void MC_init_dot_output();
XBT_PRIVATE extern FILE *dot_output;
-XBT_PRIVATE extern const char* colors[13];
-XBT_PRIVATE extern xbt_parmap_t parmap;
XBT_PRIVATE extern int user_max_depth_reached;
-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 extern xbt_fifo_t mc_stack;
-XBT_PRIVATE int get_search_interval(xbt_dynar_t list, void *ref, int *min, int *max);
+#ifdef __cplusplus
+
+SG_END_DECL()
+
+namespace simgrid {
+namespace mc {
+
+struct DerefAndCompareByNbProcessesAndUsedHead {
+ 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);
+ }
+};
+
+/**
+ * \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 ************************************/
/********************************** Snapshot comparison **********************************/
-XBT_PRIVATE int snapshot_compare(void *state1, void *state2);
-
//#define MC_DEBUG 1
#define MC_VERBOSE 1
/********************************** Miscellaneous **********************************/
-XBT_PRIVATE void MC_dump_stacks(FILE* file);
-
XBT_PRIVATE void MC_report_assertion_error(void);
XBT_PRIVATE void MC_report_crash(int status);
-XBT_PRIVATE void MC_invalidate_cache(void);
+SG_END_DECL()
#ifdef __cplusplus
-XBT_PRIVATE void MC_find_object_address(
+namespace simgrid {
+namespace mc {
+
+XBT_PRIVATE void find_object_address(
std::vector<simgrid::xbt::VmMap> const& maps, simgrid::mc::ObjectInformation* result);
-#endif
+XBT_PRIVATE
+int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc::Snapshot* s2);
-SG_END_DECL()
+}
+}
+
+#endif
#endif
