xbt_assert((!simdata->compute) && (task->simdata->isused == 0),
"This task is executed somewhere else. Go fix your code! %d",
- task->simdata->isused);
+ task->simdata->isused!=NULL);
XBT_DEBUG("Computing on %s", MSG_process_get_name(MSG_process_self()));
TRY {
-
- simdata->isused=1;
+ if (msg_global->debug_multiple_use)
+ MSG_BT(simdata->isused, "Using Backtrace");
+ else
+ simdata->isused = (void*)1;
if (simdata->host_nb > 0) {
simdata->compute = simcall_host_parallel_execute(task->name,
p_simdata->waiting_action = NULL;
- simdata->isused=0;
+ if (msg_global->debug_multiple_use && simdata->isused!=0)
+ xbt_ex_free(*(xbt_ex_t*)simdata->isused);
+ simdata->isused = 0;
XBT_DEBUG("Execution task '%s' finished in state %d",
task->name, (int)comp_state);
CATCH(e) {
switch (e.category) {
case cancel_error:
+ XBT_DEBUG("According to the JAVA API, a sleep call should only deal with HostFailureException, WTF here ?");
+ // 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.
+ // To avoid possible impacts in the code, I just raised a host_failure exception for the moment in the JAVA code
+ // and did not change anythings at the C level.
+ // See comment in the jmsg_process.c file, function JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cls, jlong jmillis, jint jnanos)
status = MSG_TASK_CANCELED;
break;
default:
*/
static XBT_INLINE
msg_comm_t MSG_task_isend_internal(msg_task_t task, const char *alias,
- int (*match_fun)(void*,void*, smx_action_t),
+ int (*match_fun)(void*,void*, smx_synchro_t),
void *match_data, void_f_pvoid_t cleanup,
int detached)
{
t_simdata->sender = process;
t_simdata->source = ((simdata_process_t) SIMIX_process_self_get_data(process))->m_host;
- xbt_assert(t_simdata->isused == 0,
- "This task is still being used somewhere else. You cannot send it now. Go fix your code!");
+ if (t_simdata->isused != 0) {
+ if (msg_global->debug_multiple_use){
+ XBT_ERROR("This task is already used in there:");
+ xbt_backtrace_display(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->isused = 1;
+ if (msg_global->debug_multiple_use)
+ MSG_BT(t_simdata->isused, "Using Backtrace");
+ else
+ t_simdata->isused = (void*)1;
t_simdata->comm = NULL;
msg_global->sent_msg++;
/* Send it by calling SIMIX network layer */
- smx_action_t act = simcall_comm_isend(mailbox, t_simdata->message_size,
+ smx_synchro_t act = simcall_comm_isend(SIMIX_process_self(), mailbox, t_simdata->message_size,
t_simdata->rate, task, sizeof(void *),
- match_fun, cleanup, match_data,detached);
+ match_fun, cleanup, NULL, match_data,detached);
t_simdata->comm = act; /* FIXME: is the field t_simdata->comm still useful? */
msg_comm_t comm;
*/
msg_comm_t MSG_task_isend_with_matching(msg_task_t task, const char *alias,
int (*match_fun)(void*, void*,
- smx_action_t),
+ smx_synchro_t),
void *match_data)
{
return MSG_task_isend_internal(task, alias, match_fun, match_data, NULL, 0);
comm->task_sent = NULL;
comm->task_received = task;
comm->status = MSG_OK;
- comm->s_comm = simcall_comm_irecv(rdv, task, NULL, NULL, NULL, rate);
+ comm->s_comm = simcall_comm_irecv(rdv, task, NULL, NULL, NULL, NULL, rate);
return comm;
}
if (finished && comm->task_received != NULL) {
/* 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;
}
}
int finished_index = -1;
/* create the equivalent dynar with SIMIX objects */
- xbt_dynar_t s_comms = xbt_dynar_new(sizeof(smx_action_t), NULL);
+ xbt_dynar_t s_comms = xbt_dynar_new(sizeof(smx_synchro_t), NULL);
msg_comm_t comm;
unsigned int cursor;
xbt_dynar_foreach(comms, cursor, comm) {
if (status == MSG_OK && comm->task_received != NULL) {
/* 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;
}
}
if (comm->task_received != NULL) {
/* 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;
}
int finished_index = -1;
/* create the equivalent dynar with SIMIX objects */
- xbt_dynar_t s_comms = xbt_dynar_new(sizeof(smx_action_t), NULL);
+ xbt_dynar_t s_comms = xbt_dynar_new(sizeof(smx_synchro_t), NULL);
msg_comm_t comm;
unsigned int cursor;
xbt_dynar_foreach(comms, cursor, comm) {
if (comm->task_received != NULL) {
/* 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;
}
* \param buff the data copied
* \param buff_size size of the buffer
*/
-void MSG_comm_copy_data_from_SIMIX(smx_action_t comm, void* buff, size_t buff_size) {
+void MSG_comm_copy_data_from_SIMIX(smx_synchro_t comm, void* buff, size_t buff_size) {
// copy the task
SIMIX_comm_copy_pointer_callback(comm, buff, buff_size);