Merge pull request #179 from Takishipp/signals

call sg_instr_new_host via signal call

diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp
index 72d975c..2baf7b9 100644 (file)
--- a/src/surf/instr_routing.cpp
+++ b/src/surf/instr_routing.cpp
@@ -233,7 +233,7 @@ static void instr_routing_parse_start_link(simgrid::s4u::Link& link)
   }
 }
 
-void sg_instr_new_host(simgrid::s4u::Host& host)
+static void sg_instr_new_host(simgrid::s4u::Host& host)
 {
   container_t father = currentContainer.back();
   container_t container = PJ_container_new(host.cname(), INSTR_HOST, father);
@@ -322,6 +322,7 @@ void instr_routing_define_callbacks ()
     return;
   simgrid::s4u::Link::onCreation.connect(instr_routing_parse_start_link);
   simgrid::s4u::onPlatformCreated.connect(instr_routing_parse_end_platform);
+  simgrid::s4u::Host::onCreation.connect(sg_instr_new_host);
 }
 
 /*

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 0b49f04..2e10ec0 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -99,9 +99,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t args)
     host->pimpl_cpu->setPState(args->pstate);
   if (args->coord && strcmp(args->coord, ""))
     new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord);
-
-  if (TRACE_is_enabled() && TRACE_needs_platform())
-    sg_instr_new_host(*host);
+    
 }
 
 /** @brief Add a "router" to the network element list */

diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp
index 1ffead7..2bc61f3 100644 (file)
--- a/src/surf/xml/platf_private.hpp
+++ b/src/surf/xml/platf_private.hpp
@@ -247,7 +247,6 @@ 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);
-XBT_PRIVATE void sg_instr_new_host(simgrid::s4u::Host& host);
 XBT_PRIVATE void sg_instr_AS_end();
 
 SG_END_DECL()