X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/63c371bbca5afccc4708761d83af6fc2443ca553..9575359fcebd3a393b65891c293990d1a882eb34:/src/mc/mc_global.cpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index 8418b96de3..b3140e10d9 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-2017. 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. */ @@ -29,9 +28,10 @@ #include "src/simix/ActorImpl.hpp" -#if HAVE_MC +#if SIMGRID_HAVE_MC #include #include "src/mc/mc_comm_pattern.h" +#include "src/mc/mc_ignore.h" #include "src/mc/mc_request.h" #include "src/mc/mc_safety.h" #include "src/mc/mc_snapshot.h" @@ -56,7 +56,7 @@ std::vector processes_time; } } -#if HAVE_MC +#if SIMGRID_HAVE_MC /* Liveness */ @@ -97,9 +97,10 @@ void MC_run() 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_actor_t process; - xbt_swag_foreach(process, simix_global->process_list) - MC_ignore_heap(&(process->process_hookup), sizeof(process->process_hookup)); + for (auto kv : simix_global->process_list) { + smx_actor_t actor = kv.second; + MC_ignore_heap(&(actor->process_hookup), sizeof(actor->process_hookup)); + } simgrid::mc::Client::get()->mainLoop(); simgrid::mc::processes_time.clear(); }