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

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

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index 8137545..dd3353e 100644 (file)
--- a/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@ -1,4 +1,5 @@
 #include "private.h"
+#include "xbt/time.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_base, smpi,
                                 "Logging specific to SMPI (base)");
@@ -46,66 +47,60 @@ int smpi_mpi_comm_rank(smpi_mpi_communicator_t comm)
   return comm->index_to_rank_map[smpi_host_index()];
 }
 
-void smpi_init_process()
+void smpi_process_init()
 {
   smx_host_t host;
   int i;
   smpi_host_data_t hdata;
 
-  smpi_global->running_hosts_count++;
-
   // initialize some local variables
   host = SIMIX_host_self();
 
   hdata = xbt_new(s_smpi_host_data_t, 1);
+  SIMIX_host_set_data(host, hdata);
+  SIMIX_process_set_data(SIMIX_process_self(),hdata);
 
   for (i = 0; i < smpi_global->host_count && host != smpi_global->hosts[i]; i++);
 
   hdata->index = i;
   hdata->mutex = SIMIX_mutex_init();
   hdata->cond = SIMIX_cond_init();
-
-  SIMIX_host_set_data(host, hdata);
-
+  hdata->finalize = 0;
+
+  hdata->pending_recv_request_queue = xbt_fifo_new();
+  hdata->pending_send_request_queue = xbt_fifo_new();
+  hdata->received_message_queue = xbt_fifo_new();
+
+  hdata->main = SIMIX_process_self();
+  hdata->sender = SIMIX_process_create("smpi_sender",
+          smpi_sender, hdata,
+          SIMIX_host_get_name(SIMIX_host_self()), 0, NULL,
+          /*props */ NULL);
+  hdata->receiver = SIMIX_process_create("smpi_receiver",
+          smpi_receiver, hdata,
+          SIMIX_host_get_name(SIMIX_host_self()), 0, NULL,
+          /*props */ NULL);
+
+  smpi_global->main_processes[hdata->index] = SIMIX_process_self();
   return;
 }
 
-void smpi_mpi_finalize()
+void smpi_process_finalize()
 {
-  int i;
-
-  i = --smpi_global->running_hosts_count;
-
-  SIMIX_mutex_destroy(smpi_host_mutex());
-  SIMIX_cond_destroy(smpi_host_cond());
-
-  if (0 >= i) {
-
-    // wake up senders/receivers
-    for (i = 0; i < smpi_global->host_count; i++) {
-      if (SIMIX_process_is_suspended(smpi_global->sender_processes[i])) {
-        SIMIX_process_resume(smpi_global->sender_processes[i]);
-      }
-      if (SIMIX_process_is_suspended(smpi_global->receiver_processes[i])) {
-        SIMIX_process_resume(smpi_global->receiver_processes[i]);
-      }
-    }
-
-    SIMIX_mutex_destroy(smpi_mpi_global->mpi_comm_world->barrier_mutex);
-    SIMIX_cond_destroy(smpi_mpi_global->mpi_comm_world->barrier_cond);
-    xbt_free(smpi_mpi_global->mpi_comm_world);
-
-    xbt_free(smpi_mpi_global->mpi_byte);
-    xbt_free(smpi_mpi_global->mpi_int);
-    xbt_free(smpi_mpi_global->mpi_double);
-
-    xbt_free(smpi_mpi_global->mpi_land);
-    xbt_free(smpi_mpi_global->mpi_sum);
-
-    xbt_free(smpi_mpi_global);
+  smpi_host_data_t hdata =  SIMIX_host_get_data(SIMIX_host_self());
 
+  hdata->finalize = 2; /* Tell sender and receiver to quit */
+  SIMIX_process_resume(hdata->sender);
+  SIMIX_process_resume(hdata->receiver);
+  while (hdata->finalize>0) { /* wait until it's done */
+         SIMIX_cond_wait(hdata->cond,hdata->mutex);
   }
 
+  SIMIX_mutex_destroy(hdata->mutex);
+  SIMIX_cond_destroy(hdata->cond);
+  xbt_fifo_free(hdata->pending_recv_request_queue);
+  xbt_fifo_free(hdata->pending_send_request_queue);
+  xbt_fifo_free(hdata->received_message_queue);
 }
 
 int smpi_mpi_barrier(smpi_mpi_communicator_t comm)
@@ -128,17 +123,14 @@ int smpi_mpi_barrier(smpi_mpi_communicator_t comm)
 
 int smpi_mpi_isend(smpi_mpi_request_t request)
 {
+       smpi_host_data_t hdata =  SIMIX_host_get_data(SIMIX_host_self());
   int retval = MPI_SUCCESS;
-  int index = smpi_host_index();
 
   if (NULL == request) {
     retval = MPI_ERR_INTERN;
   } else {
-    xbt_fifo_push(smpi_global->pending_send_request_queues[index], request);
-
-    if (SIMIX_process_is_suspended(smpi_global->sender_processes[index])) {
-      SIMIX_process_resume(smpi_global->sender_processes[index]);
-    }
+    xbt_fifo_push(hdata->pending_send_request_queue, request);
+    SIMIX_process_resume(hdata->sender);
   }
 
   return retval;
@@ -147,15 +139,15 @@ int smpi_mpi_isend(smpi_mpi_request_t request)
 int smpi_mpi_irecv(smpi_mpi_request_t request)
 {
   int retval = MPI_SUCCESS;
-  int index = smpi_host_index();
+  smpi_host_data_t hdata =  SIMIX_host_get_data(SIMIX_host_self());
 
   if (NULL == request) {
     retval = MPI_ERR_INTERN;
   } else {
-    xbt_fifo_push(smpi_global->pending_recv_request_queues[index], request);
+    xbt_fifo_push(hdata->pending_recv_request_queue, request);
 
-    if (SIMIX_process_is_suspended(smpi_global->receiver_processes[index])) {
-      SIMIX_process_resume(smpi_global->receiver_processes[index]);
+    if (SIMIX_process_is_suspended(hdata->receiver)) {
+      SIMIX_process_resume(hdata->receiver);
     }
   }