msg_error_t ret = MSG_parallel_task_execute(task);
MSG_host_del_task(host, task);
-
return ret;
}
* or #MSG_HOST_FAILURE otherwise
*/
msg_error_t MSG_parallel_task_execute(msg_task_t task)
+{
+ return MSG_parallel_task_execute_with_timeout(task, -1);
+}
+
+msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeout)
{
simdata_task_t simdata = task->simdata;
simdata_process_t p_simdata = static_cast<simdata_process_t>(SIMIX_process_self_get_data());
simdata->setUsed();
if (simdata->host_nb > 0) {
- simdata->compute = static_cast<simgrid::kernel::activity::Exec*>(
- simcall_execution_parallel_start(task->name, simdata->host_nb,simdata->host_list,
- simdata->flops_parallel_amount, simdata->bytes_parallel_amount,
- 1.0, -1.0));
+ simdata->compute = static_cast<simgrid::kernel::activity::Exec*>(simcall_execution_parallel_start(
+ task->name, simdata->host_nb, simdata->host_list, simdata->flops_parallel_amount,
+ simdata->bytes_parallel_amount, 1.0, -1.0, timeout));
XBT_DEBUG("Parallel execution action created: %p", simdata->compute);
} else {
- unsigned long affinity_mask =
- static_cast<unsigned long>((uintptr_t) xbt_dict_get_or_null_ext(simdata->affinity_mask_db, (char *) p_simdata->m_host,
- sizeof(msg_host_t)));
- XBT_DEBUG("execute %s@%s with affinity(0x%04lx)",
- MSG_task_get_name(task), MSG_host_get_name(p_simdata->m_host), affinity_mask);
-
- simdata->compute = static_cast<simgrid::kernel::activity::Exec*>(
- simcall_execution_start(task->name, simdata->flops_amount, simdata->priority,
- simdata->bound, affinity_mask));
+ simdata->compute = static_cast<simgrid::kernel::activity::Exec*>(
+ simcall_execution_start(task->name, simdata->flops_amount, simdata->priority, simdata->bound));
}
simcall_set_category(simdata->compute, task->category);
p_simdata->waiting_action = simdata->compute;
case host_error:
status = MSG_HOST_FAILURE;
break;
+ case timeout_error:
+ status = MSG_TIMEOUT;
+ break;
default:
throw;
}
catch(xbt_ex& e) {
switch (e.category) {
case cancel_error:
- XBT_DEBUG("According to the JAVA API, a sleep call should only deal with HostFailureException, WTF here ?");
+ XBT_DEBUG("According to the JAVA API, a sleep call should only deal with HostFailureException, I'm lost.");
// adsein: MSG_TASK_CANCELED is assigned when someone kills the process that made the sleep, this is not
// correct. For instance, when the node is turned off, the error should be MSG_HOST_FAILURE, which is by the way
// and according to the JAVA document, the only exception that can be triggered by MSG_Process_sleep call.
/* Try to receive it by calling SIMIX network layer */
try {
simcall_comm_recv(MSG_process_self(), mailbox->getImpl(), task, nullptr, nullptr, nullptr, nullptr, timeout, rate);
- XBT_DEBUG("Got task %s from %s",(*task)->name,mailbox->getName());
+ XBT_DEBUG("Got task %s from %s",(*task)->name,mailbox->name());
(*task)->simdata->setNotUsed();
}
catch (xbt_ex& e) {
*/
void MSG_comm_waitall(msg_comm_t * comm, int nb_elem, double timeout)
{
- int i = 0;
- for (i = 0; i < nb_elem; i++) {
+ for (int i = 0; i < nb_elem; i++)
MSG_comm_wait(comm[i], timeout);
- }
}
/** \ingroup msg_task_usage
{
return task->category;
}
-
-/**
- * \brief Returns the value of a given AS or router property
- *
- * \param asr the name of a router or AS
- * \param name a property name
- * \return value of a property (or nullptr if property not set)
- */
-const char *MSG_as_router_get_property_value(const char* asr, const char *name)
-{
- return static_cast<char*>(xbt_dict_get_or_null(MSG_as_router_get_properties(asr), name));
-}
-
-/**
- * \brief Returns a xbt_dict_t consisting of the list of properties assigned to
- * a the AS or router
- *
- * \param asr the name of a router or AS
- * \return a dict containing the properties
- */
-xbt_dict_t MSG_as_router_get_properties(const char* asr)
-{
- return (simcall_asr_get_properties(asr));
-}
-
-/**
- * \brief Change the value of a given AS or router
- *
- * \param asr the name of a router or AS
- * \param name a property name
- * \param value what to change the property to
- * \param free_ctn the freeing function to use to kill the value on need
- */
-void MSG_as_router_set_property_value(const char* asr, const char *name, char *value,void_f_pvoid_t free_ctn) {
- xbt_dict_set(MSG_as_router_get_properties(asr), name, value,free_ctn);
-}