From: thiery <thiery@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 15 Mar 2011 15:27:49 +0000 (+0000)
Subject: Dirty hacks for the action replayer
X-Git-Tag: v3.6_beta2~160
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/51e943a89000d86b5d1293526a121014ddb3d1f7?hp=159f1801b853c2fa95755636d4845b3dbd68ff4f

Dirty hacks for the action replayer

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

diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c
index 29033aedf8..a8963ea681 100644
--- a/examples/msg/actions/actions.c
+++ b/examples/msg/actions/actions.c
@@ -12,6 +12,9 @@
 #include "xbt.h"                /* calloc, printf */
 #include "instr/instr_private.h"
 
+#include "msg/private.h" /* You don't want to know why, trust us */
+#include "simix/private.h"
+
 void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory);
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(actions,
@@ -113,6 +116,17 @@ static void action_Isend(const char *const *action)
   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);
 
@@ -148,11 +162,19 @@ 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_matching, NULL);
   if (act!=NULL){
     /* FIXME account for the memcopy time if needed */
-    SIMIX_comm_finish(act);
-    return;
+    task = act->comm.src_data;
+
+    if (task->simdata->message_size < 65536) {
+      act->comm.refcount--; /* See action_send for more pain */
+      if(act->state == SIMIX_DONE)
+        SIMIX_comm_finish(act);
+      else
+        SIMIX_req_comm_wait(act, -1.0);
+      return;
+    }
   }
 
 #ifdef HAVE_TRACING