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);
+
+ 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);
+ return;
+ }
+
msg_comm_t comm = MSG_task_isend_with_matching(task, to, /*matching madness*/NULL,task);
xbt_dynar_push(globals->isends,&comm);
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);