Make the sg_plat_new_host() function public

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

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 5d6a515..4a4077e 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -6,7 +6,7 @@
 
 #include <pcre.h>               /* regular expression library */
 
-#include "simgrid/platf.h" // platform creation API
+#include "simgrid/platf_interface.h" // platform creation API internal interface
 
 #include "surf_routing_private.h"
 #include "surf/surf_routing.h"
@@ -1512,7 +1512,7 @@ static void parse_create_host_link(int i)
        host.V_host_core = struct_cluster->S_cluster_core;
        host.V_host_state_initial = SURF_RESOURCE_ON;
        host.V_host_coord = "";
-       surf_parse_host(&host);
+       sg_platf_new_host(&host);
        XBT_DEBUG("</host>");
 
        A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
@@ -1610,7 +1610,7 @@ void routing_parse_Scluster(void)
     radical_ends = xbt_str_split(groups, "-");
     switch (xbt_dynar_length(radical_ends)) {
     case 1:
-               surf_parse_get_int(&start, xbt_dynar_get_as(radical_ends, 0, char *));
+               start=surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
                host_id = bprintf("%s%d%s", struct_cluster->V_cluster_prefix, start, struct_cluster->V_cluster_suffix);
                link_id = bprintf("%s_link_%d", struct_cluster->V_cluster_id, start);
 
@@ -1645,7 +1645,7 @@ void routing_parse_Scluster(void)
                host.V_host_core = struct_cluster->S_cluster_core;
                host.V_host_state_initial = SURF_RESOURCE_ON;
                host.V_host_coord = "";
-               surf_parse_host(&host);
+               sg_platf_new_host(&host);
                XBT_DEBUG("</host>");
 
                A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
@@ -1686,9 +1686,8 @@ void routing_parse_Scluster(void)
 
     case 2:
 
-      surf_parse_get_int(&start,
-                         xbt_dynar_get_as(radical_ends, 0, char *));
-      surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *));
+      start=surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
+      end=  surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *));
       for (i = start; i <= end; i++) {
                host_id = bprintf("%s%d%s", struct_cluster->V_cluster_prefix, i, struct_cluster->V_cluster_suffix);
                link_id = bprintf("%s_link_%d", struct_cluster->V_cluster_id, i);
@@ -1726,7 +1725,7 @@ void routing_parse_Scluster(void)
                host.V_host_core = struct_cluster->S_cluster_core;
                host.V_host_state_initial = SURF_RESOURCE_ON;
                host.V_host_coord = "";
-               surf_parse_host(&host);
+               sg_platf_new_host(&host);
                XBT_DEBUG("</host>");
 
                A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
@@ -2002,11 +2001,11 @@ static void routing_parse_Srandom(void)
          char *random_radical = A_surfxml_random_radical;
          char *rd_name = NULL;
          char *rd_value;
-         surf_parse_get_double(&mean,A_surfxml_random_mean);
-         surf_parse_get_double(&std,A_surfxml_random_std_deviation);
-         surf_parse_get_double(&min,A_surfxml_random_min);
-         surf_parse_get_double(&max,A_surfxml_random_max);
-         surf_parse_get_double(&seed,A_surfxml_random_seed);
+         mean = surf_parse_get_double(A_surfxml_random_mean);
+         std  = surf_parse_get_double(A_surfxml_random_std_deviation);
+         min  = surf_parse_get_double(A_surfxml_random_min);
+         max  = surf_parse_get_double(A_surfxml_random_max);
+         seed = surf_parse_get_double(A_surfxml_random_seed);
 
          double res = 0;
          int i = 0;
@@ -2075,9 +2074,9 @@ static void routing_parse_Srandom(void)
                                           xbt_free(tmpbuf);
                                          break;
 
-                       case 2:   surf_parse_get_int(&start,
-                                                                                xbt_dynar_get_as(radical_ends, 0, char *));
-                                         surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *));
+                       case 2:
+                             start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
+                             end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *));
                                          for (i = start; i <= end; i++) {
                                                  xbt_assert(!xbt_dict_get_or_null(random_value,random_id),"Custom Random '%s' already exists !",bprintf("%s%d",random_id,i));
                                                  res = random_generate(random);