Resolved merge "merge changes. Strange, it seems to ate pierre commit" and

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

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 75808fd..fb16f28 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -1462,103 +1462,6 @@ void generic_src_dst_check(routing_component_t rc, const char *src,
      src,dst,src_as->name, dst_as->name,rc->name);
 }
 
-
-static void parse_create_host_link(int i)
-{
-       char *host_id, *link_id = NULL;
-       s_sg_platf_host_cbarg_t host;
-       memset(&host,0,sizeof(host));
-
-       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);
-
-       A_surfxml_host_state = A_surfxml_host_state_ON;
-
-       XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id, struct_cluster->S_cluster_power);
-       host.V_host_id = xbt_strdup(host_id);
-       if(strcmp(struct_cluster->V_cluster_availability_file,"")){
-         xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free);
-         char* tmp_availability_file = xbt_strdup(struct_cluster->V_cluster_availability_file);
-         xbt_str_varsubst(tmp_availability_file,patterns);
-         XBT_DEBUG("\tavailability_file=\"%s\"",tmp_availability_file);
-         host.V_host_power_trace = tmgr_trace_new(tmp_availability_file);
-         xbt_free(tmp_availability_file);
-       }
-       else
-       {
-         XBT_DEBUG("\tavailability_file=\"\"");
-       }
-       if(strcmp(struct_cluster->V_cluster_state_file,"")){
-         char *tmp_state_file = xbt_strdup(struct_cluster->V_cluster_state_file);
-         xbt_str_varsubst(tmp_state_file,patterns);
-         XBT_DEBUG("\tstate_file=\"%s\"",tmp_state_file);
-         host.V_host_state_trace = tmgr_trace_new(tmp_state_file);
-         xbt_free(tmp_state_file);
-       }
-       else
-       {
-         XBT_DEBUG("\tstate_file=\"\"");
-       }
-
-       host.V_host_power_peak = struct_cluster->S_cluster_power;
-       host.V_host_power_scale = 1.0;
-       host.V_host_core = struct_cluster->S_cluster_core;
-       host.V_host_state_initial = SURF_RESOURCE_ON;
-       host.V_host_coord = "";
-       sg_platf_new_host(&host);
-       XBT_DEBUG("</host>");
-
-       A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
-       if(AX_surfxml_cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
-       {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FULLDUPLEX;}
-       if(AX_surfxml_cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
-       {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FATPIPE;}
-
-       XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id,struct_cluster->S_cluster_bw, struct_cluster->S_cluster_lat);
-
-       struct_lnk = xbt_new0(s_surf_parsing_link_arg_t, 1);
-       struct_lnk->V_link_id = xbt_strdup(link_id);
-       struct_lnk->V_link_bandwidth = struct_cluster->S_cluster_bw;
-       struct_lnk->V_link_latency = struct_cluster->S_cluster_lat;
-       struct_lnk->V_link_bandwidth_file = NULL;
-       struct_lnk->V_link_latency_file = NULL;
-       struct_lnk->V_link_state_file = NULL;
-       struct_lnk->V_link_state = SURF_RESOURCE_ON;
-       struct_lnk->V_link_sharing_policy = A_surfxml_link_sharing_policy;
-
-       if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED)
-               struct_lnk->V_policy_initial_link = SURF_LINK_SHARED;
-       else
-       {
-        if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE)
-                struct_lnk->V_policy_initial_link = SURF_LINK_FATPIPE;
-        else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
-                struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX;
-       }
-       surf_parse_link();
-
-       ETag_surfxml_host();
-       ETag_surfxml_link();
-
-       surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1);
-
-       if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX){
-               char* tmp_link =  bprintf("%s_UP",link_id);
-               info->link_up   = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
-               free(tmp_link);
-               tmp_link =  bprintf("%s_DOWN",link_id);
-               info->link_down = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
-               free(tmp_link);
-       }
-       else{
-               info->link_up   = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL);
-               info->link_down = info->link_up;
-       }
-       xbt_dict_set(cluster_host_link,host_id,info,xbt_free);
-       xbt_free(link_id);
-       xbt_free(host_id);
-}
-
 void routing_parse_Scluster(void)
 {
   if(!cluster_host_link)
@@ -1650,7 +1553,7 @@ void routing_parse_Scluster(void)
                XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id,struct_cluster->S_cluster_bw, struct_cluster->S_cluster_lat);
 
                struct_lnk = xbt_new0(s_surf_parsing_link_arg_t, 1);
-               struct_lnk->V_link_id = link_id;
+               struct_lnk->V_link_id = xbt_strdup(link_id);
                struct_lnk->V_link_bandwidth = struct_cluster->S_cluster_bw;
                struct_lnk->V_link_latency = struct_cluster->S_cluster_lat;
                struct_lnk->V_link_bandwidth_file = NULL;
@@ -1670,11 +1573,26 @@ void routing_parse_Scluster(void)
                }
                surf_parse_link();
 
-               xbt_dict_set(cluster_host_link,host_id,strdup(link_id),free);
-//             XBT_INFO("key '%s' Value '%s'",host_id,link_id);
                ETag_surfxml_host();
                ETag_surfxml_link();
 
+               surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1);
+               if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX){
+                       char* tmp_link =  bprintf("%s_UP",link_id);
+                       info->link_up   = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
+                       free(tmp_link);
+                       tmp_link =  bprintf("%s_DOWN",link_id);
+                       info->link_down = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
+                       free(tmp_link);
+               }
+               else{
+                       info->link_up   = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL);
+                       info->link_down = info->link_up;
+               }
+               xbt_dict_set(cluster_host_link,host_id,info,xbt_free);
+               xbt_free(link_id);
+               xbt_free(host_id);
+
                break;
 
     case 2:
@@ -1730,7 +1648,7 @@ void routing_parse_Scluster(void)
                XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id,struct_cluster->S_cluster_bw, struct_cluster->S_cluster_lat);
 
                struct_lnk = xbt_new0(s_surf_parsing_link_arg_t, 1);
-               struct_lnk->V_link_id = link_id;
+               struct_lnk->V_link_id = xbt_strdup(link_id);
                struct_lnk->V_link_bandwidth = struct_cluster->S_cluster_bw;
                struct_lnk->V_link_latency = struct_cluster->S_cluster_lat;
                struct_lnk->V_link_bandwidth_file = NULL;
@@ -1750,12 +1668,26 @@ void routing_parse_Scluster(void)
                }
                surf_parse_link();
 
-               xbt_dict_set(cluster_host_link,host_id,strdup(link_id),free);
-//             XBT_INFO("key '%s' Value '%s'",host_id,link_id);
-
                ETag_surfxml_host();
                ETag_surfxml_link();
 
+               surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1);
+               if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX){
+                       char* tmp_link =  bprintf("%s_UP",link_id);
+                       info->link_up   = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
+                       free(tmp_link);
+                       tmp_link =  bprintf("%s_DOWN",link_id);
+                       info->link_down = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
+                       free(tmp_link);
+               }
+               else{
+                       info->link_up   = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL);
+                       info->link_down = info->link_up;
+               }
+               xbt_dict_set(cluster_host_link,host_id,info,xbt_free);
+               xbt_free(link_id);
+               xbt_free(host_id);
+
       }
       break;