Leak-- (seen in maestro-set).

[simgrid.git] / src / smpi / colls / smpi_automatic_selector.cpp

diff --git a/src/smpi/colls/smpi_automatic_selector.cpp b/src/smpi/colls/smpi_automatic_selector.cpp
index 2a1edb5..b6b3693 100644 (file)
--- a/src/smpi/colls/smpi_automatic_selector.cpp
+++ b/src/smpi/colls/smpi_automatic_selector.cpp
@@ -1,68 +1,75 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-2017. 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. */
 
  * 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 <float.h>
+#include <cfloat>

 
 #include <exception>
 
 #include "colls_private.h"
 
 #include <exception>
 
 #include "colls_private.h"

+#include "smpi_process.hpp"
+

 
 //attempt to do a quick autotuning version of the collective,
 
 
 //attempt to do a quick autotuning version of the collective,
 

-#define TRACE_AUTO_COLL(cat) if (TRACE_is_enabled()){\
-        type_t type = PJ_type_get_or_null (#cat, PJ_type_get_root());\
-         if (!type){\
-             type=PJ_type_event_new(#cat, PJ_type_get_root());\
-         }\
-         char cont_name[25];\
-         snprintf(cont_name,25, "rank-%d", smpi_process()->index());\
-         val_t value = PJ_value_get_or_new(Colls::mpi_coll_##cat##_description[i].name,"1.0 1.0 1.0", type);\
-         NewEvent (SIMIX_get_clock(), PJ_container_get(cont_name), type, value);\
-      }
+#define TRACE_AUTO_COLL(cat)                                                                                           \
+  if (TRACE_is_enabled()) {                                                                                            \
+    simgrid::instr::Type* type = PJ_type_get_root()->getChildOrNull(#cat);                                             \
+    if (not type) {                                                                                                    \
+      type = simgrid::instr::Type::eventNew(#cat, PJ_type_get_root());                                                 \
+    }                                                                                                                  \
+    char cont_name[25];                                                                                                \
+    snprintf(cont_name, 25, "rank-%d", smpi_process()->index());                                                       \
+    simgrid::instr::Value* val =                                                                                       \
+        simgrid::instr::Value::get_or_new(Colls::mpi_coll_##cat##_description[i].name, "1.0 1.0 1.0", type);           \
+    new simgrid::instr::NewEvent(SIMIX_get_clock(), PJ_container_get(cont_name), type, val);                           \
+  }

 
 

-#define AUTOMATIC_COLL_BENCH(cat, ret, args, args2)\
-    ret Coll_ ## cat ## _automatic:: cat (COLL_UNPAREN args)\
-{\
-  double time1, time2, time_min=DBL_MAX;\
-  int min_coll=-1, global_coll=-1;\
-  int i;\
-  double buf_in, buf_out, max_min=DBL_MAX;\
-  for (i = 0; Colls::mpi_coll_##cat##_description[i].name; i++){\
-      if(!strcmp(Colls::mpi_coll_##cat##_description[i].name, "automatic"))continue;\
-      if(!strcmp(Colls::mpi_coll_##cat##_description[i].name, "default"))continue;\
-      Coll_barrier_default::barrier(comm);\
-      TRACE_AUTO_COLL(cat)\
-      time1 = SIMIX_get_clock();\
-      try {\
-      ((int (*) args)\
-          Colls::mpi_coll_##cat##_description[i].coll) args2 ;\
-      }\
-      catch (std::exception& ex) {\
-        continue;\
-      }\
-      time2 = SIMIX_get_clock();\
-      buf_out=time2-time1;\
-      Coll_reduce_default::reduce((void*)&buf_out,(void*)&buf_in, 1, MPI_DOUBLE, MPI_MAX, 0,comm );\
-      if(time2-time1<time_min){\
-          min_coll=i;\
-          time_min=time2-time1;\
-      }\
-      if(comm->rank()==0){\
-          if(buf_in<max_min){\
-              max_min=buf_in;\
-              global_coll=i;\
-          }\
-      }\
-  }\
-  if(comm->rank()==0){\
-      XBT_WARN("For rank 0, the quickest was %s : %f , but global was %s : %f at max",Colls::mpi_coll_##cat##_description[min_coll].name, time_min,Colls::mpi_coll_##cat##_description[global_coll].name, max_min);\
-  }else\
-  XBT_WARN("The quickest %s was %s on rank %d and took %f",#cat,Colls::mpi_coll_##cat##_description[min_coll].name, comm->rank(), time_min);\
-  return (min_coll!=-1)?MPI_SUCCESS:MPI_ERR_INTERN;\
-}
+#define AUTOMATIC_COLL_BENCH(cat, ret, args, args2)                                                                    \
+  ret Coll_##cat##_automatic::cat(COLL_UNPAREN args)                                                                   \
+  {                                                                                                                    \
+    double time1, time2, time_min = DBL_MAX;                                                                           \
+    int min_coll = -1, global_coll = -1;                                                                               \
+    int i;                                                                                                             \
+    double buf_in, buf_out, max_min = DBL_MAX;                                                                         \
+    for (i = 0; Colls::mpi_coll_##cat##_description[i].name; i++) {                                                    \
+      if (not strcmp(Colls::mpi_coll_##cat##_description[i].name, "automatic"))                                        \
+        continue;                                                                                                      \
+      if (not strcmp(Colls::mpi_coll_##cat##_description[i].name, "default"))                                          \
+        continue;                                                                                                      \
+      Coll_barrier_default::barrier(comm);                                                                             \
+      TRACE_AUTO_COLL(cat)                                                                                             \
+      time1 = SIMIX_get_clock();                                                                                       \
+      try {                                                                                                            \
+        ((int(*) args)Colls::mpi_coll_##cat##_description[i].coll) args2;                                              \
+      } catch (std::exception & ex) {                                                                                  \
+        continue;                                                                                                      \
+      }                                                                                                                \
+      time2   = SIMIX_get_clock();                                                                                     \
+      buf_out = time2 - time1;                                                                                         \
+      Coll_reduce_default::reduce((void*)&buf_out, (void*)&buf_in, 1, MPI_DOUBLE, MPI_MAX, 0, comm);                   \
+      if (time2 - time1 < time_min) {                                                                                  \
+        min_coll = i;                                                                                                  \
+        time_min = time2 - time1;                                                                                      \
+      }                                                                                                                \
+      if (comm->rank() == 0) {                                                                                         \
+        if (buf_in < max_min) {                                                                                        \
+          max_min     = buf_in;                                                                                        \
+          global_coll = i;                                                                                             \
+        }                                                                                                              \
+      }                                                                                                                \
+    }                                                                                                                  \
+    if (comm->rank() == 0) {                                                                                           \
+      XBT_WARN("For rank 0, the quickest was %s : %f , but global was %s : %f at max",                                 \
+               Colls::mpi_coll_##cat##_description[min_coll].name, time_min,                                           \
+               Colls::mpi_coll_##cat##_description[global_coll].name, max_min);                                        \
+    } else                                                                                                             \
+      XBT_WARN("The quickest %s was %s on rank %d and took %f", #cat,                                                  \
+               Colls::mpi_coll_##cat##_description[min_coll].name, comm->rank(), time_min);                            \
+    return (min_coll != -1) ? MPI_SUCCESS : MPI_ERR_INTERN;                                                            \
+  }

 
 namespace simgrid{
 namespace smpi{
 
 namespace simgrid{
 namespace smpi{