still some mem cleanup to finish

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

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index fc9d793..007b292 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -47,6 +47,7 @@ void smpi_request_reset(void *pointer)
 
   request->buf = NULL;
   request->completed = 0;
+  request->consumed = 0;
   request->data = NULL;
   request->forward = 0;
 
@@ -121,10 +122,10 @@ int smpi_create_request(void *buf, int count, smpi_mpi_datatype_t datatype,
   return retval;
 }
 /* FIXME: understand what they do and put the prototypes in a header file (live in smpi_base.c) */
-void smpi_mpi_land_func(void *a, void *b, int *length,
-                        MPI_Datatype * datatype);
-void smpi_mpi_sum_func(void *a, void *b, int *length,
-                       MPI_Datatype * datatype);
+void smpi_mpi_land_func(void *a, void *b, int *length, MPI_Datatype * datatype);
+void smpi_mpi_sum_func(void *a, void *b, int *length, MPI_Datatype * datatype);
+void smpi_mpi_min_func(void *a, void *b, int *length, MPI_Datatype * datatype);
+void smpi_mpi_max_func(void *a, void *b, int *length, MPI_Datatype * datatype);
 
 void smpi_global_init()
 {
@@ -142,8 +143,6 @@ void smpi_global_init()
 #endif
 
   smpi_global = xbt_new(s_smpi_global_t, 1);
-  // config variable
-  smpi_global->reference_speed = SMPI_DEFAULT_SPEED;
 
   // mallocators
   smpi_global->request_mallocator =
@@ -154,7 +153,7 @@ void smpi_global_init()
                        smpi_message_free, smpi_message_reset);
 
   smpi_global->process_count = SIMIX_process_count();
-  fprintf(stderr,"There is %d processes\n",smpi_global->process_count);
+  DEBUG1("There is %d processes",smpi_global->process_count);
 
   // sender/receiver processes
   smpi_global->main_processes = xbt_new(smx_process_t, smpi_global->process_count);
@@ -191,6 +190,8 @@ void smpi_global_init()
   smpi_mpi_global->mpi_byte->size = (size_t) 1;
   smpi_mpi_global->mpi_int = xbt_new(s_smpi_mpi_datatype_t, 1);
   smpi_mpi_global->mpi_int->size = sizeof(int);
+  smpi_mpi_global->mpi_float = xbt_new(s_smpi_mpi_datatype_t, 1);
+  smpi_mpi_global->mpi_float->size = sizeof(float);
   smpi_mpi_global->mpi_double = xbt_new(s_smpi_mpi_datatype_t, 1);
   smpi_mpi_global->mpi_double->size = sizeof(double);
 
@@ -199,6 +200,10 @@ void smpi_global_init()
   smpi_mpi_global->mpi_land->func = smpi_mpi_land_func;
   smpi_mpi_global->mpi_sum = xbt_new(s_smpi_mpi_op_t, 1);
   smpi_mpi_global->mpi_sum->func = smpi_mpi_sum_func;
+  smpi_mpi_global->mpi_min = xbt_new(s_smpi_mpi_op_t, 1);
+  smpi_mpi_global->mpi_min->func = smpi_mpi_min_func;
+  smpi_mpi_global->mpi_max = xbt_new(s_smpi_mpi_op_t, 1);
+  smpi_mpi_global->mpi_max->func = smpi_mpi_max_func;
 
 }
 
@@ -262,6 +267,10 @@ smx_cond_t smpi_process_cond()
   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)
 {
   smx_cond_t cond = NULL;
@@ -272,8 +281,17 @@ 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]);
 
@@ -283,10 +301,6 @@ int smpi_run_simulation(int *argc, char **argv)
   // 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);
@@ -311,10 +325,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;