Revert "Remove lua parse functions from simgrid."

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

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 92a2675..688156c 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -214,7 +214,7 @@ static double vivaldi_get_link_latency (routing_component_t rc,const char *src,
 /**
  * \brief Add a "host" to the network element list
  */
-static void parse_S_host(const char *host_id, const char* coord)
+void parse_S_host(const char *host_id, const char* coord)
 {
   network_element_info_t info = NULL;
   if (current_routing->hierarchy == SURF_ROUTING_NULL)
@@ -232,7 +232,6 @@ static void parse_S_host(const char *host_id, const char* coord)
   info->rc_type = SURF_NETWORK_ELEMENT_HOST;
   xbt_dict_set(global_routing->where_network_elements, host_id,
                (void *) info, xbt_free);
-
   if (strcmp(coord,"")) {
     xbt_dynar_t ctn = xbt_str_split_str(coord, " ");
     xbt_dynar_shrink(ctn, 0);
@@ -306,7 +305,7 @@ static void parse_S_router(void)
 /**
  * \brief Set the endponints for a route
  */
-static void parse_S_route_new_and_endpoints(const char *src_id, const char *dst_id)
+void parse_S_route_new_and_endpoints(const char *src_id, const char *dst_id)
 {
   if (src != NULL && dst != NULL && link_list != NULL)
     THROW2(arg_error, 0, "Route between %s to %s can not be defined",
@@ -378,7 +377,7 @@ static void parse_S_bypassRoute_new_and_endpoints(void)
 /**
  * \brief Set a new link on the actual list of link for a route or ASroute
  */
-static void parse_E_link_ctn_new_elem(const char *link_id)
+void parse_E_link_ctn_new_elem(const char *link_id)
 {
   char *val;
   val = xbt_strdup(link_id);
@@ -416,7 +415,7 @@ static void parse_E_link_c_ctn_new_elem_lua(const char *link_id)
 /**
  * \brief Store the route by calling the set_route function of the current routing component
  */
-static void parse_E_route_store_route(void)
+void parse_E_route_store_route(void)
 {
   name_route_extended_t route = xbt_new0(s_name_route_extended_t, 1);
   route->generic_route.link_list = link_list;
@@ -476,7 +475,7 @@ static void parse_E_bypassRoute_store_route(void)
  * make the new structure and
  * set the parsing functions to allows parsing the part of the routing tree
  */
-static void parse_S_AS(char *AS_id, char *AS_routing)
+void parse_S_AS(char *AS_id, char *AS_routing)
 {
   routing_component_t new_routing;
   model_type_t model = NULL;
@@ -571,7 +570,7 @@ static void parse_S_AS_lua(char *id, char *mode)
  * When you finish to read the routing component, other structures must be created. 
  * the "end" method allow to do that for any routing model type
  */
-static void parse_E_AS(const char *AS_id)
+void parse_E_AS(const char *AS_id)
 {
 
   if (current_routing == NULL) {
@@ -3394,6 +3393,7 @@ static void routing_parse_Scluster(void)
       SURFXML_BUFFER_SET(host_power, temp_cluster_power);
       SURFXML_BUFFER_SET(host_core, cluster_core);
       SURFXML_BUFFER_SET(host_availability, "1.0");
+      SURFXML_BUFFER_SET(host_coordinates, "");
       xbt_free(availability_file);
       availability_file = bprintf("%s",cluster_availability_file);
       xbt_free(state_file);
@@ -3454,6 +3454,7 @@ static void routing_parse_Scluster(void)
         SURFXML_BUFFER_SET(host_power, temp_cluster_power);
         SURFXML_BUFFER_SET(host_core, cluster_core);
         SURFXML_BUFFER_SET(host_availability, "1.0");
+        SURFXML_BUFFER_SET(host_coordinates, "");
         xbt_free(availability_file);
         availability_file = bprintf("%s",cluster_availability_file);
         xbt_free(state_file);
@@ -3783,6 +3784,7 @@ static void routing_parse_Speer(void)
   SURFXML_BUFFER_SET(host_availability, "1.0");
   SURFXML_BUFFER_SET(host_availability_file, peer_availability_file);
   SURFXML_BUFFER_SET(host_state_file, peer_state_file);
+  SURFXML_BUFFER_SET(host_coordinates, "");
   SURFXML_START_TAG(host);
   SURFXML_END_TAG(host);