SMPI: move the last queue (received_message_queue) from global to process data

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

diff --git a/src/smpi/smpi_sender.c b/src/smpi/smpi_sender.c
index d366d45..dbb0b7c 100644 (file)
--- a/src/smpi/smpi_sender.c
+++ b/src/smpi/smpi_sender.c
@@ -12,8 +12,6 @@ int smpi_sender(int argc,char*argv[]) {
 
   xbt_fifo_t request_queue;
 
-  int running_hosts_count;
-
   smpi_mpi_request_t request;
 
   smx_host_t dhost;
@@ -26,25 +24,17 @@ int smpi_sender(int argc,char*argv[]) {
 
   int dindex;
 
-  smx_process_t receiver_process;
-
   self = SIMIX_process_self();
   shost = SIMIX_host_self();
 
   index = mydata->index;
 
-  request_queue = smpi_global->pending_send_request_queues[index];
-
-  smpi_global->sender_processes[index] = self;
-
-  do {
+  request_queue = mydata->pending_send_request_queue;
 
+  while (1) {
     request = xbt_fifo_shift(request_queue);
 
-    if (NULL == request) {
-      SIMIX_process_suspend(self);
-    } else {
-
+    if (NULL != request) {
       message = xbt_mallocator_get(smpi_global->message_mallocator);
 
       SIMIX_mutex_lock(request->mutex);
@@ -58,7 +48,8 @@ int smpi_sender(int argc,char*argv[]) {
              request->datatype->size * request->count);
 
       dindex = request->comm->rank_to_index_map[request->dst];
-      dhost = smpi_global->hosts[dindex];
+      dhost = SIMIX_process_get_host(smpi_global->main_processes[dindex]);
+      smpi_host_data_t remote_host = SIMIX_host_get_data(dhost);
 
       message->forward = (request->forward - 1) / 2;
       request->forward = request->forward / 2;
@@ -86,7 +77,7 @@ int smpi_sender(int argc,char*argv[]) {
         SIMIX_cond_wait(request->cond, request->mutex);
       }
 
-      xbt_fifo_push(smpi_global->received_message_queues[dindex], message);
+      xbt_fifo_push(remote_host->received_message_queue, message);
 
       SIMIX_unregister_action_to_condition(action, request->cond);
       SIMIX_action_destroy(action);
@@ -94,16 +85,15 @@ int smpi_sender(int argc,char*argv[]) {
       SIMIX_mutex_unlock(request->mutex);
 
       // wake up receiver if necessary
-      receiver_process = smpi_global->receiver_processes[dindex];
-      if (SIMIX_process_is_suspended(receiver_process)) {
-        SIMIX_process_resume(receiver_process);
-      }
+      SIMIX_process_resume(remote_host->receiver);
 
+    } else if (mydata->finalize>0) { /* main wants me to die and nothing to do */
+       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;
 }