X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4e2e0c7b210a6e58e5f73abd197c8accfd215a0d..3907e83884bae6278656e9cd2cb7ef92a8f707fb:/src/mc/mc_global.cpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index a3b4a170eb..d7962faca4 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -1,32 +1,14 @@ -/* Copyright (c) 2008-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2023. 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. */ -#include "mc/mc.h" #include "src/kernel/actor/ActorImpl.hpp" +#include "src/mc/mc.h" -#if SIMGRID_HAVE_MC -#include "src/mc/api/RemoteApp.hpp" -#include "src/mc/explo/Exploration.hpp" -#include "src/mc/inspect/mc_unw.hpp" -#include "src/mc/mc_config.hpp" -#include "src/mc/mc_private.hpp" -#include "src/mc/remote/AppSide.hpp" -#include "src/mc/sosp/Snapshot.hpp" - -#include -#include -#include -#include -#include -#endif - -#ifndef _WIN32 #include #include #include -#endif XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)"); @@ -36,48 +18,14 @@ std::vector processes_time; } -#if SIMGRID_HAVE_MC - -namespace simgrid::mc { - -/******************************* Core of MC *******************************/ -/**************************************************************************/ -void dumpStack(FILE* file, unw_cursor_t* cursor) -{ - int nframe = 0; - std::array buffer; - - unw_word_t off; - do { - const char* name = not unw_get_proc_name(cursor, buffer.data(), buffer.size(), &off) ? buffer.data() : "?"; - // Unmangle C++ names: - std::string realname = boost::core::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.c_str(), (std::uint64_t)rip, - (std::uint64_t)rsp); -#else - fprintf(file, " %i: %s\n", nframe, realname.c_str()); -#endif - - ++nframe; - } while (unw_step(cursor)); -} - -} // namespace simgrid::mc -#endif - double MC_process_clock_get(const simgrid::kernel::actor::ActorImpl* process) { - if (simgrid::mc::processes_time.empty()) - return 0; - if (process == nullptr) - return -1; - return simgrid::mc::processes_time.at(process->get_pid()); + if (process) { + auto pid = static_cast(process->get_pid()); + if (pid < simgrid::mc::processes_time.size()) + return simgrid::mc::processes_time[pid]; + } + return 0.0; } void MC_process_clock_add(const simgrid::kernel::actor::ActorImpl* process, double amount)