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

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 4dac16053e..b458bce363 100644
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -130,8 +130,6 @@ void smpi_global_init()
 {
   int i;
 
-  int size = SIMIX_host_get_number();
-
   /* Connect our log channels: that must be done manually under windows */
 #ifdef XBT_LOG_CONNECT
   XBT_LOG_CONNECT(smpi_base, smpi);
@@ -144,24 +142,6 @@ void smpi_global_init()
 #endif
 
   smpi_global = xbt_new(s_smpi_global_t, 1);
-  // 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 =
@@ -171,19 +151,11 @@ void smpi_global_init()
     xbt_mallocator_new(SMPI_MESSAGE_MALLOCATOR_SIZE, smpi_message_new,
                        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);
+  smpi_global->process_count = SIMIX_process_count();
+  DEBUG1("There is %d processes",smpi_global->process_count);
 
   // 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, smpi_global->process_count);
 
   // timers
   smpi_global->timer = xbt_os_timer_new();
@@ -194,31 +166,20 @@ void smpi_global_init()
   smpi_global->do_once_duration = NULL;
   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();
-  smpi_global->host_count = SIMIX_host_get_number();
 
   smpi_mpi_global = xbt_new(s_smpi_mpi_global_t, 1);
 
   // global communicator
   smpi_mpi_global->mpi_comm_world = xbt_new(s_smpi_mpi_communicator_t, 1);
-  smpi_mpi_global->mpi_comm_world->size = smpi_global->host_count;
+  smpi_mpi_global->mpi_comm_world->size = smpi_global->process_count;
   smpi_mpi_global->mpi_comm_world->barrier_count = 0;
   smpi_mpi_global->mpi_comm_world->barrier_mutex = SIMIX_mutex_init();
   smpi_mpi_global->mpi_comm_world->barrier_cond = SIMIX_cond_init();
   smpi_mpi_global->mpi_comm_world->rank_to_index_map =
-    xbt_new(int, smpi_global->host_count);
+    xbt_new(int, smpi_global->process_count);
   smpi_mpi_global->mpi_comm_world->index_to_rank_map =
-    xbt_new(int, smpi_global->host_count);
-  for (i = 0; i < smpi_global->host_count; i++) {
+    xbt_new(int, smpi_global->process_count);
+  for (i = 0; i < smpi_global->process_count; i++) {
     smpi_mpi_global->mpi_comm_world->rank_to_index_map[i] = i;
     smpi_mpi_global->mpi_comm_world->index_to_rank_map[i] = i;
   }
@@ -241,22 +202,10 @@ void smpi_global_init()
 
 void smpi_global_destroy()
 {
-  int i;
-
-  int size = SIMIX_host_get_number();
-
   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);
@@ -274,46 +223,45 @@ 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);
+  smpi_global = NULL;
 
-  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);
+  /* 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_global);
+  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_global = NULL;
 }
 
-int smpi_host_index()
+int smpi_process_index()
 {
-  smx_host_t host = SIMIX_host_self();
-  smpi_host_data_t hdata = (smpi_host_data_t) SIMIX_host_get_data(host);
-  return hdata->index;
+  smpi_process_data_t pdata = (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self());
+  return pdata->index;
 }
 
-smx_mutex_t smpi_host_mutex()
+smx_mutex_t smpi_process_mutex()
 {
-  smx_host_t host = SIMIX_host_self();
-  smpi_host_data_t hdata = (smpi_host_data_t) SIMIX_host_get_data(host);
-  return hdata->mutex;
+  smpi_process_data_t pdata = (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self());
+  return pdata->mutex;
 }
 
-smx_cond_t smpi_host_cond()
+smx_cond_t smpi_process_cond()
 {
-  smx_host_t host = SIMIX_host_self();
-  smpi_host_data_t hdata = (smpi_host_data_t) SIMIX_host_get_data(host);
-  return hdata->cond;
+  smpi_process_data_t pdata = (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self());
+  return pdata->cond;
+}
+
+static void smpi_cfg_cb_host_speed(const char *name, int pos) {
+	smpi_global->reference_speed = xbt_cfg_get_double_at(_surf_cfg_set,name,pos);
 }
 
 int smpi_run_simulation(int *argc, char **argv)
@@ -326,23 +274,26 @@ int smpi_run_simulation(int *argc, char **argv)
 
   srand(SMPI_RAND_SEED);
 
+  double default_reference_speed = 20000.0;
+  xbt_cfg_register(&_surf_cfg_set,"reference_speed","Power of the host running the simulation (in flop/s). Used to bench the operations.",
+		  xbt_cfgelm_double,&default_reference_speed,1,1,smpi_cfg_cb_host_speed,NULL);
+
+  int default_display_timing = 0;
+  xbt_cfg_register(&_surf_cfg_set,"display_timing","Boolean indicating whether we should display the timing after simulation.",
+		  xbt_cfgelm_int,&default_display_timing,1,1,NULL,NULL);
+
   SIMIX_global_init(argc, argv);
 
+
   // parse the platform file: get the host list
   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....
   smpi_global_init();
 
-  /* Prepare to display some more info when dying on Ctrl-C pressing */
-  // FIXME: doesn't work
-  //signal(SIGINT, inthandler);
-
   /* Clean IO before the run */
   fflush(stdout);
   fflush(stderr);
@@ -367,10 +318,11 @@ int smpi_run_simulation(int *argc, char **argv)
   xbt_fifo_free(actions_failed);
   xbt_fifo_free(actions_done);
 
-  INFO1("simulation time %g", SIMIX_get_clock());
 
-  smpi_global_destroy();
+  if (xbt_cfg_get_int(_surf_cfg_set,"display_timing"))
+	  INFO1("simulation time %g", SIMIX_get_clock());
 
+  smpi_global_destroy();
   SIMIX_clean();
 
   return 0;