SURF: Unify the types of models in a uniq s_surf_model_t (using an union) +reindent...

[simgrid.git] / src / smpi / smpi_receiver.c

diff --git a/src/smpi/smpi_receiver.c b/src/smpi/smpi_receiver.c
index a8eeea9..cd4766a 100644 (file)
--- a/src/smpi/smpi_receiver.c
+++ b/src/smpi/smpi_receiver.c
@@ -3,16 +3,15 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_receiver, smpi,
                                 "Logging specific to SMPI (receiver)");
 
-int smpi_receiver(int argc, char **argv)
+int smpi_receiver(int argc, char *argv[])
 {
+  smpi_process_data_t mydata = SIMIX_process_get_data(SIMIX_process_self());
   smx_process_t self;
-  int index;
+  int index = mydata->index;
 
   xbt_fifo_t request_queue;
   xbt_fifo_t message_queue;
 
-  int running_hosts_count;
-
   smpi_mpi_request_t request;
   smpi_received_message_t message;
 
@@ -21,19 +20,15 @@ int smpi_receiver(int argc, char **argv)
 
   self = SIMIX_process_self();
 
-  index = smpi_host_index();
-
-  request_queue = smpi_global->pending_recv_request_queues[index];
-  message_queue = smpi_global->received_message_queues[index];
-
-  smpi_global->receiver_processes[index] = self;
-
-  do {
+  request_queue = mydata->pending_recv_request_queue;
+  message_queue = mydata->received_message_queue;
 
+  while (1) {
     // FIXME: better algorithm, maybe some kind of balanced tree? or a heap?
 
-       xbt_fifo_foreach(request_queue,request_item,request,smpi_mpi_request_t){
-         xbt_fifo_foreach(message_queue,message_item,message, smpi_received_message_t) {
+    xbt_fifo_foreach(request_queue, request_item, request, smpi_mpi_request_t) {
+      xbt_fifo_foreach(message_queue, message_item, message,
+                       smpi_received_message_t) {
 
         if (request->comm == message->comm &&
             (MPI_ANY_SOURCE == request->src || request->src == message->src)
@@ -51,9 +46,9 @@ int smpi_receiver(int argc, char **argv)
     message = NULL;
 
   stopsearch:
-    if (NULL == request || NULL == message) {
-      SIMIX_process_suspend(self);
-    } else {
+    if (NULL != request) {
+      if (NULL == message)
+        DIE_IMPOSSIBLE;
 
       SIMIX_mutex_lock(request->mutex);
       memcpy(request->buf, message->buf,
@@ -76,11 +71,15 @@ int smpi_receiver(int argc, char **argv)
       xbt_free(message->buf);
       xbt_mallocator_release(smpi_global->message_mallocator, message);
 
+    } else if (mydata->finalize > 0) {  /* main wants me to die and nothing to do */
+      // FIXME: display the list of remaining requests and messages (user code synchronization faulty?)
+      mydata->finalize--;
+      SIMIX_cond_signal(mydata->cond);
+      return 0;
+    } else {
+      SIMIX_process_suspend(self);
     }
-
-    running_hosts_count = smpi_global->running_hosts_count;
-
-  } while (0 < running_hosts_count);
+  }
 
   return 0;
 }