X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b110f915460bff6576e1fc6d3a4f391992852714..cac63707a2f233d0a979a67403336292eb2a3038:/src/smpi/smpi_global.c

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 7d52216209..8e1057b6e4 100644
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -153,7 +153,6 @@ void smpi_global_init()
   smpi_global->host_count = 0;
 
   // running hosts
-  smpi_global->running_hosts_count_mutex = SIMIX_mutex_init();
   smpi_global->running_hosts_count = 0;
 
   // mallocators
@@ -166,12 +165,10 @@ void smpi_global_init()
 
   // queues
   smpi_global->pending_send_request_queues = xbt_new(xbt_fifo_t, size);
-  smpi_global->pending_recv_request_queues = xbt_new(xbt_fifo_t, size);
   smpi_global->received_message_queues = xbt_new(xbt_fifo_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();
@@ -184,7 +181,6 @@ void smpi_global_init()
 
   for (i = 0; i < size; i++) {
     smpi_global->pending_send_request_queues[i] = xbt_fifo_new();
-    smpi_global->pending_recv_request_queues[i] = xbt_fifo_new();
     smpi_global->received_message_queues[i] = xbt_fifo_new();
   }
 
@@ -233,11 +229,7 @@ void smpi_global_destroy()
   smpi_do_once_duration_node_t curr, next;
 
   // 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);
@@ -257,12 +249,10 @@ void smpi_global_destroy()
 
   for (i = 0; i < size; i++) {
     xbt_fifo_free(smpi_global->pending_send_request_queues[i]);
-    xbt_fifo_free(smpi_global->pending_recv_request_queues[i]);
     xbt_fifo_free(smpi_global->received_message_queues[i]);
   }
 
   xbt_free(smpi_global->pending_send_request_queues);
-  xbt_free(smpi_global->pending_recv_request_queues);
   xbt_free(smpi_global->received_message_queues);
 
   xbt_free(smpi_global);
@@ -307,8 +297,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....