SMPI: move pending_send_request_queue from global to host data

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

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 4dac160..0d1b432 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -147,22 +147,11 @@ void smpi_global_init()
   // config variable
   smpi_global->reference_speed = SMPI_DEFAULT_SPEED;
 
-  smpi_global->root_ready = 0;
-  smpi_global->ready_process_count = 0;
-
-  // start/stop
-  smpi_global->start_stop_mutex = SIMIX_mutex_init();
-  smpi_global->start_stop_cond = SIMIX_cond_init();
-
   // host info blank until sim starts
   // FIXME: is this okay?
   smpi_global->hosts = NULL;
   smpi_global->host_count = 0;
 
-  // running hosts
-  smpi_global->running_hosts_count_mutex = SIMIX_mutex_init();
-  smpi_global->running_hosts_count = 0;
-
   // mallocators
   smpi_global->request_mallocator =
     xbt_mallocator_new(SMPI_REQUEST_MALLOCATOR_SIZE, smpi_request_new,
@@ -172,18 +161,10 @@ void smpi_global_init()
                        smpi_message_free, smpi_message_reset);
 
   // queues
-  smpi_global->pending_send_request_queues = xbt_new(xbt_fifo_t, size);
-  smpi_global->pending_send_request_queues_mutexes =
-    xbt_new(smx_mutex_t, size);
-  smpi_global->pending_recv_request_queues = xbt_new(xbt_fifo_t, size);
-  smpi_global->pending_recv_request_queues_mutexes =
-    xbt_new(smx_mutex_t, size);
   smpi_global->received_message_queues = xbt_new(xbt_fifo_t, size);
-  smpi_global->received_message_queues_mutexes = xbt_new(smx_mutex_t, size);
 
   // sender/receiver processes
-  smpi_global->sender_processes = xbt_new(smx_process_t, size);
-  smpi_global->receiver_processes = xbt_new(smx_process_t, size);
+  smpi_global->main_processes = xbt_new(smx_process_t, size);
 
   // timers
   smpi_global->timer = xbt_os_timer_new();
@@ -195,12 +176,7 @@ void smpi_global_init()
   smpi_global->do_once_mutex = SIMIX_mutex_init();
 
   for (i = 0; i < size; i++) {
-    smpi_global->pending_send_request_queues[i] = xbt_fifo_new();
-    smpi_global->pending_send_request_queues_mutexes[i] = SIMIX_mutex_init();
-    smpi_global->pending_recv_request_queues[i] = xbt_fifo_new();
-    smpi_global->pending_recv_request_queues_mutexes[i] = SIMIX_mutex_init();
     smpi_global->received_message_queues[i] = xbt_fifo_new();
-    smpi_global->received_message_queues_mutexes[i] = SIMIX_mutex_init();
   }
 
   smpi_global->hosts = SIMIX_host_get_table();
@@ -247,16 +223,8 @@ void smpi_global_destroy()
 
   smpi_do_once_duration_node_t curr, next;
 
-  // start/stop
-  SIMIX_mutex_destroy(smpi_global->start_stop_mutex);
-  SIMIX_cond_destroy(smpi_global->start_stop_cond);
-
   // processes
-  xbt_free(smpi_global->sender_processes);
-  xbt_free(smpi_global->receiver_processes);
-
-  // running hosts
-  SIMIX_mutex_destroy(smpi_global->running_hosts_count_mutex);
+  xbt_free(smpi_global->main_processes);
 
   // mallocators
   xbt_mallocator_free(smpi_global->request_mallocator);
@@ -275,24 +243,28 @@ void smpi_global_destroy()
   SIMIX_mutex_destroy(smpi_global->do_once_mutex);
 
   for (i = 0; i < size; i++) {
-    xbt_fifo_free(smpi_global->pending_send_request_queues[i]);
-    SIMIX_mutex_destroy(smpi_global->pending_send_request_queues_mutexes[i]);
-    xbt_fifo_free(smpi_global->pending_recv_request_queues[i]);
-    SIMIX_mutex_destroy(smpi_global->pending_recv_request_queues_mutexes[i]);
     xbt_fifo_free(smpi_global->received_message_queues[i]);
-    SIMIX_mutex_destroy(smpi_global->received_message_queues_mutexes[i]);
   }
 
-  xbt_free(smpi_global->pending_send_request_queues);
-  xbt_free(smpi_global->pending_send_request_queues_mutexes);
-  xbt_free(smpi_global->pending_recv_request_queues);
-  xbt_free(smpi_global->pending_recv_request_queues_mutexes);
   xbt_free(smpi_global->received_message_queues);
-  xbt_free(smpi_global->received_message_queues_mutexes);
 
   xbt_free(smpi_global);
-
   smpi_global = NULL;
+
+  /* free smpi_mpi_global */
+  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);
+
 }
 
 int smpi_host_index()
@@ -332,8 +304,6 @@ int smpi_run_simulation(int *argc, char **argv)
   SIMIX_create_environment(argv[1]);
 
   SIMIX_function_register("smpi_simulated_main", smpi_simulated_main);
-  SIMIX_function_register("smpi_sender", smpi_sender);
-  SIMIX_function_register("smpi_receiver", smpi_receiver);
   SIMIX_launch_application(argv[2]);
 
   // must initialize globals between creating environment and launching app....