-/* 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. */
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, surf_action, /*timeout_detector*/ nullptr, host));
-
- exec->set_category(category);
- 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)
+simgrid::kernel::activity::ExecImplPtr
+SIMIX_execution_parallel_start(std::string name, int host_nb, const sg_host_t* host_list, const double* flops_amount,
+ const double* bytes_amount, double rate, double timeout)
{
/* Check that we are not mixing VMs and PMs in the parallel task */
}
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));
+ if (surf_action != nullptr) {
+ exec->surf_action_ = surf_action;
+ exec->surf_action_->set_data(exec.get());
+ }
XBT_DEBUG("Create parallel execute synchro %p", exec.get());
return exec;
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;
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 = 1;
simcall->issuer->waiting_synchro = nullptr;
simcall_execution_wait__set__result(simcall, exec->state_);
- 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<simgrid::kernel::activity::ExecImpl>(synchro);
- if (exec != nullptr) {
- exec->surf_action_->set_category(category);
- return;
- }
- simgrid::kernel::activity::CommImplPtr comm =
- boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(synchro);
- if (comm != nullptr) {
- comm->surfAction_->set_category(category);
+ /* Fail the process if the host is down */
+ if (simcall->issuer->host_->is_on())
+ SIMIX_simcall_answer(simcall);
+ else
+ simcall->issuer->context_->iwannadie = true;
}
}