/* 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. */
+#include <xbt/ex.hpp>
+
#include "src/simix/smx_private.h" /* MSG_task_listen looks inside the rdv directly. Not clean. */
#include "msg_private.h"
#include "mc/mc.h"
*/
msg_error_t MSG_parallel_task_execute(msg_task_t task)
{
- xbt_ex_t e;
simdata_task_t simdata = task->simdata;
simdata_process_t p_simdata = (simdata_process_t) SIMIX_process_self_get_data();
e_smx_state_t comp_state;
TRACE_msg_task_execute_start(task);
- xbt_assert((!simdata->compute) && (task->simdata->isused == 0),
- "This task is executed somewhere else. Go fix your code! %d", task->simdata->isused!=nullptr);
+ xbt_assert((!simdata->compute) && !task->simdata->isused,
+ "This task is executed somewhere else. Go fix your code!");
XBT_DEBUG("Computing on %s", MSG_process_get_name(MSG_process_self()));
return MSG_OK;
}
- TRY {
- if (msg_global->debug_multiple_use)
- MSG_BT(simdata->isused, "Using Backtrace");
- else
- simdata->isused = (void*)1;
+ try {
+ simdata->setUsed();
if (simdata->host_nb > 0) {
- simdata->compute = static_cast<simgrid::simix::Exec*>(
+ 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));
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::simix::Exec*>(
+ simdata->compute = static_cast<simgrid::kernel::activity::Exec*>(
simcall_execution_start(task->name, simdata->flops_amount, simdata->priority,
simdata->bound, affinity_mask));
}
comp_state = simcall_execution_wait(simdata->compute);
p_simdata->waiting_action = nullptr;
-
- if (msg_global->debug_multiple_use && simdata->isused!=0)
- xbt_ex_free(*(xbt_ex_t*)simdata->isused);
- simdata->isused = 0;
+ simdata->setNotUsed();
XBT_DEBUG("Execution task '%s' finished in state %d", task->name, (int)comp_state);
}
- CATCH(e) {
+ catch (xbt_ex& e) {
switch (e.category) {
case cancel_error:
status = MSG_TASK_CANCELED;
status = MSG_HOST_FAILURE;
break;
default:
- RETHROW;
+ throw;
}
- xbt_ex_free(e);
}
+
/* action ended, set comm and compute = nullptr, the actions is already destroyed in the main function */
simdata->flops_amount = 0.0;
simdata->comm = nullptr;
*/
msg_error_t MSG_process_sleep(double nb_sec)
{
- xbt_ex_t e;
msg_error_t status = MSG_OK;
/*msg_process_t proc = MSG_process_self();*/
TRACE_msg_process_sleep_in(MSG_process_self());
- TRY {
+ try {
simcall_process_sleep(nb_sec);
}
- CATCH(e) {
+ 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 ?");
status = MSG_TASK_CANCELED;
break;
default:
- RETHROW;
+ throw;
}
- xbt_ex_free(e);
}
TRACE_msg_process_sleep_out(MSG_process_self());
*/
msg_error_t MSG_task_receive_ext(msg_task_t * task, const char *alias, double timeout, msg_host_t host)
{
- xbt_ex_t e;
msg_error_t ret = MSG_OK;
XBT_DEBUG("MSG_task_receive_ext: Trying to receive a message on mailbox '%s'", alias);
- TRY {
+ try {
ret = MSG_mailbox_get_task_ext(MSG_mailbox_get_by_alias(alias), task, host, timeout);
}
- CATCH(e) {
+ catch(xbt_ex& e) {
switch (e.category) {
case cancel_error: /* may be thrown by MSG_mailbox_get_by_alias */
ret = MSG_HOST_FAILURE;
break;
default:
- RETHROW;
+ throw;
}
- xbt_ex_free(e);
}
return ret;
}
void *match_data, void_f_pvoid_t cleanup, int detached)
{
simdata_task_t t_simdata = nullptr;
- msg_process_t process = MSG_process_self();
+ msg_process_t myself = SIMIX_process_self();
msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias);
int call_end = TRACE_msg_task_put_start(task);
/* Prepare the task to send */
t_simdata = task->simdata;
- t_simdata->sender = process;
+ t_simdata->sender = myself;
t_simdata->source = ((simdata_process_t) SIMIX_process_self_get_data())->m_host;
-
- if (t_simdata->isused != 0) {
- if (msg_global->debug_multiple_use){
- XBT_ERROR("This task is already used in there:");
- xbt_backtrace_display((xbt_ex_t*) t_simdata->isused);
- XBT_ERROR("And you try to reuse it from here:");
- xbt_backtrace_display_current();
- } else {
- xbt_assert(t_simdata->isused == 0,
- "This task is still being used somewhere else. You cannot send it now. Go fix your code!"
- "(use --cfg=msg/debug-multiple-use:on to get the backtrace of the other process)");
- }
- }
-
- if (msg_global->debug_multiple_use)
- MSG_BT(t_simdata->isused, "Using Backtrace");
- else
- t_simdata->isused = (void*)1;
+ t_simdata->setUsed();
t_simdata->comm = nullptr;
msg_global->sent_msg++;
/* Send it by calling SIMIX network layer */
- smx_synchro_t act = simcall_comm_isend(SIMIX_process_self(), mailbox, t_simdata->bytes_amount, t_simdata->rate,
+ smx_synchro_t act = simcall_comm_isend(myself, mailbox, t_simdata->bytes_amount, t_simdata->rate,
task, sizeof(void *), match_fun, cleanup, nullptr, match_data,detached);
- t_simdata->comm = static_cast<simgrid::simix::Comm*>(act); /* FIXME: is the field t_simdata->comm still useful? */
+ t_simdata->comm = static_cast<simgrid::kernel::activity::Comm*>(act);
- msg_comm_t comm;
- if (detached) {
- comm = nullptr;
- } else {
+ msg_comm_t comm = nullptr;
+ if (! detached) {
comm = xbt_new0(s_msg_comm_t, 1);
comm->task_sent = task;
comm->task_received = nullptr;
*/
int MSG_comm_test(msg_comm_t comm)
{
- xbt_ex_t e;
int finished = 0;
- TRY {
+ try {
finished = simcall_comm_test(comm->s_comm);
-
if (finished && comm->task_received != nullptr) {
/* I am the receiver */
- if (msg_global->debug_multiple_use && (*comm->task_received)->simdata->isused!=0)
- xbt_ex_free(*(xbt_ex_t*)(*comm->task_received)->simdata->isused);
- (*comm->task_received)->simdata->isused = 0;
+ (*comm->task_received)->simdata->setNotUsed();
}
}
- CATCH(e) {
+ catch (xbt_ex& e) {
switch (e.category) {
case network_error:
comm->status = MSG_TRANSFER_FAILURE;
finished = 1;
break;
default:
- RETHROW;
+ throw;
}
- xbt_ex_free(e);
}
return finished;
*/
int MSG_comm_testany(xbt_dynar_t comms)
{
- xbt_ex_t e;
int finished_index = -1;
- /* create the equivalent dynar with SIMIX objects */
- xbt_dynar_t s_comms = xbt_dynar_new(sizeof(smx_synchro_t), nullptr);
+ /* Create the equivalent array with SIMIX objects: */
+ std::vector<simgrid::kernel::activity::Synchro*> s_comms;
+ s_comms.reserve(xbt_dynar_length(comms));
msg_comm_t comm;
unsigned int cursor;
xbt_dynar_foreach(comms, cursor, comm) {
- xbt_dynar_push(s_comms, &comm->s_comm);
+ s_comms.push_back(comm->s_comm);
}
msg_error_t status = MSG_OK;
- TRY {
- finished_index = simcall_comm_testany(s_comms);
+ try {
+ finished_index = simcall_comm_testany(s_comms.data(), s_comms.size());
}
- CATCH(e) {
+ catch (xbt_ex& e) {
switch (e.category) {
case network_error:
finished_index = e.value;
status = MSG_TIMEOUT;
break;
default:
- RETHROW;
+ throw;
}
- xbt_ex_free(e);
}
- xbt_dynar_free(&s_comms);
if (finished_index != -1) {
comm = xbt_dynar_get_as(comms, finished_index, msg_comm_t);
if (status == MSG_OK && comm->task_received != nullptr) {
/* I am the receiver */
- if (msg_global->debug_multiple_use && (*comm->task_received)->simdata->isused!=0)
- xbt_ex_free(*(xbt_ex_t*)(*comm->task_received)->simdata->isused);
- (*comm->task_received)->simdata->isused = 0;
+ (*comm->task_received)->simdata->setNotUsed();
}
}
*/
msg_error_t MSG_comm_wait(msg_comm_t comm, double timeout)
{
- xbt_ex_t e;
- TRY {
+ try {
simcall_comm_wait(comm->s_comm, timeout);
if (comm->task_received != nullptr) {
/* I am the receiver */
- if (msg_global->debug_multiple_use && (*comm->task_received)->simdata->isused!=0)
- xbt_ex_free(*(xbt_ex_t*)(*comm->task_received)->simdata->isused);
- (*comm->task_received)->simdata->isused = 0;
+ (*comm->task_received)->simdata->setNotUsed();
}
/* FIXME: these functions are not traceable */
}
- CATCH(e) {
+ catch (xbt_ex& e) {
switch (e.category) {
case network_error:
comm->status = MSG_TRANSFER_FAILURE;
comm->status = MSG_TIMEOUT;
break;
default:
- RETHROW;
+ throw;
}
- xbt_ex_free(e);
}
return comm->status;
*/
int MSG_comm_waitany(xbt_dynar_t comms)
{
- xbt_ex_t e;
int finished_index = -1;
/* create the equivalent dynar with SIMIX objects */
}
msg_error_t status = MSG_OK;
- TRY {
- finished_index = simcall_comm_waitany(s_comms);
+ try {
+ finished_index = simcall_comm_waitany(s_comms, -1);
}
- CATCH(e) {
+ catch(xbt_ex& e) {
switch (e.category) {
case network_error:
finished_index = e.value;
status = MSG_TIMEOUT;
break;
default:
- RETHROW;
+ throw;
}
- xbt_ex_free(e);
}
xbt_assert(finished_index != -1, "WaitAny returned -1");
if (comm->task_received != nullptr) {
/* I am the receiver */
- if (msg_global->debug_multiple_use && (*comm->task_received)->simdata->isused!=0)
- xbt_ex_free(*(xbt_ex_t*)(*comm->task_received)->simdata->isused);
- (*comm->task_received)->simdata->isused = 0;
+ (*comm->task_received)->simdata->setNotUsed();
}
return finished_index;
*/
void MSG_comm_copy_data_from_SIMIX(smx_synchro_t synchro, void* buff, size_t buff_size)
{
- simgrid::simix::Comm *comm = static_cast<simgrid::simix::Comm*>(synchro);
+ simgrid::kernel::activity::Comm *comm = static_cast<simgrid::kernel::activity::Comm*>(synchro);
SIMIX_comm_copy_pointer_callback(comm, buff, buff_size);
t_simdata->sender = process;
t_simdata->source = ((simdata_process_t) SIMIX_process_self_get_data())->m_host;
- if (t_simdata->isused != 0) {
- if (msg_global->debug_multiple_use){
- XBT_ERROR("This task is already used in there:");
- xbt_backtrace_display((xbt_ex_t*) t_simdata->isused);
- XBT_ERROR("And you try to reuse it from here:");
- xbt_backtrace_display_current();
- } else {
- xbt_assert(t_simdata->isused == 0,
- "This task is still being used somewhere else. You cannot send it now. Go fix your code!"
- " (use --cfg=msg/debug-multiple-use:on to get the backtrace of the other process)");
- }
- }
+ t_simdata->setUsed();
- if (msg_global->debug_multiple_use)
- MSG_BT(t_simdata->isused, "Using Backtrace");
- else
- t_simdata->isused = (void*)1;
t_simdata->comm = nullptr;
msg_global->sent_msg++;
p_simdata->waiting_task = task;
- xbt_ex_t e;
/* Try to send it by calling SIMIX network layer */
- TRY {
+ try {
smx_synchro_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simix call */
comm = simcall_comm_isend(SIMIX_process_self(), mailbox,t_simdata->bytes_amount,
t_simdata->rate, task, sizeof(void *), nullptr, nullptr, nullptr, task, 0);
if (TRACE_is_enabled())
simcall_set_category(comm, task->category);
- t_simdata->comm = static_cast<simgrid::simix::Comm*>(comm);
+ t_simdata->comm = static_cast<simgrid::kernel::activity::Comm*>(comm);
simcall_comm_wait(comm, timeout);
}
-
- CATCH(e) {
+ catch (xbt_ex& e) {
switch (e.category) {
case cancel_error:
ret = MSG_HOST_FAILURE;
ret = MSG_TIMEOUT;
break;
default:
- RETHROW;
+ throw;
}
- xbt_ex_free(e);
/* If the send failed, it is not used anymore */
- if (msg_global->debug_multiple_use && t_simdata->isused!=0)
- xbt_ex_free(*(xbt_ex_t*)t_simdata->isused);
- t_simdata->isused = 0;
+ t_simdata->setNotUsed();
}
p_simdata->waiting_task = nullptr;
int MSG_task_listen(const char *alias)
{
smx_mailbox_t mbox = MSG_mailbox_get_by_alias(alias);
- return !MSG_mailbox_is_empty(mbox) || (mbox->permanent_receiver && !mbox->done_comm_queue->empty());
+ return !MSG_mailbox_is_empty(mbox) ||
+ (mbox->permanent_receiver && !mbox->done_comm_queue.empty());
}
/** \ingroup msg_task_usage
*/
int MSG_task_listen_from(const char *alias)
{
- msg_task_t task;
+ msg_mailbox_t mbox = MSG_mailbox_get_by_alias(alias);
+ simgrid::kernel::activity::Comm* comm = static_cast<simgrid::kernel::activity::Comm*>(simcall_mbox_front(mbox));
- if (nullptr == (task = MSG_mailbox_front(MSG_mailbox_get_by_alias(alias))))
+ if (!comm)
return -1;
- return MSG_process_get_PID(task->simdata->sender);
+ return MSG_process_get_PID( static_cast<msg_task_t>(comm->src_data)->simdata->sender );
}
/** \ingroup msg_task_usage
