remove an unused parameter + cosmetics

diff --git a/src/kernel/routing/NetCard.hpp b/src/kernel/routing/NetCard.hpp
index bffc783..4f285c3 100644 (file)
--- a/src/kernel/routing/NetCard.hpp
+++ b/src/kernel/routing/NetCard.hpp
@@ -22,7 +22,7 @@ namespace routing {
 /** @ingroup ROUTING_API
  *  @brief Network cards are the vertices in the graph representing the network, used to compute paths between nodes.
  *
 /** @ingroup ROUTING_API
  *  @brief Network cards are the vertices in the graph representing the network, used to compute paths between nodes.
  *

- * @details This represents a position in the network. One can route information between two netcards
+ * @details This represents a position in the network. One can send information between two netcards

  */
 class NetCard : public simgrid::xbt::Extendable<NetCard> {
 
  */
 class NetCard : public simgrid::xbt::Extendable<NetCard> {
 

diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp
index 43bfc41..5401f12 100644 (file)
--- a/src/surf/instr_routing.cpp
+++ b/src/surf/instr_routing.cpp
@@ -297,10 +297,12 @@ void sg_instr_new_host(simgrid::s4u::Host& host)
 
 }
 
 
 }
 

-void sg_instr_new_router(const char* name, const char* coords)
+void sg_instr_new_router(const char* name)

 {
 {

-  container_t father = currentContainer.back();
-  PJ_container_new(name, INSTR_ROUTER, father);
+  if (TRACE_is_enabled() && TRACE_needs_platform()) {
+    container_t father = currentContainer.back();
+    PJ_container_new(name, INSTR_ROUTER, father);
+  }

 }
 
 static void instr_routing_parse_end_platform ()
 }
 
 static void instr_routing_parse_end_platform ()

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index fa37309..49897a1 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -112,8 +112,7 @@ simgrid::kernel::routing::NetCard* sg_platf_new_router(const char* name, const c
   if (coords && strcmp(coords, ""))
     new simgrid::kernel::routing::vivaldi::Coords(netcard, coords);
 
   if (coords && strcmp(coords, ""))
     new simgrid::kernel::routing::vivaldi::Coords(netcard, coords);
 

-  if (TRACE_is_enabled() && TRACE_needs_platform())
-    sg_instr_new_router(name, coords);
+  sg_instr_new_router(name);

 
   return netcard;
 }
 
   return netcard;
 }

diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp
index dbbe39b..e3edce6 100644 (file)
--- a/src/surf/xml/platf_private.hpp
+++ b/src/surf/xml/platf_private.hpp
@@ -240,7 +240,7 @@ XBT_PUBLIC_DATA(int) surfxml_bufferstack_size;
 XBT_PUBLIC(void) routing_route_free(sg_platf_route_cbarg_t route);
 /********** Instr. **********/
 XBT_PRIVATE void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS);
 XBT_PUBLIC(void) routing_route_free(sg_platf_route_cbarg_t route);
 /********** Instr. **********/
 XBT_PRIVATE void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS);

-XBT_PRIVATE void sg_instr_new_router(const char* name, const char* coords);
+XBT_PRIVATE void sg_instr_new_router(const char* name);

 XBT_PRIVATE void sg_instr_new_host(simgrid::s4u::Host& host);
 XBT_PRIVATE void sg_instr_AS_end();
 
 XBT_PRIVATE void sg_instr_new_host(simgrid::s4u::Host& host);
 XBT_PRIVATE void sg_instr_AS_end();