X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ca82f90e6d610b6bb3b038cd9ee48d378cc8a909..09af10ff2dab85bca012b8767af7ea1047efbba7:/src/mc/mc_comm_pattern.cpp diff --git a/src/mc/mc_comm_pattern.cpp b/src/mc/mc_comm_pattern.cpp index 7700754c56..d2fb5e6b36 100644 --- a/src/mc/mc_comm_pattern.cpp +++ b/src/mc/mc_comm_pattern.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2020. 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. */ @@ -15,7 +15,7 @@ static void MC_patterns_copy(std::vector& de { dest.clear(); for (simgrid::mc::PatternCommunication const& comm : source) { - simgrid::mc::PatternCommunication* copy_comm = new simgrid::mc::PatternCommunication(comm.dup()); + auto* copy_comm = new simgrid::mc::PatternCommunication(comm.dup()); dest.push_back(copy_comm); } } @@ -50,8 +50,7 @@ void MC_state_copy_index_communications_pattern(simgrid::mc::State* state) void MC_handle_comm_pattern(e_mc_call_type_t call_type, smx_simcall_t req, int value, int backtracking) { // HACK, do not rely on the Checker implementation outside of it - simgrid::mc::CommunicationDeterminismChecker* checker = - (simgrid::mc::CommunicationDeterminismChecker*) mc_model_checker->getChecker(); + auto* checker = static_cast(mc_model_checker->getChecker()); switch(call_type) { case MC_CALL_TYPE_NONE: @@ -65,11 +64,11 @@ void MC_handle_comm_pattern(e_mc_call_type_t call_type, smx_simcall_t req, int v { simgrid::mc::RemotePtr comm_addr{nullptr}; if (call_type == MC_CALL_TYPE_WAIT) - comm_addr = remote(static_cast(simcall_comm_wait__getraw__comm(req))); + comm_addr = remote(simcall_comm_wait__getraw__comm(req)); else { simgrid::kernel::activity::ActivityImpl* addr; - addr = mc_model_checker->process().read(remote(simcall_comm_waitany__getraw__comms(req) + value)); + addr = mc_model_checker->get_remote_simulation().read(remote(simcall_comm_waitany__getraw__comms(req) + value)); comm_addr = remote(static_cast(addr)); } checker->complete_comm_pattern(comm_addr, MC_smx_simcall_get_issuer(req)->get_pid(), backtracking); @@ -78,5 +77,4 @@ void MC_handle_comm_pattern(e_mc_call_type_t call_type, smx_simcall_t req, int v default: xbt_die("Unexpected call type %i", (int)call_type); } - }