These functions in SIMIX should return 0, and that function in actions should return...

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

diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c
index 52c89a4..17bc3f4 100644 (file)
--- a/examples/msg/actions/actions.c
+++ b/examples/msg/actions/actions.c
@@ -124,25 +124,25 @@ static void action_Isend(const char *const *action)
   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);
   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;
-  }
+  } 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);
-  }
+    msg_comm_t comm = MSG_task_isend_with_matching(task, to, /*matching madness*/NULL,task);
+    xbt_dynar_push(globals->isends,&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);
+    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();
 }
 
   asynchronous_cleanup();
 }

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index f3798e6..f2b2258 100644 (file)
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -175,7 +175,7 @@ int SIMIX_comm_has_send_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), voi
     }
   }
   XBT_DEBUG("No matching communication action found");
     }
   }
   XBT_DEBUG("No matching communication action found");

-  return 1;
+  return 0;

 }
 
 /**
 }
 
 /**


@@ -196,7 +196,7 @@ int SIMIX_comm_has_recv_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), voi
     }
   }
   XBT_DEBUG("No matching communication action found");
     }
   }
   XBT_DEBUG("No matching communication action found");

-  return 1;
+  return 0;

 }
 
 /******************************************************************************/
 }
 
 /******************************************************************************/