[platf] Move sg_platf_new_process in platf.cpp

[simgrid.git] / src / surf / surf_routing.cpp

diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index 971df4c..5d4588c 100644 (file)
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -16,6 +16,11 @@
 
 #include "surf/surfxml_parse_values.h"
 
+/*************
+ * Callbacks *
+ *************/
+
+surf_callback(void, RoutingEdge*) routingEdgeCreatedCallbacks;
 
 /**
  * @ingroup SURF_build_api
@@ -146,20 +151,21 @@ static void parse_S_host(sg_platf_host_link_cbarg_t host)
 /**
  * \brief Add a "host" to the network element list
  */
-void routing_add_host(As* current_routing, sg_platf_host_cbarg_t host)
+RoutingEdge *routing_add_host(As* current_routing, sg_platf_host_cbarg_t host)
 {
   if (current_routing->p_hierarchy == SURF_ROUTING_NULL)
     current_routing->p_hierarchy = SURF_ROUTING_BASE;
   xbt_assert(!sg_host_by_name(host->id),
                     "Reading a host, processing unit \"%s\" already exists", host->id);
 
-  RoutingEdge *info = new RoutingEdgeImpl(xbt_strdup(host->id),
+  RoutingEdge *routingEdge = new RoutingEdgeImpl(xbt_strdup(host->id),
                                                    -1,
                                                    SURF_NETWORK_ELEMENT_HOST,
                                                    current_routing);
-  info->setId(current_routing->parsePU(info));
-  sg_host_edge_set(sg_host_by_name_or_create(host->id), info);
-  XBT_DEBUG("Having set name '%s' id '%d'", host->id, info->getId());
+  routingEdge->setId(current_routing->parsePU(routingEdge));
+  sg_host_edge_set(sg_host_by_name_or_create(host->id), routingEdge);
+  XBT_DEBUG("Having set name '%s' id '%d'", host->id, routingEdge->getId());
+  routingEdgeCreatedCallbacks(routingEdge);
 
   if(mount_list){
     xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list);
@@ -184,6 +190,8 @@ void routing_add_host(As* current_routing, sg_platf_host_cbarg_t host)
     xbt_lib_set(host_lib, host->id, COORD_HOST_LEVEL, (void *) ctn);
     XBT_DEBUG("Having set host coordinates for '%s'",host->id);
   }
+
+  return routingEdge;
 }
 
 /**
@@ -204,6 +212,7 @@ static void parse_S_router(sg_platf_router_cbarg_t router)
   info->setId(current_routing->parsePU(info));
   xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, (void *) info);
   XBT_DEBUG("Having set name '%s' id '%d'", router->id, info->getId());
+  routingEdgeCreatedCallbacks(info);
 
   if (router->coord && strcmp(router->coord, "")) {
     unsigned int cursor;
@@ -406,10 +415,11 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS)
               (void *) info);
   XBT_DEBUG("Having set name '%s' id '%d'", new_as->p_name, info->getId());
 
+  routingEdgeCreatedCallbacks(info);
+
   /* set the new current component of the tree */
   current_routing = new_as;
   current_routing->p_netElem = info;
-
 }
 
 /**