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

[simgrid.git] / src / smpi / private.h

diff --git a/src/smpi/private.h b/src/smpi/private.h
index ff6bcb6..109ce23 100644 (file)
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -84,19 +84,13 @@ typedef struct smpi_global_t {
 
   // state vars
 
-  smx_host_t *hosts;
+  smx_host_t *hosts; //FIXME:killme
   int host_count;
   xbt_mallocator_t request_mallocator;
   xbt_mallocator_t message_mallocator;
 
-  // FIXME: request queues should be moved to host data...
-  xbt_fifo_t *pending_send_request_queues;
-  xbt_fifo_t *received_message_queues;
-
   smx_process_t *main_processes;
 
-  int running_hosts_count; //FIXME: killme
-
   xbt_os_timer_t timer;
   smx_mutex_t timer_mutex;
   smx_cond_t timer_cond;
@@ -119,9 +113,11 @@ typedef struct smpi_host_data_t {
   smx_process_t sender;
   smx_process_t receiver;
 
-  int finalize; /* for main stopping sender&receiver */
+  int finalize; /* so that main process stops its sender&receiver */
 
   xbt_fifo_t pending_recv_request_queue;
+  xbt_fifo_t pending_send_request_queue;
+  xbt_fifo_t received_message_queue;
 } s_smpi_host_data_t;
 typedef struct smpi_host_data_t *smpi_host_data_t;