Make SMPI parameters names more consistent.

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

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 2193fdc..b802e34 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -13,7 +13,7 @@ typedef struct s_smpi_process_data {
   xbt_fifo_t pending_sent;
   xbt_fifo_t pending_recv;
   xbt_os_timer_t timer;
-  double simulated;
+  MPI_Comm comm_self;
 } s_smpi_process_data_t;
 
 static smpi_process_data_t* process_data = NULL;
@@ -45,16 +45,10 @@ xbt_os_timer_t smpi_process_timer(void) {
   return data->timer;
 }
 
-void smpi_process_simulated_reset(void) {
+MPI_Comm smpi_process_comm_self(void) {
   smpi_process_data_t data = smpi_process_data();
 
-  data->simulated = SIMIX_get_clock();
-}
-
-double smpi_process_simulated_elapsed(void) {
-  smpi_process_data_t data = smpi_process_data();
-
-  return SIMIX_get_clock() - data->simulated;
+  return data->comm_self;
 }
 
 void smpi_process_post_send(MPI_Comm comm, MPI_Request request) {
@@ -117,7 +111,6 @@ void smpi_process_post_recv(MPI_Request request) {
 }
 
 void smpi_global_init(void) {
-  double clock = SIMIX_get_clock();
   int i;
   MPI_Group group;
 
@@ -130,7 +123,9 @@ void smpi_global_init(void) {
     process_data[i]->pending_sent = xbt_fifo_new();
     process_data[i]->pending_recv = xbt_fifo_new();
     process_data[i]->timer = xbt_os_timer_new();
-    process_data[i]->simulated = clock;
+    group = smpi_group_new(1);
+    process_data[i]->comm_self = smpi_comm_new(group);
+    smpi_group_set_mapping(group, i, 0);
   }
   group = smpi_group_new(process_count);
   MPI_COMM_WORLD = smpi_comm_new(group);
@@ -146,6 +141,7 @@ void smpi_global_destroy(void) {
   smpi_comm_destroy(MPI_COMM_WORLD);
   MPI_COMM_WORLD = MPI_COMM_NULL;
   for(i = 0; i < count; i++) {
+    smpi_comm_destroy(process_data[i]->comm_self);
     xbt_os_timer_free(process_data[i]->timer);
     xbt_fifo_free(process_data[i]->pending_recv);
     xbt_fifo_free(process_data[i]->pending_sent);
@@ -160,20 +156,25 @@ int main(int argc, char **argv)
   srand(SMPI_RAND_SEED);
 
   double default_reference_speed = 20000.0;
-  xbt_cfg_register(&_surf_cfg_set, "reference_speed",
+  xbt_cfg_register(&_surf_cfg_set, "smpi/running_power",
                    "Power of the host running the simulation (in flop/s). Used to bench the operations.",
                    xbt_cfgelm_double, &default_reference_speed, 1, 1, NULL, NULL);
 
   int default_display_timing = 0;
-  xbt_cfg_register(&_surf_cfg_set, "display_timing",
+  xbt_cfg_register(&_surf_cfg_set, "smpi/display_timing",
                    "Boolean indicating whether we should display the timing after simulation.",
                    xbt_cfgelm_int, &default_display_timing, 1, 1, NULL, NULL);
 
   int default_display_smpe = 0;
-  xbt_cfg_register(&_surf_cfg_set, "SMPE",
+  xbt_cfg_register(&_surf_cfg_set, "smpi/log_events",
                    "Boolean indicating whether we should display simulated time spent in MPI calls.",
                    xbt_cfgelm_int, &default_display_smpe, 1, 1, NULL, NULL);
 
+  double default_threshold = 1e-6;
+  xbt_cfg_register(&_surf_cfg_set, "smpi/cpu_threshold",
+                   "Minimal computation time (in seconds) not discarded.",
+                   xbt_cfgelm_double, &default_threshold, 1, 1, NULL, NULL);
+
   SIMIX_global_init(&argc, argv);
 
   // parse the platform file: get the host list
@@ -190,12 +191,14 @@ int main(int argc, char **argv)
   SIMIX_init();
 
   while (SIMIX_solve(NULL, NULL) != -1.0);
-  
-  if (xbt_cfg_get_int(_surf_cfg_set, "display_timing"))
+
+  if (xbt_cfg_get_int(_surf_cfg_set, "smpi/display_timing"))
     INFO1("simulation time %g", SIMIX_get_clock());
 
   smpi_global_destroy();
 
+  SIMIX_message_sizes_output("toto.txt");
+
   SIMIX_clean();
   return 0;
 }