Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --cc include/simgrid/s4u/Engine.hpp
Simple merge

diff --cc src/instr/instr_platform.cpp
index e3faff6,b7b6375..8389127
--- 1/src/surf/instr_routing.cpp
--- 2/src/instr/instr_platform.cpp
+++ b/src/instr/instr_platform.cpp
@@@ -132,7 -131,7 +131,7 @@@ static void recursiveGraphExtraction(si
      }
    }
  
-   xbt_graph_t graph = xbt_graph_new_graph (0, nullptr);
 -  xbt_graph_t graph = xbt_graph_new_graph(0, nullptr);
++  xbt_graph_t graph                        = xbt_graph_new_graph(0, nullptr);
    std::map<std::string, xbt_node_t>* nodes = new std::map<std::string, xbt_node_t>;
    std::map<std::string, xbt_edge_t>* edges = new std::map<std::string, xbt_edge_t>;
  
@@@ -265,10 -263,10 +263,10 @@@ static void instr_on_platform_created(
  {
    currentContainer.clear();
    std::set<std::string>* filter = new std::set<std::string>;
-   XBT_DEBUG ("Starting graph extraction.");
+   XBT_DEBUG("Starting graph extraction.");
 -  recursiveGraphExtraction(simgrid::s4u::Engine::getInstance()->getNetRoot(), simgrid::instr::Container::getRoot(),
 +  recursiveGraphExtraction(simgrid::s4u::Engine::get_instance()->getNetRoot(), simgrid::instr::Container::getRoot(),
                             filter);
-   XBT_DEBUG ("Graph extraction finished.");
+   XBT_DEBUG("Graph extraction finished.");
    delete filter;
    TRACE_paje_dump_buffer(true);
  }
@@@ -368,12 -366,12 +366,12 @@@ static void recursiveXBTGraphExtraction
    static_cast<simgrid::kernel::routing::NetZoneImpl*>(netzone)->get_graph(graph, nodes, edges);
  }
  
- xbt_graph_t instr_routing_platform_graph ()
+ xbt_graph_t instr_routing_platform_graph()
  {
-   xbt_graph_t ret = xbt_graph_new_graph (0, nullptr);
 -  xbt_graph_t ret = xbt_graph_new_graph(0, nullptr);
++  xbt_graph_t ret                          = xbt_graph_new_graph(0, nullptr);
    std::map<std::string, xbt_node_t>* nodes = new std::map<std::string, xbt_node_t>;
    std::map<std::string, xbt_edge_t>* edges = new std::map<std::string, xbt_edge_t>;
 -  recursiveXBTGraphExtraction(ret, nodes, edges, simgrid::s4u::Engine::getInstance()->getNetRoot(),
 +  recursiveXBTGraphExtraction(ret, nodes, edges, simgrid::s4u::Engine::get_instance()->getNetRoot(),
                                simgrid::instr::Container::getRoot());
    delete nodes;
    delete edges;

diff --cc src/s4u/s4u_Engine.cpp
Simple merge

diff --cc src/simdag/sd_global.cpp
Simple merge

diff --cc src/surf/sg_platf.cpp
Simple merge

diff --cc src/surf/xml/surfxml_sax_cb.cpp
index 339cf0a,b0b5dcb..43c3b3b
--- 1/src/surf/xml/surfxml_sax_cb.cpp
--- 2/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@@ -947,7 -944,7 +945,9 @@@ void ETag_surfxml_prop(){/* Nothing to 
  void STag_surfxml_random(){/* Nothing to do */}
  void ETag_surfxml_random(){/* Nothing to do */}
  void ETag_surfxml_trace___connect(){/* Nothing to do */}
- void STag_surfxml_trace(){parse_after_config();}
 -void STag_surfxml_trace(){/* Nothing to do */}
++void STag_surfxml_trace()
++{ /* Nothing to do */
++}
  void ETag_surfxml_router(){/*Nothing to do*/}
  void ETag_surfxml_host___link(){/* Nothing to do */}
  void ETag_surfxml_cabinet(){/* Nothing to do */}