X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/70fa17187e0b928ff89cb8663426edbf6b74601a..64a60fa58ca5dc30df8b2780c4901773f219d8ea:/src/mc/mc_private.hpp diff --git a/src/mc/mc_private.hpp b/src/mc/mc_private.hpp index f51b0e9782..008fe29f3b 100644 --- a/src/mc/mc_private.hpp +++ b/src/mc/mc_private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2021. 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. */ @@ -12,36 +12,15 @@ #include "src/mc/mc_forward.hpp" #include "src/xbt/memory_map.hpp" -namespace simgrid { -namespace mc { - -struct DerefAndCompareByActorsCountAndUsedHeap { - template bool operator()(X const& a, Y const& b) - { - return std::make_pair(a->actors_count, a->heap_bytes_used) < std::make_pair(b->actors_count, b->heap_bytes_used); - } -}; -} -} - -extern "C" { - /********************************* MC Global **********************************/ XBT_PRIVATE void MC_init_dot_output(); XBT_PRIVATE extern FILE* dot_output; -XBT_PRIVATE void MC_show_deadlock(void); - -/********************************** Snapshot comparison **********************************/ - -//#define MC_DEBUG 1 -#define MC_VERBOSE 1 +XBT_PRIVATE void MC_show_deadlock(); /********************************** Miscellaneous **********************************/ -} - namespace simgrid { namespace mc { @@ -49,7 +28,7 @@ XBT_PRIVATE void find_object_address(std::vector const& map simgrid::mc::ObjectInformation* result); XBT_PRIVATE -int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc::Snapshot* s2); +bool snapshot_equal(const Snapshot* s1, const Snapshot* s2); // Move is somewhere else (in the LivenessChecker class, in the Session class?): extern XBT_PRIVATE xbt_automaton_t property_automaton;