X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85..4e73c03c087fd07184d9ed45224f7fbad24e686e:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index 745a67db77..7196bdc390 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-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. */ @@ -63,9 +63,7 @@ simgrid::kernel::activity::ExecImplPtr SIMIX_execution_parallel_start(std::strin simgrid::kernel::resource::Action* surf_action = nullptr; simgrid::kernel::resource::Action* timeout_detector = nullptr; if (not MC_is_active() && not MC_record_replay_is_active()) { - sg_host_t* host_list_cpy = new sg_host_t[host_nb]; - std::copy_n(host_list, host_nb, host_list_cpy); - surf_action = surf_host_model->execute_parallel(host_nb, host_list_cpy, flops_amount, bytes_amount, rate); + surf_action = surf_host_model->execute_parallel(host_nb, host_list, flops_amount, bytes_amount, rate); if (timeout > 0) { timeout_detector = host_list[0]->pimpl_cpu->sleep(timeout); } @@ -128,7 +126,7 @@ void SIMIX_execution_finish(smx_activity_t synchro) case SIMIX_FAILED: XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->host_->get_cname()); - simcall->issuer->context_->iwannadie = 1; + simcall->issuer->context_->iwannadie = true; simcall->issuer->exception = std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed")); break; @@ -148,7 +146,7 @@ void SIMIX_execution_finish(smx_activity_t synchro) } /* Fail the process if the host is down */ if (simcall->issuer->host_->is_off()) - simcall->issuer->context_->iwannadie = 1; + simcall->issuer->context_->iwannadie = true; simcall->issuer->waiting_synchro = nullptr; simcall_execution_wait__set__result(simcall, exec->state_); @@ -171,6 +169,6 @@ void SIMIX_set_category(smx_activity_t synchro, std::string category) simgrid::kernel::activity::CommImplPtr comm = boost::dynamic_pointer_cast(synchro); if (comm != nullptr) { - comm->surfAction_->set_category(category); + comm->surf_action_->set_category(category); } }