X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19016c1363a1c0409a35940ad406e88057fdba73..f0a8a2d708e0a6a1cffac49fbc83d451fe8203a8:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index de72646319..19d3516ab6 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -38,9 +38,11 @@ simgrid::kernel::activity::ExecImplPtr SIMIX_execution_start(std::string name, s } simgrid::kernel::activity::ExecImplPtr exec = simgrid::kernel::activity::ExecImplPtr( - new simgrid::kernel::activity::ExecImpl(name, surf_action, /*timeout_detector*/ nullptr, host)); + new simgrid::kernel::activity::ExecImpl(name, category, /*timeout_detector*/ nullptr, host)); + + exec->surf_action_ = surf_action; + exec->surf_action_->set_data(exec.get()); - exec->set_category(category); XBT_DEBUG("Create execute synchro %p: %s", exec.get(), exec->name_.c_str()); simgrid::kernel::activity::ExecImpl::on_creation(exec); @@ -70,7 +72,9 @@ simgrid::kernel::activity::ExecImplPtr SIMIX_execution_parallel_start(std::strin } simgrid::kernel::activity::ExecImplPtr exec = simgrid::kernel::activity::ExecImplPtr( - new simgrid::kernel::activity::ExecImpl(name, surf_action, timeout_detector, nullptr)); + new simgrid::kernel::activity::ExecImpl(name, "", timeout_detector, nullptr)); + exec->surf_action_ = surf_action; + exec->surf_action_->set_data(exec.get()); XBT_DEBUG("Create parallel execute synchro %p", exec.get()); @@ -153,22 +157,3 @@ void SIMIX_execution_finish(smx_activity_t synchro) SIMIX_simcall_answer(simcall); } } - -void SIMIX_set_category(smx_activity_t synchro, std::string category) -{ - if (synchro->state_ != SIMIX_RUNNING) - return; - - simgrid::kernel::activity::ExecImplPtr exec = - boost::dynamic_pointer_cast(synchro); - if (exec != nullptr) { - exec->surf_action_->set_category(category); - return; - } - - simgrid::kernel::activity::CommImplPtr comm = - boost::dynamic_pointer_cast(synchro); - if (comm != nullptr) { - comm->surfAction_->set_category(category); - } -}