From: pini <pini@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 18 Mar 2011 11:11:29 +0000 (+0000)
Subject: Dirty hacks again: shot more bullets, it may be a zombie
X-Git-Tag: v3.6_beta2~156
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3ca5d58e75df5f28588be1953f6b84a79b163d3b?ds=sidebyside

Dirty hacks again: shot more bullets, it may be a zombie

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9808 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c
index a8963ea681..52c89a4dd9 100644
--- a/examples/msg/actions/actions.c
+++ b/examples/msg/actions/actions.c
@@ -103,6 +103,11 @@ static void action_send(const char *const *action)
   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];
@@ -113,6 +118,15 @@ static void action_Isend(const char *const *action)
 
   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);
 
@@ -133,7 +147,7 @@ static void action_Isend(const char *const *action)
   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 */
@@ -162,7 +176,7 @@ static void action_recv(const char *const *action)
 
   /* 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;
@@ -184,7 +198,9 @@ static void action_recv(const char *const *action)
 #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);
diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index 31bec78c2c..f3798e69a8 100644
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -115,6 +115,9 @@ static XBT_INLINE void SIMIX_rdv_remove(smx_rdv_t rdv, smx_action_t comm)
   comm->comm.rdv = NULL;
 }
 
+/**
+ *  \brief Wrapper to SIMIX_rdv_get_request
+ */
 smx_action_t SIMIX_comm_get_send_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data) {
    return SIMIX_rdv_get_request(rdv, SIMIX_COMM_SEND, match_fun, data);
 }