Plug some easy memleaks

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

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 9c2556f..bd66ffb 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()
 {
@@ -189,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);
 
@@ -197,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;
 
 }
 
@@ -229,14 +236,18 @@ void smpi_global_destroy()
   /* 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->rank_to_index_map);
   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_float);
 
   xbt_free(smpi_mpi_global->mpi_land);
   xbt_free(smpi_mpi_global->mpi_sum);
+  xbt_free(smpi_mpi_global->mpi_max);
+  xbt_free(smpi_mpi_global->mpi_min);
 
   xbt_free(smpi_mpi_global);
 
@@ -277,8 +288,14 @@ int smpi_run_simulation(int *argc, char **argv)
   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]);
 
@@ -312,10 +329,11 @@ int smpi_run_simulation(int *argc, char **argv)
   xbt_fifo_free(actions_failed);
   xbt_fifo_free(actions_done);
 
-  smpi_global_destroy();
 
-  INFO1("simulation time %g", SIMIX_get_clock());
+  if (xbt_cfg_get_int(_surf_cfg_set,"display_timing"))
+         INFO1("simulation time %g", SIMIX_get_clock());
 
+  smpi_global_destroy();
   SIMIX_clean();
 
   return 0;