From 4c326c3ead872860a1ee05f216174ba56cae6e71 Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 28 Sep 2010 08:53:13 +0000 Subject: [PATCH] Tag cluster test git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8259 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/surf/surf_routing.c | 131 +++++++++++++----- .../simdag/platforms/basic_parsing_test.c | 3 + teshsuite/simdag/platforms/one_cluster.xml | 6 +- 3 files changed, 104 insertions(+), 36 deletions(-) diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 2ec08725e7..f11c89b45f 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -2206,6 +2206,9 @@ static void routing_full_parse_Scluster(void) static int AX_ptr = 0; static int surfxml_bufferstack_size = 2048; + /* allocating memory for the buffer, I think 2kB should be enough */ + surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size); + DEBUG4("id='%s' prefix='%s' suffix='%s' radical='%s'", cluster_id,cluster_prefix,cluster_suffix,cluster_radical); DEBUG5("power='%s' bw='%s' lat='%s' bb_bw='%s' bb_lat='%s'", @@ -2227,16 +2230,31 @@ static void routing_full_parse_Scluster(void) host_id = bprintf("%s%d%s", cluster_prefix, start, cluster_suffix); link_id = bprintf("%s_link_%d", cluster_id, start); - DEBUG2("\t",host_id,cluster_power); + DEBUG2("",host_id,cluster_power); + SURFXML_BUFFER_RESET(); SURFXML_BUFFER_SET(host_id, host_id); SURFXML_BUFFER_SET(host_power, cluster_power); + SURFXML_BUFFER_SET(host_availability, "1.0"); + SURFXML_BUFFER_SET(host_availability_file, ""); + A_surfxml_host_state = A_surfxml_host_state_ON; + SURFXML_BUFFER_SET(host_state_file, ""); + SURFXML_BUFFER_SET(host_interference_send, "1.0"); + SURFXML_BUFFER_SET(host_interference_recv, "1.0"); + SURFXML_BUFFER_SET(host_interference_send_recv, "1.0"); + SURFXML_BUFFER_SET(host_max_outgoing_rate, "-1.0"); SURFXML_START_TAG(host); SURFXML_END_TAG(host); - DEBUG3("\t",link_id,cluster_bw,cluster_lat); + DEBUG3("",link_id,cluster_bw,cluster_lat); + SURFXML_BUFFER_RESET(); SURFXML_BUFFER_SET(link_id, link_id); SURFXML_BUFFER_SET(link_bandwidth, cluster_bw); SURFXML_BUFFER_SET(link_latency, cluster_lat); + SURFXML_BUFFER_SET(link_bandwidth_file, ""); + SURFXML_BUFFER_SET(link_latency_file, ""); + A_surfxml_link_state = A_surfxml_link_state_ON; + SURFXML_BUFFER_SET(link_state_file, ""); + A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; SURFXML_START_TAG(link); SURFXML_END_TAG(link); @@ -2251,16 +2269,31 @@ static void routing_full_parse_Scluster(void) host_id = bprintf("%s%d%s", cluster_prefix, i, cluster_suffix); link_id = bprintf("%s_link_%d", cluster_id, i); - DEBUG2("\t",host_id,cluster_power); + DEBUG2("",host_id,cluster_power); + SURFXML_BUFFER_RESET(); SURFXML_BUFFER_SET(host_id, host_id); SURFXML_BUFFER_SET(host_power, cluster_power); + SURFXML_BUFFER_SET(host_availability, "1.0"); + SURFXML_BUFFER_SET(host_availability_file, ""); + A_surfxml_host_state = A_surfxml_host_state_ON; + SURFXML_BUFFER_SET(host_state_file, ""); + SURFXML_BUFFER_SET(host_interference_send, "1.0"); + SURFXML_BUFFER_SET(host_interference_recv, "1.0"); + SURFXML_BUFFER_SET(host_interference_send_recv, "1.0"); + SURFXML_BUFFER_SET(host_max_outgoing_rate, "-1.0"); SURFXML_START_TAG(host); SURFXML_END_TAG(host); - DEBUG3("\t",link_id,cluster_bw,cluster_lat); + DEBUG3("",link_id,cluster_bw,cluster_lat); + SURFXML_BUFFER_RESET(); SURFXML_BUFFER_SET(link_id, link_id); SURFXML_BUFFER_SET(link_bandwidth, cluster_bw); SURFXML_BUFFER_SET(link_latency, cluster_lat); + SURFXML_BUFFER_SET(link_bandwidth_file, ""); + SURFXML_BUFFER_SET(link_latency_file, ""); + A_surfxml_link_state = A_surfxml_link_state_ON; + SURFXML_BUFFER_SET(link_state_file, ""); + A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; SURFXML_START_TAG(link); SURFXML_END_TAG(link); } @@ -2274,13 +2307,41 @@ static void routing_full_parse_Scluster(void) } DEBUG0(" "); - router_id = bprintf("%s.router%s",cluster_prefix,cluster_suffix); + router_id = bprintf("%srouter%s",cluster_prefix,cluster_suffix); link_router = bprintf("%s_link_router",cluster_id); link_backbone = bprintf("%s_backbone",cluster_id); - DEBUG1("\t",router_id); - DEBUG3("\t",link_router,cluster_bw,cluster_lat); - DEBUG3("\t",link_backbone,cluster_bb_bw,cluster_bb_lat); + DEBUG1("",router_id); + SURFXML_BUFFER_RESET(); + SURFXML_BUFFER_SET(router_id, router_id);; + SURFXML_START_TAG(router); + SURFXML_END_TAG(router); + + DEBUG3("",link_router,cluster_bw,cluster_lat); + SURFXML_BUFFER_RESET(); + SURFXML_BUFFER_SET(link_id, link_router); + SURFXML_BUFFER_SET(link_bandwidth, cluster_bw); + SURFXML_BUFFER_SET(link_latency, cluster_lat); + SURFXML_BUFFER_SET(link_bandwidth_file, ""); + SURFXML_BUFFER_SET(link_latency_file, ""); + A_surfxml_link_state = A_surfxml_link_state_ON; + SURFXML_BUFFER_SET(link_state_file, ""); + A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; + SURFXML_START_TAG(link); + SURFXML_END_TAG(link); + + DEBUG3("",link_backbone,cluster_bb_bw,cluster_bb_lat); + SURFXML_BUFFER_RESET(); + SURFXML_BUFFER_SET(link_id, link_backbone); + SURFXML_BUFFER_SET(link_bandwidth, cluster_bb_bw); + SURFXML_BUFFER_SET(link_latency, cluster_bb_lat); + SURFXML_BUFFER_SET(link_bandwidth_file, ""); + SURFXML_BUFFER_SET(link_latency_file, ""); + A_surfxml_link_state = A_surfxml_link_state_ON; + SURFXML_BUFFER_SET(link_state_file, ""); + A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; + SURFXML_START_TAG(link); + SURFXML_END_TAG(link); char *new_suffix = bprintf("%s",""); @@ -2295,33 +2356,35 @@ static void routing_full_parse_Scluster(void) route_src_dst = bprintf("%s(.*)%s",cluster_prefix,new_suffix); DEBUG0(" "); - DEBUG2("\t",route_src_dst,route_src_dst); - DEBUG1("\t",cluster_id); - DEBUG1("\t",cluster_id); - DEBUG1("\t",cluster_id); - DEBUG0("\t"); + + DEBUG2("",route_src_dst,route_src_dst); + SURFXML_BUFFER_RESET(); + SURFXML_BUFFER_SET(route_src, route_src_dst); + SURFXML_BUFFER_SET(route_dst, route_src_dst); + SURFXML_START_TAG(route); + + DEBUG1("",cluster_id); + SURFXML_BUFFER_RESET(); + SURFXML_BUFFER_SET(link_c_ctn_id, bprintf("%s_link_$src1",cluster_id)); + SURFXML_START_TAG(link_c_ctn); + SURFXML_END_TAG(link_c_ctn); + + DEBUG1("",cluster_id); + SURFXML_BUFFER_RESET(); + SURFXML_BUFFER_SET(link_c_ctn_id, bprintf("%s_backbone",cluster_id)); + SURFXML_START_TAG(link_c_ctn); + SURFXML_END_TAG(link_c_ctn); + + DEBUG1("",cluster_id); + SURFXML_BUFFER_RESET(); + SURFXML_BUFFER_SET(link_c_ctn_id, bprintf("%s_link_$dst1",cluster_id)); + SURFXML_START_TAG(link_c_ctn); + SURFXML_END_TAG(link_c_ctn); + + DEBUG0(""); + SURFXML_END_TAG(route); + DEBUG0(""); SURFXML_END_TAG(AS); -// -// /* */ -// SURFXML_BUFFER_SET(link_id, "LinkA"); -// SURFXML_BUFFER_SET(link_bandwidth, "10000000.0"); -// SURFXML_BUFFER_SET(link_bandwidth_file, ""); -// SURFXML_BUFFER_SET(link_latency, "0.2"); -// SURFXML_BUFFER_SET(link_latency_file, ""); -// A_surfxml_link_state = A_surfxml_link_state_ON; -// SURFXML_BUFFER_SET(link_state_file, ""); -// A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; -// SURFXML_START_TAG(link); -// SURFXML_END_TAG(link); -// -// /* */ -// // OLD THINGS COMMENTED -// // SURFXML_BUFFER_SET(route_src, "host A"); -// // SURFXML_BUFFER_SET(route_dst, "host B"); -// // SURFXML_BUFFER_SET(route_impact_on_src, "0.0"); -// // SURFXML_BUFFER_SET(route_impact_on_dst, "0.0"); -// // SURFXML_BUFFER_SET(route_impact_on_src_with_other_recv, "0.0"); -// // SURFXML_BUFFER_SET(route_impact_on_dst_with_other_send, "0.0"); } diff --git a/teshsuite/simdag/platforms/basic_parsing_test.c b/teshsuite/simdag/platforms/basic_parsing_test.c index 20d05671f8..afce3b9b70 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test.c +++ b/teshsuite/simdag/platforms/basic_parsing_test.c @@ -16,6 +16,9 @@ int main(int argc, char **argv) /* creation of the environment */ SD_create_environment(argv[1]); + printf("\n\nWorkstation number: %d, link number: %d\n\n", + SD_workstation_get_number(), SD_link_get_number()); + SD_exit(); return 0; } diff --git a/teshsuite/simdag/platforms/one_cluster.xml b/teshsuite/simdag/platforms/one_cluster.xml index 6640a17123..3581df4c5b 100644 --- a/teshsuite/simdag/platforms/one_cluster.xml +++ b/teshsuite/simdag/platforms/one_cluster.xml @@ -1,7 +1,9 @@ + + radical="0,2-4,6" power="1000000000.00" bw="125000000.00" lat="5e-5" + bb_bw="2250000000.00" bb_lat="5e-4"/> + -- 2.20.1