e_smx_state_t comp_state;
msg_error_t status = MSG_OK;
-
- xbt_assert((not simdata->compute) && not task->simdata->isused,
+ xbt_assert((not simdata->compute) && not task->simdata->is_used,
"This task is executed somewhere else. Go fix your code!");
XBT_DEBUG("Computing on %s", MSG_process_get_name(MSG_process_self()));
simgrid::instr::Container::by_name(instr_pid(MSG_process_self()))->get_state("ACTOR_STATE")->push_event("execute");
try {
- simdata->setUsed();
+ simdata->set_used();
if (simdata->host_nb > 0) {
simdata->compute =
boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(simcall_execution_parallel_start(
- task->name ?: "", simdata->host_nb, simdata->host_list, simdata->flops_parallel_amount,
- simdata->bytes_parallel_amount, -1.0, timeout));
+ std::move(task->simdata->get_name()), simdata->host_nb, simdata->host_list,
+ simdata->flops_parallel_amount, simdata->bytes_parallel_amount, -1.0, timeout));
XBT_DEBUG("Parallel execution action created: %p", simdata->compute.get());
if (task->category != nullptr)
simgrid::simix::simcall([task] { task->simdata->compute->set_category(task->category); });
sg_host_t host = MSG_process_get_host(MSG_process_self());
simdata->compute = simgrid::simix::simcall([task, host] {
return simgrid::kernel::activity::ExecImplPtr(
- new simgrid::kernel::activity::ExecImpl(task->name ?: "", task->category ?: "",
- /*timeout_detector*/ nullptr, host));
+ new simgrid::kernel::activity::ExecImpl(std::move(task->simdata->get_name()), task->category ?: "", host));
});
/* checking for infinite values */
xbt_assert(std::isfinite(simdata->flops_amount), "flops_amount is not finite!");
comp_state = simcall_execution_wait(simdata->compute);
- simdata->setNotUsed();
+ simdata->set_not_used();
- XBT_DEBUG("Execution task '%s' finished in state %d", task->name, (int)comp_state);
+ XBT_DEBUG("Execution task '%s' finished in state %d", task->simdata->get_cname(), (int)comp_state);
} catch (simgrid::HostFailureException& e) {
status = MSG_HOST_FAILURE;
} catch (simgrid::TimeoutError& e) {
->set_rate(rate)
->wait_for(timeout);
*task = static_cast<msg_task_t>(payload);
- XBT_DEBUG("Got task %s from %s", (*task)->name, alias);
- (*task)->simdata->setNotUsed();
+ XBT_DEBUG("Got task %s from %s", (*task)->simdata->get_cname(), alias);
+ (*task)->simdata->set_not_used();
} catch (simgrid::HostFailureException& e) {
ret = MSG_HOST_FAILURE;
} catch (simgrid::TimeoutError& e) {
ret = MSG_TIMEOUT;
} catch (simgrid::CancelException& e) {
- ret = MSG_HOST_FAILURE;
+ ret = MSG_TASK_CANCELED;
} catch (xbt_ex& e) {
if (e.category == network_error)
ret = MSG_TRANSFER_FAILURE;
/* Prepare the task to send */
t_simdata = task->simdata;
t_simdata->sender = myself;
- t_simdata->source = MSG_host_self();
- t_simdata->setUsed();
+ t_simdata->set_used();
t_simdata->comm = nullptr;
msg_global->sent_msg++;
finished = comm->s_comm->test();
if (finished && comm->task_received != nullptr) {
/* I am the receiver */
- (*comm->task_received)->simdata->setNotUsed();
+ (*comm->task_received)->simdata->set_not_used();
}
} catch (simgrid::TimeoutError& e) {
comm->status = MSG_TIMEOUT;
if (status == MSG_OK && comm->task_received != nullptr) {
/* I am the receiver */
- (*comm->task_received)->simdata->setNotUsed();
+ (*comm->task_received)->simdata->set_not_used();
}
}
if (comm->task_received != nullptr) {
/* I am the receiver */
- (*comm->task_received)->simdata->setNotUsed();
+ (*comm->task_received)->simdata->set_not_used();
}
/* FIXME: these functions are not traceable */
if (comm->task_received != nullptr) {
/* I am the receiver */
- (*comm->task_received)->simdata->setNotUsed();
+ (*comm->task_received)->simdata->set_not_used();
}
return finished_index;
/* Prepare the task to send */
simdata_task_t t_simdata = task->simdata;
t_simdata->sender = MSG_process_self();
- t_simdata->source = MSG_host_self();
- t_simdata->setUsed();
+ t_simdata->set_used();
msg_global->sent_msg++;
throw;
/* If the send failed, it is not used anymore */
- t_simdata->setNotUsed();
+ t_simdata->set_not_used();
}
return ret;
*/
void MSG_task_set_category (msg_task_t task, const char *category)
{
- xbt_assert(task->category == nullptr, "Task %p(%s) already has a category (%s).", task, task->name, task->category);
+ xbt_assert(task->category == nullptr, "Task %p(%s) already has a category (%s).", task, task->simdata->get_cname(),
+ task->category);
// if user provides a nullptr category, task is no longer traced
if (category == nullptr) {
xbt_free(task->category);
task->category = nullptr;
- XBT_DEBUG("MSG task %p(%s), category removed", task, task->name);
+ XBT_DEBUG("MSG task %p(%s), category removed", task, task->simdata->get_cname());
} else {
// set task category
task->category = xbt_strdup(category);
- XBT_DEBUG("MSG task %p(%s), category %s", task, task->name, task->category);
+ XBT_DEBUG("MSG task %p(%s), category %s", task, task->simdata->get_cname(), task->category);
}
}