X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/89d98a56977c70b61c8dba09f5c5136e73784339..2dfae4217ef47d761adb367f1e2008823be6485b:/src/smpi/colls/smpi_automatic_selector.c

diff --git a/src/smpi/colls/smpi_automatic_selector.c b/src/smpi/colls/smpi_automatic_selector.c
index 7c42c92df5..54bdcc1b13 100644
--- a/src/smpi/colls/smpi_automatic_selector.c
+++ b/src/smpi/colls/smpi_automatic_selector.c
@@ -1,6 +1,6 @@
 #include "colls_private.h"
-#include <limits.h>
 #include "mc/mc_private.h"
+#include <float.h>
 
 //attempt to do a quick autotuning version of the collective,
 
@@ -10,7 +10,7 @@
          if (!type){\
              type=PJ_type_event_new(#cat, PJ_type_get_root());\
          }\
-         char* cont_name=malloc(25*sizeof(char*));\
+         char cont_name[25];\
          sprintf(cont_name, "rank-%d", smpi_process_index());\
          val_t value = PJ_value_get_or_new(mpi_coll_##cat##_description[i].name,"1.0 1.0 1.0", type);\
          new_pajeNewEvent (SIMIX_get_clock(), PJ_container_get(cont_name), type, value);\
@@ -23,18 +23,25 @@
 #define AUTOMATIC_COLL_BENCH(cat, ret, args, args2)\
     ret smpi_coll_tuned_ ## cat ## _ ## automatic(COLL_UNPAREN args)\
 {\
-  double time1, time2, time_min=INT_MAX;\
-  int min_coll=-1, global_coll=-1;\
-  int i;\
-  double buf_in, buf_out, max_min=INT_MAX;\
+  double time1, time2, time_min=DBL_MAX;\
+  volatile int min_coll=-1, global_coll=-1;\
+  volatile int i;\
+  xbt_ex_t ex;\
+  double buf_in, buf_out, max_min=DBL_MAX;\
   for (i = 0; mpi_coll_##cat##_description[i].name; i++){\
       if(!strcmp(mpi_coll_##cat##_description[i].name, "automatic"))continue;\
       if(!strcmp(mpi_coll_##cat##_description[i].name, "default"))continue;\
       smpi_mpi_barrier(comm);\
       TRACE_AUTO_COLL(cat)\
       time1 = SIMIX_get_clock();\
+      TRY{\
       ((int (*) args)\
           mpi_coll_##cat##_description[i].coll) args2 ;\
+      }\
+      CATCH(ex) {\
+        xbt_ex_free(ex);\
+        continue;\
+      }\
       time2 = SIMIX_get_clock();\
       buf_out=time2-time1;\
       smpi_mpi_reduce((void*)&buf_out,(void*)&buf_in, 1, MPI_DOUBLE, MPI_MAX, 0,comm );\
@@ -50,9 +57,9 @@
       }\
   }\
   if(smpi_comm_rank(comm)==0){\
-      XBT_WARN("For rank 0, the quickest was %s : %lf , but global was %s : %lf at max",mpi_coll_##cat##_description[min_coll].name, time_min,mpi_coll_##cat##_description[global_coll].name, max_min);\
+      XBT_WARN("For rank 0, the quickest was %s : %f , but global was %s : %f at max",mpi_coll_##cat##_description[min_coll].name, time_min,mpi_coll_##cat##_description[global_coll].name, max_min);\
   }else\
-  XBT_WARN("The quickest %s was %s on rank %d and took %lf",#cat,mpi_coll_##cat##_description[min_coll].name, smpi_comm_rank(comm), time_min);\
+  XBT_WARN("The quickest %s was %s on rank %d and took %f",#cat,mpi_coll_##cat##_description[min_coll].name, smpi_comm_rank(comm), time_min);\
   return (min_coll!=-1)?MPI_SUCCESS:MPI_ERR_INTERN;\
 }\