+/* Mailboxes in MSG */
+
+/* Copyright (c) 2008, 2009, 2010. 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. */
+
#include "mailbox.h"
#include "msg/private.h"
xbt_ex_t e;
MSG_error_t ret = MSG_OK;
smx_comm_t comm;
-
+#ifdef HAVE_TRACING
+ double start_time = 0;
+#endif
/* We no longer support getting a task from a specific host */
if (host) THROW_UNIMPLEMENTED;
CHECK_HOST();
+#ifdef HAVE_TRACING
+ TRACE_msg_task_get_start ();
+ start_time = MSG_get_clock();
+#endif
memset(&comm,0,sizeof(comm));
ret = MSG_TRANSFER_FAILURE;
break;
case timeout_error:
- ret = MSG_TIMEOUT_FAILURE;
+ ret = MSG_TIMEOUT;
break;
default:
- xbt_die("Unhandled SIMIX network exception");
+ xbt_die(bprintf("Unhandled SIMIX network exception: %s",e.msg));
}
xbt_ex_free(e);
}
-
+
+ if (ret != MSG_HOST_FAILURE &&
+ ret != MSG_TRANSFER_FAILURE &&
+ ret != MSG_TIMEOUT){
+#ifdef HAVE_TRACING
+ TRACE_msg_task_get_end (start_time, *task);
+#endif
+ }
MSG_RETURN(ret);
}
MSG_error_t ret = MSG_OK;
simdata_task_t t_simdata = NULL;
m_process_t process = MSG_process_self();
-
+#ifdef HAVE_TRACING
+ int call_end = 0;
+#endif
CHECK_HOST();
+#ifdef HAVE_TRACING
+ call_end = TRACE_msg_task_put_start (task); //must be after CHECK_HOST()
+#endif
+
+
/* Prepare the task to send */
t_simdata = task->simdata;
t_simdata->sender = process;
SIMIX_cond_signal(mailbox->cond);
SIMIX_network_send(mailbox->rdv, t_simdata->message_size, t_simdata->rate,
- timeout, &task, sizeof(void*), &t_simdata->comm, task);
+ timeout, task, sizeof(void*), &t_simdata->comm, task);
}
CATCH(e){
ret = MSG_TRANSFER_FAILURE;
break;
case timeout_error:
- ret = MSG_TIMEOUT_FAILURE;
+ ret = MSG_TIMEOUT;
break;
default:
- xbt_die("Unhandled SIMIX network exception");
+ xbt_die(bprintf("Unhandled SIMIX network exception: %s",e.msg));
}
xbt_ex_free(e);
}
process->simdata->waiting_task = NULL;
-
+#ifdef HAVE_TRACING
+ if (call_end) TRACE_msg_task_put_end ();
+#endif
MSG_RETURN(ret);
}