value = strtod(string, &endptr);
if (*endptr != '\0')
- THROW1(unknown_error, 0, "%s is not a double", string);
+ THROWF(unknown_error, 0, "%s is not a double", string);
return value;
}
asynchronous_cleanup();
}
+static int task_recv_matching(void*ignored,void*recv_task) {
+ XBT_DEBUG("Trying to recv_match with %p", recv_task);
+ return recv_task != NULL;
+}
+
static void action_Isend(const char *const *action)
{
char to[250];
sprintf(to, "%s_%s", MSG_process_get_name(MSG_process_self()),action[2]);
m_task_t task = MSG_task_create(to,0,parse_double(size),NULL);
- msg_comm_t comm = MSG_task_isend_with_matching(task, to, /*matching madness*/NULL,task);
- xbt_dynar_push(globals->isends,&comm);
-
- if (task->simdata->message_size < 65536) {
- /* Close your eyes, it burns ! */
- comm->s_comm->comm.dst_proc = SIMIX_process_get_by_name(action[2]);
- comm->s_comm->comm.dst_buff = NULL;
- comm->s_comm->comm.dst_buff_size = NULL;
- comm->s_comm->comm.dst_data = NULL;
- comm->s_comm->state = SIMIX_READY;
- comm->s_comm->comm.refcount++;
- SIMIX_comm_start(comm->s_comm);
- }
- XBT_DEBUG("Isend on %s", MSG_process_get_name(MSG_process_self()));
- XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock);
+ smx_rdv_t rdv = MSG_mailbox_get_by_alias(to);
+
+ if(SIMIX_comm_has_recv_match(rdv, task_recv_matching, NULL)) {
+ XBT_DEBUG("Switching back to MSG_task_send: %s", to);
+ MSG_task_send(task, to);
+ } else {
+
+ msg_comm_t comm = MSG_task_isend_with_matching(task, to, /*matching madness*/NULL,task);
+ xbt_dynar_push(globals->isends,&comm);
+
+ if (task->simdata->message_size < 65536) {
+ /* Close your eyes, it burns ! */
+ comm->s_comm->comm.dst_proc = SIMIX_process_get_by_name(action[2]);
+ comm->s_comm->comm.dst_buff = NULL;
+ comm->s_comm->comm.dst_buff_size = NULL;
+ comm->s_comm->comm.dst_data = NULL;
+ comm->s_comm->state = SIMIX_READY;
+ comm->s_comm->comm.refcount++;
+ SIMIX_comm_start(comm->s_comm);
+ }
+
+ XBT_DEBUG("Isend on %s", MSG_process_get_name(MSG_process_self()));
+ XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock);
+ }
asynchronous_cleanup();
}
-static int task_matching(void*ignored,void*sent_task) {
+static int task_sent_matching(void*ignored,void*sent_task) {
m_task_t t = (m_task_t)sent_task;
if (t!=NULL && MSG_task_get_data_size(t)<65536)
return 1; /* that's supposed to be already arrived */
/* make sure the rdv is created on need by asking to MSG instead of simix directly */
smx_rdv_t rdv = MSG_mailbox_get_by_alias(mailbox_name);
- smx_action_t act = SIMIX_comm_get_send_match(rdv, task_matching, NULL);
+ smx_action_t act = SIMIX_comm_get_send_match(rdv, task_sent_matching, NULL);
if (act!=NULL){
/* FIXME account for the memcopy time if needed */
task = act->comm.src_data;
#endif
XBT_DEBUG("Receiving: %s", name);
- MSG_task_receive(&task, mailbox_name);
+ /* Mimic a call to MSG_task_receive(&task, mailbox_name); */
+ SIMIX_req_comm_recv(rdv, &task, NULL, NULL, &task, -1.0);
+
// MSG_task_receive(&task, MSG_process_get_name(MSG_process_self()));
XBT_VERB("%s %f", name, MSG_get_clock() - clock);
MSG_task_destroy(task);
double clock = MSG_get_clock();
process_globals_t globals = (process_globals_t) MSG_process_get_data(MSG_process_self());
- xbt_assert1(xbt_dynar_length(globals->irecvs),
+ xbt_assert(xbt_dynar_length(globals->irecvs),
"action wait not preceded by any irecv: %s", xbt_str_join_array(action," "));
if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
process_globals_t counters = (process_globals_t) MSG_process_get_data(MSG_process_self());
- xbt_assert0(communicator_size, "Size of Communicator is not defined, "
+ xbt_assert(communicator_size, "Size of Communicator is not defined, "
"can't use collective operations");
process_name = MSG_process_get_name(MSG_process_self());
process_globals_t counters = (process_globals_t) MSG_process_get_data(MSG_process_self());
- xbt_assert0(communicator_size, "Size of Communicator is not defined, "
+ xbt_assert(communicator_size, "Size of Communicator is not defined, "
"can't use collective operations");
process_name = MSG_process_get_name(MSG_process_self());
process_globals_t counters = (process_globals_t) MSG_process_get_data(MSG_process_self());
- xbt_assert0(communicator_size, "Size of Communicator is not defined, "
+ xbt_assert(communicator_size, "Size of Communicator is not defined, "
"can't use collective operations");
process_name = MSG_process_get_name(MSG_process_self());