X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2945198502e436f29236715c0baca1efadb64480..08a29a4221dc5cec95b766cd9b25c95dcc361df9:/src/mc/mc_global.cpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index 8cd7f9f7a5..0dfb9f89b7 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2008-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2008-2019. 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. */ @@ -13,9 +12,9 @@ #include -#include -#include -#include +#include "xbt/automaton.h" +#include "xbt/backtrace.hpp" +#include "xbt/dynar.h" #include "mc_base.h" @@ -27,29 +26,27 @@ #include #endif -#include "src/simix/smx_process_private.h" - -#if HAVE_MC +#include "src/simix/ActorImpl.hpp" + +#if SIMGRID_HAVE_MC +#include "src/mc/checker/Checker.hpp" +#include "src/mc/mc_comm_pattern.hpp" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_request.hpp" +#include "src/mc/mc_safety.hpp" +#include "src/mc/mc_smx.hpp" +#include "src/mc/mc_unw.hpp" +#include "src/mc/sosp/mc_snapshot.hpp" #include -#include "src/mc/mc_comm_pattern.h" -#include "src/mc/mc_request.h" -#include "src/mc/mc_safety.h" -#include "src/mc/mc_snapshot.h" -#include "src/mc/mc_private.h" -#include "src/mc/mc_unw.h" -#include "src/mc/mc_smx.h" -#include "src/mc/Checker.hpp" #endif -#include "src/mc/mc_record.h" -#include "src/mc/mc_protocol.h" -#include "src/mc/Client.hpp" #include "src/mc/Transition.hpp" +#include "src/mc/mc_record.hpp" +#include "src/mc/remote/Client.hpp" +#include "src/mc/remote/mc_protocol.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)"); -e_mc_mode_t mc_mode; - namespace simgrid { namespace mc { @@ -58,7 +55,7 @@ std::vector processes_time; } } -#if HAVE_MC +#if SIMGRID_HAVE_MC /* Liveness */ @@ -74,12 +71,12 @@ xbt_automaton_t property_automaton = nullptr; FILE *dot_output = nullptr; -/******************************* Initialisation of MC *******************************/ +/******************************* Initialization of MC *******************************/ /*********************************************************************************/ void MC_init_dot_output() { - dot_output = fopen(_sg_mc_dot_output_file, "w"); + dot_output = fopen(_sg_mc_dot_output_file.get().c_str(), "w"); if (dot_output == nullptr) { perror("Error open dot output file"); @@ -96,23 +93,20 @@ void MC_init_dot_output() void MC_run() { - simgrid::mc::processes_time.resize(simix_process_maxpid); + simgrid::mc::processes_time.resize(SIMIX_process_get_maxpid()); MC_ignore_heap(simgrid::mc::processes_time.data(), simgrid::mc::processes_time.size() * sizeof(simgrid::mc::processes_time[0])); - smx_process_t process; - xbt_swag_foreach(process, simix_global->process_list) - MC_ignore_heap(&(process->process_hookup), sizeof(process->process_hookup)); simgrid::mc::Client::get()->mainLoop(); simgrid::mc::processes_time.clear(); } -void MC_show_deadlock(void) +void MC_show_deadlock() { XBT_INFO("**************************"); XBT_INFO("*** DEAD-LOCK DETECTED ***"); XBT_INFO("**************************"); XBT_INFO("Counter-example execution trace:"); - for (auto& s : mc_model_checker->getChecker()->getTextualTrace()) + for (auto const& s : mc_model_checker->getChecker()->getTextualTrace()) XBT_INFO("%s", s.c_str()); simgrid::mc::session->logState(); } @@ -128,32 +122,28 @@ void MC_automaton_load(const char *file) namespace simgrid { namespace mc { -void dumpStack(FILE* file, unw_cursor_t cursor) +void dumpStack(FILE* file, unw_cursor_t&& cursor) { int nframe = 0; char buffer[100]; unw_word_t off; do { - const char * name = !unw_get_proc_name(&cursor, buffer, 100, &off) ? buffer : "?"; - - int status; - - // Demangle C++ names: - char* realname = abi::__cxa_demangle(name, 0, 0, &status); + const char* name = not unw_get_proc_name(&cursor, buffer, 100, &off) ? buffer : "?"; + // Unmangle C++ names: + auto realname = simgrid::xbt::demangle(name); #if defined(__x86_64__) unw_word_t rip = 0; unw_word_t rsp = 0; unw_get_reg(&cursor, UNW_X86_64_RIP, &rip); unw_get_reg(&cursor, UNW_X86_64_RSP, &rsp); - fprintf(file, " %i: %s (RIP=0x%" PRIx64 " RSP=0x%" PRIx64 ")\n", - nframe, realname ? realname : name, (std::uint64_t) rip, (std::uint64_t) rsp); + fprintf(file, " %i: %s (RIP=0x%" PRIx64 " RSP=0x%" PRIx64 ")\n", nframe, realname.get(), (std::uint64_t)rip, + (std::uint64_t)rsp); #else - fprintf(file, " %i: %s\n", nframe, realname ? realname : name); + fprintf(file, " %i: %s\n", nframe, realname.get()); #endif - free(realname); ++nframe; } while(unw_step(&cursor)); } @@ -165,30 +155,31 @@ static void MC_dump_stacks(FILE* file) { int nstack = 0; for (auto const& stack : mc_model_checker->process().stack_areas()) { - fprintf(file, "Stack %i:\n", nstack++); + fprintf(file, "Stack %i:\n", nstack); + nstack++; simgrid::mc::UnwindContext context; unw_context_t raw_context = - mc_model_checker->process().read( + (unw_context_t) mc_model_checker->process().read( simgrid::mc::remote((unw_context_t *)stack.context)); context.initialize(&mc_model_checker->process(), &raw_context); unw_cursor_t cursor = context.cursor(); - simgrid::mc::dumpStack(file, cursor); + simgrid::mc::dumpStack(file, std::move(cursor)); } } #endif -double MC_process_clock_get(smx_process_t process) +double MC_process_clock_get(smx_actor_t process) { if (simgrid::mc::processes_time.empty()) return 0; if (process != nullptr) - return simgrid::mc::processes_time[process->pid]; + return simgrid::mc::processes_time[process->get_pid()]; return -1; } -void MC_process_clock_add(smx_process_t process, double amount) +void MC_process_clock_add(smx_actor_t process, double amount) { - simgrid::mc::processes_time[process->pid] += amount; + simgrid::mc::processes_time[process->get_pid()] += amount; }