X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/37847073d272353f40d07e8d110b963488362efb..e1d9c1d28c6bbf8c0ad26b067f8a67a5a36a7f63:/src/surf/workstation_ptask_L07.c diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index e0ce3d4155..2190295c09 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -754,14 +754,12 @@ static void ptask_parse_link_init(void) char *name_link_down = NULL; char *name_link = NULL; - if(A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX) - { - name_link_up = xbt_strdup(bprintf("%s_UP",A_surfxml_link_id)); - name_link_down = xbt_strdup(bprintf("%s_DOWN",A_surfxml_link_id)); - } - else - { - name_link = xbt_strdup(A_surfxml_link_id); + if(A_surfxml_link_sharing_policy == + A_surfxml_link_sharing_policy_FULLDUPLEX) { + name_link_up = bprintf("%s_UP", A_surfxml_link_id); + name_link_down = bprintf("%s_DOWN", A_surfxml_link_id); + } else { + name_link = xbt_strdup(A_surfxml_link_id); } surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth); bw_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file); @@ -966,7 +964,8 @@ static void ptask_model_init_internal(void) ptask_link_new(xbt_strdup("__loopback__"), 498000000, NULL, 0.000015, NULL, SURF_RESOURCE_ON, NULL, - SURF_LINK_FATPIPE, NULL)); + SURF_LINK_FATPIPE, NULL), + ptask_get_link_latency); }