X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fbda37798d5a49e81102b576b9bad0c72c1d2f9e..9f62e12607e183452816941da3e99bb5efda40d0:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index 8de7c6aefa..597021e6d7 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -24,31 +24,6 @@ const char* sg_host_self_get_name() return host->get_cname(); } -simgrid::kernel::activity::ExecImplPtr SIMIX_execution_start(std::string name, std::string category, - double flops_amount, double priority, double bound, - sg_host_t host) -{ - /* set surf's action */ - simgrid::kernel::resource::Action* surf_action = nullptr; - if (not MC_is_active() && not MC_record_replay_is_active()) { - surf_action = host->pimpl_cpu->execution_start(flops_amount); - surf_action->set_priority(priority); - if (bound > 0) - surf_action->set_bound(bound); - } - - simgrid::kernel::activity::ExecImplPtr exec = simgrid::kernel::activity::ExecImplPtr( - new simgrid::kernel::activity::ExecImpl(name, category, /*timeout_detector*/ nullptr, host)); - if (surf_action != nullptr) { - exec->surf_action_ = surf_action; - exec->surf_action_->set_data(exec.get()); - } - XBT_DEBUG("Create execute synchro %p: %s", exec.get(), exec->name_.c_str()); - simgrid::kernel::activity::ExecImpl::on_creation(exec); - - return exec; -} - simgrid::kernel::activity::ExecImplPtr SIMIX_execution_parallel_start(std::string name, int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double rate, double timeout) @@ -149,12 +124,14 @@ void SIMIX_execution_finish(smx_activity_t synchro) default: xbt_die("Internal error in SIMIX_execution_finish: unexpected synchro state %d", (int)exec->state_); } - /* Fail the process if the host is down */ - if (simcall->issuer->host_->is_off()) - simcall->issuer->context_->iwannadie = true; simcall->issuer->waiting_synchro = nullptr; simcall_execution_wait__set__result(simcall, exec->state_); - SIMIX_simcall_answer(simcall); + + /* Fail the process if the host is down */ + if (simcall->issuer->host_->is_off()) + simcall->issuer->context_->iwannadie = true; + else + SIMIX_simcall_answer(simcall); } }