X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb7087b9f4a278df50c0b3c75c3080db3f843ebe..3048f34c0542db89e3f6ebc66ad9fce8999879c1:/examples/msg/actions/actions.c

diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c
index 29033aedf8..ca75da4b3e 100644
--- a/examples/msg/actions/actions.c
+++ b/examples/msg/actions/actions.c
@@ -7,13 +7,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "msg/msg.h"            /* Yeah! If you want to use msg, you need to include msg/msg.h */
-#include "msg/mailbox.h"        /* we play funny tricks with mailboxes and rdv points */
 #include "simix/simix.h"        /* semaphores for the barrier */
 #include "xbt.h"                /* calloc, printf */
 #include "instr/instr_private.h"
 
-void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory);
-
 XBT_LOG_NEW_DEFAULT_CATEGORY(actions,
                              "Messages specific for this msg example");
 int communicator_size = 0;
@@ -39,7 +36,7 @@ static double parse_double(const char *string)
 
   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;
 }
 
@@ -109,8 +106,8 @@ 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);
-  msg_comm_t comm = MSG_task_isend_with_matching(task, to, /*matching madness*/NULL,task);
+  msg_comm_t comm =
+      MSG_task_isend( MSG_task_create(to,0,parse_double(size),NULL), to);
   xbt_dynar_push(globals->isends,&comm);
 
   XBT_DEBUG("Isend on %s", MSG_process_get_name(MSG_process_self()));
@@ -119,12 +116,6 @@ static void action_Isend(const char *const *action)
   asynchronous_cleanup();
 }
 
-static int task_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 */
-  return 0; /* rendez-vous mode: it's not there yet */
-}
 
 static void action_recv(const char *const *action)
 {
@@ -139,22 +130,6 @@ static void action_recv(const char *const *action)
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     name = xbt_str_join_array(action, " ");
 
-  /* The next chunk is to deal with the fact that for short messages,
-   * if the send occurs before the receive, the message is already sent and
-   * buffered on receiver side when the recv() occurs.
-   *
-   * So the next chunk detects this fact and cancel the simix communication instead.
-   */
-
-  /* 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);
-  if (act!=NULL){
-    /* FIXME account for the memcopy time if needed */
-    SIMIX_comm_finish(act);
-    return;
-  }
-
 #ifdef HAVE_TRACING
   int rank = get_rank(MSG_process_get_name(MSG_process_self()));
   int src_traced = get_rank(action[2]);
@@ -162,10 +137,13 @@ static void action_recv(const char *const *action)
 #endif
 
   XBT_DEBUG("Receiving: %s", name);
-  MSG_task_receive(&task, mailbox_name);
+  MSG_error_t res = MSG_task_receive(&task, mailbox_name);
   //  MSG_task_receive(&task, MSG_process_get_name(MSG_process_self()));
   XBT_VERB("%s %f", name, MSG_get_clock() - clock);
-  MSG_task_destroy(task);
+
+  if (res == MSG_OK) {
+    MSG_task_destroy(task);
+  }
 
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     free(name);
@@ -221,7 +199,7 @@ static void action_wait(const char *const *action)
   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))
@@ -304,7 +282,7 @@ static void action_reduce(const char *const *action)
 
 	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());
@@ -357,7 +335,7 @@ static void action_bcast(const char *const *action)
 
 	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());
@@ -424,7 +402,7 @@ static void action_allReduce(const char *const *action) {
 
   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());
@@ -548,8 +526,6 @@ int main(int argc, char *argv[])
 {
   MSG_error_t res = MSG_OK;
 
-  smx_factory_initializer_to_use = SIMIX_ctx_raw_factory_init;
-
   /* Check the given arguments */
   MSG_global_init(&argc, argv);
   if (argc < 3) {