X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85..b9945098e2ba4e7b639e0c2245835d44800c1b29:/src/mc/mc_global.cpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index 5941595cb6..c9b5ba6593 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2018. 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. */ @@ -26,7 +26,7 @@ #include #endif -#include "src/simix/ActorImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" #if SIMGRID_HAVE_MC #include "src/mc/checker/Checker.hpp" @@ -122,7 +122,7 @@ 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]; @@ -165,7 +165,7 @@ static void MC_dump_stacks(FILE* file) 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 @@ -175,11 +175,11 @@ 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_actor_t process, double amount) { - simgrid::mc::processes_time[process->pid_] += amount; + simgrid::mc::processes_time[process->get_pid()] += amount; }