Update copyright notices

[simgrid.git] / 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 ded62ec..72c62a7 100644 (file)
--- a/src/smpi/colls/smpi_automatic_selector.c
+++ b/src/smpi/colls/smpi_automatic_selector.c
@@ -1,10 +1,17 @@
+/* Copyright (c) 2013-2015. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+

 #include "colls_private.h"
 #include "colls_private.h"

+#ifdef HAVE_MC

 #include "mc/mc_private.h"
 #include "mc/mc_private.h"

+#endif

 #include <float.h>
 
 //attempt to do a quick autotuning version of the collective,
 
 #include <float.h>
 
 //attempt to do a quick autotuning version of the collective,
 

-#ifdef HAVE_TRACING

 #define TRACE_AUTO_COLL(cat) if (TRACE_is_enabled()){\
         type_t type = PJ_type_get_or_null (#cat, PJ_type_get_root());\
          if (!type){\
 #define TRACE_AUTO_COLL(cat) if (TRACE_is_enabled()){\
         type_t type = PJ_type_get_or_null (#cat, PJ_type_get_root());\
          if (!type){\


@@ -15,17 +22,15 @@
          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);\
       }
          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);\
       }

-#else
-#define TRACE_AUTO_COLL(cat)
-#endif

 
 
 #define AUTOMATIC_COLL_BENCH(cat, ret, args, args2)\
     ret smpi_coll_tuned_ ## cat ## _ ## automatic(COLL_UNPAREN args)\
 {\
   double time1, time2, time_min=DBL_MAX;\
 
 
 #define AUTOMATIC_COLL_BENCH(cat, ret, args, args2)\
     ret smpi_coll_tuned_ ## cat ## _ ## automatic(COLL_UNPAREN args)\
 {\
   double time1, time2, time_min=DBL_MAX;\

-  int min_coll=-1, global_coll=-1;\
-  int i;\
+  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;\
   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;\


@@ -33,8 +38,14 @@
       smpi_mpi_barrier(comm);\
       TRACE_AUTO_COLL(cat)\
       time1 = SIMIX_get_clock();\
       smpi_mpi_barrier(comm);\
       TRACE_AUTO_COLL(cat)\
       time1 = SIMIX_get_clock();\

+      TRY{\

       ((int (*) args)\
           mpi_coll_##cat##_description[i].coll) args2 ;\
       ((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 );\
       time2 = SIMIX_get_clock();\
       buf_out=time2-time1;\
       smpi_mpi_reduce((void*)&buf_out,(void*)&buf_in, 1, MPI_DOUBLE, MPI_MAX, 0,comm );\