One more dynar less.

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

diff --git a/src/smpi/colls/smpi_coll.cpp b/src/smpi/colls/smpi_coll.cpp
index b67212c..f50418b 100644 (file)
--- a/src/smpi/colls/smpi_coll.cpp
+++ b/src/smpi/colls/smpi_coll.cpp
@@ -1,6 +1,6 @@
 /* smpi_coll.c -- various optimized routing for collectives                 */
 
-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2019. 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. */
@@ -17,7 +17,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_coll, smpi, "Logging specific to SMPI (coll
 
 #define COLL_SETTER(cat, ret, args, args2)                                                                             \
   int(*Colls::cat) args;                                                                                               \
-  void Colls::set_##cat(std::string name)                                                                              \
+  void Colls::set_##cat(const std::string& name)                                                                       \
   {                                                                                                                    \
     int id = find_coll_description(mpi_coll_##cat##_description, name, #cat);                                          \
     cat    = reinterpret_cast<ret(*) args>(mpi_coll_##cat##_description[id].coll);                                     \
@@ -62,7 +62,7 @@ void Colls::coll_help(const char *category, s_mpi_coll_description_t * table)
     XBT_WARN("  %s: %s\n", table[i].name.c_str(), table[i].description.c_str());
 }
 
-int Colls::find_coll_description(s_mpi_coll_description_t* table, std::string name, const char* desc)
+int Colls::find_coll_description(s_mpi_coll_description_t* table, const std::string& name, const char* desc)
 {
   for (int i = 0; not table[i].name.empty(); i++)
     if (name == table[i].name) {
@@ -98,7 +98,7 @@ void Colls::set_collectives(){
   if (selector_name.empty())
     selector_name = "default";
 
-  std::map<std::string, std::function<void(std::string)>> setter_callbacks = {
+  std::pair<std::string, std::function<void(std::string)>> setter_callbacks[] = {
       {"gather", &Colls::set_gather},         {"allgather", &Colls::set_allgather},
       {"allgatherv", &Colls::set_allgatherv}, {"allreduce", &Colls::set_allreduce},
       {"alltoall", &Colls::set_alltoall},     {"alltoallv", &Colls::set_alltoallv},
@@ -106,26 +106,13 @@ void Colls::set_collectives(){
       {"scatter", &Colls::set_scatter},       {"bcast", &Colls::set_bcast},
       {"barrier", &Colls::set_barrier}};
 
-  // This only prevents code duplication
-  std::function<void(std::string)> setup = [selector_name, &setter_callbacks](std::string coll) {
-    std::string name = simgrid::config::get_value<std::string>(("smpi/" + coll).c_str());
+  for (auto& elem : setter_callbacks) {
+    std::string name = simgrid::config::get_value<std::string>(("smpi/" + elem.first).c_str());
     if (name.empty())
       name = selector_name;
 
-    setter_callbacks[coll](name);
-  };
-
-  setup("gather");
-  setup("allgather");
-  setup("allgatherv");
-  setup("allreduce");
-  setup("alltoall");
-  setup("alltoallv");
-  setup("reduce");
-  setup("reduce_scatter");
-  setup("scatter");
-  setup("bcast");
-  setup("barrier");
+    (elem.second)(name);
+  }
 }