From b0d869a97f3827fbbc9b2276b4dc9eab5a64289d Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 7 Nov 2011 22:30:32 +0100 Subject: [PATCH 1/1] Reindent before change. --- src/surf/network.c | 56 ++++++++++++++++++++------------ src/surf/workstation_ptask_L07.c | 54 ++++++++++++++++++++---------- 2 files changed, 72 insertions(+), 38 deletions(-) diff --git a/src/surf/network.c b/src/surf/network.c index 6d203b38f5..fda3acd007 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -199,22 +199,37 @@ static void net_parse_link_init(sg_platf_link_cbarg_t link) { XBT_DEBUG("link_CM02"); - if(link->policy == SURF_LINK_FULLDUPLEX) - { - net_create_resource(bprintf("%s_UP",link->id), link->bandwidth, link->bandwidth_trace, - link->latency, link->latency_trace, link->state, link->state_trace, - link->policy, link->properties); - net_create_resource(bprintf("%s_DOWN",link->id), link->bandwidth, link->bandwidth_trace, - link->latency, link->latency_trace, link->state, link->state_trace, - link->policy, NULL); // FIXME: We need to deep copy the properties or we won't be able to free it - } - else - { - net_create_resource(xbt_strdup(link->id), link->bandwidth, link->bandwidth_trace, - link->latency, link->latency_trace, link->state, link->state_trace, - link->policy, link->properties); + if (link->policy == SURF_LINK_FULLDUPLEX) { + net_create_resource(bprintf("%s_UP", link->id), + link->bandwidth, + link->bandwidth_trace, + link->latency, + link->latency_trace, + link->state, + link->state_trace, + link->policy, + link->properties); + net_create_resource(bprintf("%s_DOWN", link->id), + link->bandwidth, + link->bandwidth_trace, + link->latency, + link->latency_trace, + link->state, + link->state_trace, + link->policy, + NULL); /* FIXME: We need to deep copy the properties or + * we won't be able to free it */ + } else { + net_create_resource(xbt_strdup(link->id), + link->bandwidth, + link->bandwidth_trace, + link->latency, + link->latency_trace, + link->state, + link->state_trace, + link->policy, + link->properties); } - } static void net_add_traces(void) @@ -816,11 +831,12 @@ static void surf_network_model_init_internal(void) network_maxmin_system = lmm_system_new(); routing_model_create(sizeof(link_CM02_t), - net_create_resource(xbt_strdup("__loopback__"), - 498000000, NULL, 0.000015, NULL, - SURF_RESOURCE_ON, NULL, - SURF_LINK_FATPIPE, NULL), - net_get_link_latency); + net_create_resource(xbt_strdup("__loopback__"), + 498000000, NULL, + 0.000015, NULL, + SURF_RESOURCE_ON, NULL, + SURF_LINK_FATPIPE, NULL), + net_get_link_latency); } diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index 59ae4462a7..4425c74d05 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -714,20 +714,37 @@ static void* ptask_link_create_resource(const char *name, static void ptask_parse_link_init(sg_platf_link_cbarg_t link) { - if(link->policy == SURF_LINK_FULLDUPLEX) - { - ptask_link_create_resource(bprintf("%s_UP",link->id), link->bandwidth, link->bandwidth_trace, - link->latency, link->latency_trace, link->state, link->state_trace, - link->policy, link->properties); - ptask_link_create_resource(bprintf("%s_DOWN",link->id), link->bandwidth, link->bandwidth_trace, - link->latency, link->latency_trace, link->state, link->state_trace, - link->policy, NULL); // FIXME: We need to deep copy the properties or we won't be able to free it - } - else - { - ptask_link_create_resource(xbt_strdup(link->id), link->bandwidth, link->bandwidth_trace, - link->latency, link->latency_trace, link->state, link->state_trace, - link->policy, link->properties); + if (link->policy == SURF_LINK_FULLDUPLEX) { + ptask_link_create_resource(bprintf("%s_UP", link->id), + link->bandwidth, + link->bandwidth_trace, + link->latency, + link->latency_trace, + link->state, + link->state_trace, + link->policy, + link->properties); + ptask_link_create_resource(bprintf("%s_DOWN", link->id), + link->bandwidth, + link->bandwidth_trace, + link->latency, + link->latency_trace, + link->state, + link->state_trace, + link->policy, + NULL); /* FIXME: We need to deep copy the + * properties or we won't be able to free + * it */ + } else { + ptask_link_create_resource(xbt_strdup(link->id), + link->bandwidth, + link->bandwidth_trace, + link->latency, + link->latency_trace, + link->state, + link->state_trace, + link->policy, + link->properties); } current_property_set = NULL; @@ -870,10 +887,11 @@ static void ptask_model_init_internal(void) ptask_maxmin_system = lmm_system_new(); routing_model_create(sizeof(link_L07_t), - ptask_link_create_resource(xbt_strdup("__loopback__"), - 498000000, NULL, 0.000015, NULL, - SURF_RESOURCE_ON, NULL, - SURF_LINK_FATPIPE, NULL), + ptask_link_create_resource(xbt_strdup("__loopback__"), + 498000000, NULL, + 0.000015, NULL, + SURF_RESOURCE_ON, NULL, + SURF_LINK_FATPIPE, NULL), ptask_get_link_latency); } -- 2.20.1