X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/976ee462f4626798ebf76ca46d13f53e10e0e28d..b8d94aa8700e80d14f0092b7beeefff64f1d17f2:/src/surf/surfxml_parse.c diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 9d04dea92e..0bd48084a6 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -1,6 +1,5 @@ -/* $Id$ */ - -/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ +/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -12,8 +11,6 @@ #include "surf/surfxml_parse_private.h" #include "surf/surf_private.h" -#define NO_IMPLICIT_ROUTES - XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module"); #undef CLEANUP @@ -29,7 +26,7 @@ xbt_dict_t trace_connect_list_link_avail = NULL; xbt_dict_t trace_connect_list_bandwidth = NULL; xbt_dict_t trace_connect_list_latency = NULL; -/* This buffer is used to store the original buffer before substituing it by out own buffer. Usefull for the foreach tag */ +/* This buffer is used to store the original buffer before substituing it by out own buffer. Use full for the foreach tag */ static xbt_dynar_t surfxml_bufferstack_stack = NULL; int surfxml_bufferstack_size = 2048; static char *old_buff = NULL; @@ -58,9 +55,7 @@ void surfxml_bufferstack_pop(int new) /* Stores the set name reffered to by the foreach tag */ static char *foreach_set_name; static xbt_dynar_t main_STag_surfxml_host_cb_list = NULL; -static xbt_dynar_t main_ETag_surfxml_host_cb_list = NULL; static xbt_dynar_t main_STag_surfxml_link_cb_list = NULL; -static xbt_dynar_t main_ETag_surfxml_link_cb_list = NULL; /* make sure these symbols are defined as strong ones in this file so that the linked can resolve them */ xbt_dynar_t STag_surfxml_platform_cb_list = NULL; @@ -85,16 +80,22 @@ xbt_dynar_t STag_surfxml_set_cb_list = NULL; xbt_dynar_t ETag_surfxml_set_cb_list = NULL; xbt_dynar_t STag_surfxml_foreach_cb_list = NULL; xbt_dynar_t ETag_surfxml_foreach_cb_list = NULL; -xbt_dynar_t STag_surfxml_route_c_multi_cb_list = NULL; -xbt_dynar_t ETag_surfxml_route_c_multi_cb_list = NULL; -xbt_dynar_t STag_surfxml_cluster_cb_list = NULL; -xbt_dynar_t ETag_surfxml_cluster_cb_list = NULL; +// xbt_dynar_t STag_surfxml_route_c_multi_cb_list = NULL; +// xbt_dynar_t ETag_surfxml_route_c_multi_cb_list = NULL; +// xbt_dynar_t STag_surfxml_cluster_cb_list = NULL; +// xbt_dynar_t ETag_surfxml_cluster_cb_list = NULL; xbt_dynar_t STag_surfxml_trace_cb_list = NULL; xbt_dynar_t ETag_surfxml_trace_cb_list = NULL; xbt_dynar_t STag_surfxml_trace_c_connect_cb_list = NULL; xbt_dynar_t ETag_surfxml_trace_c_connect_cb_list = NULL; xbt_dynar_t STag_surfxml_random_cb_list = NULL; xbt_dynar_t ETag_surfxml_random_cb_list = NULL; +xbt_dynar_t STag_surfxml_AS_cb_list = NULL; // addded by david +xbt_dynar_t ETag_surfxml_AS_cb_list = NULL; // addded by david +xbt_dynar_t STag_surfxml_ASroute_cb_list = NULL; // addded by david +xbt_dynar_t ETag_surfxml_ASroute_cb_list = NULL; // addded by david +xbt_dynar_t STag_surfxml_bypassRoute_cb_list = NULL; // addded by david +xbt_dynar_t ETag_surfxml_bypassRoute_cb_list = NULL; // addded by david /* Stores the sets defined in the XML */ xbt_dict_t set_list = NULL; @@ -103,8 +104,8 @@ xbt_dict_t current_property_set = NULL; /* For the route:multi tag */ xbt_dict_t route_table = NULL; -xbt_dict_t route_multi_table = NULL; -xbt_dynar_t route_multi_elements = NULL; +// xbt_dict_t route_multi_table = NULL; +// xbt_dynar_t route_multi_elements = NULL; static xbt_dynar_t route_link_list = NULL; xbt_dynar_t links = NULL; xbt_dynar_t keys = NULL; @@ -119,15 +120,15 @@ static XBT_INLINE void surfxml_call_cb_functions(xbt_dynar_t); YY_BUFFER_STATE surf_input_buffer; FILE *surf_file_to_parse = NULL; -static void convert_route_multi_to_routes(void); -static void parse_route_elem(void); -static void parse_foreach(void); +// static void convert_route_multi_to_routes(void); +// static void parse_route_elem(void); +static void parse_Stag_foreach(void); static void parse_sets(void); -static void parse_route_multi_set_endpoints(void); -static void parse_route_multi_set_route(void); -static void parse_trace_init(void); -static void parse_trace_finalize(void); -static void parse_trace_c_connect(void); +// static void parse_Stag_route_multi(void); +// static void parse_Etag_route_multi(void); +static void parse_Stag_trace(void); +static void parse_Etag_trace(void); +static void parse_Stag_trace_c_connect(void); static void init_randomness(void); static void add_randomness(void); @@ -155,16 +156,22 @@ void surf_parse_free_callbacks(void) xbt_dynar_free(&ETag_surfxml_set_cb_list); xbt_dynar_free(&STag_surfxml_foreach_cb_list); xbt_dynar_free(&ETag_surfxml_foreach_cb_list); - xbt_dynar_free(&STag_surfxml_route_c_multi_cb_list); - xbt_dynar_free(&ETag_surfxml_route_c_multi_cb_list); - xbt_dynar_free(&STag_surfxml_cluster_cb_list); - xbt_dynar_free(&ETag_surfxml_cluster_cb_list); +// xbt_dynar_free(&STag_surfxml_route_c_multi_cb_list); +// xbt_dynar_free(&ETag_surfxml_route_c_multi_cb_list); +// xbt_dynar_free(&STag_surfxml_cluster_cb_list); +// xbt_dynar_free(&ETag_surfxml_cluster_cb_list); xbt_dynar_free(&STag_surfxml_trace_cb_list); xbt_dynar_free(&ETag_surfxml_trace_cb_list); xbt_dynar_free(&STag_surfxml_trace_c_connect_cb_list); xbt_dynar_free(&ETag_surfxml_trace_c_connect_cb_list); xbt_dynar_free(&STag_surfxml_random_cb_list); xbt_dynar_free(&ETag_surfxml_random_cb_list); + xbt_dynar_free(&STag_surfxml_AS_cb_list); // addded by david + xbt_dynar_free(&ETag_surfxml_AS_cb_list); // addded by david + xbt_dynar_free(&STag_surfxml_ASroute_cb_list); // addded by david + xbt_dynar_free(&ETag_surfxml_ASroute_cb_list); // addded by david + xbt_dynar_free(&STag_surfxml_bypassRoute_cb_list); // addded by david + xbt_dynar_free(&ETag_surfxml_bypassRoute_cb_list); // addded by david } void surf_parse_reset_parser(void) @@ -194,12 +201,12 @@ void surf_parse_reset_parser(void) ETag_surfxml_set_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); STag_surfxml_foreach_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); ETag_surfxml_foreach_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_route_c_multi_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_route_c_multi_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_cluster_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_cluster_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); +// STag_surfxml_route_c_multi_cb_list = +// xbt_dynar_new(sizeof(void_f_void_t), NULL); +// ETag_surfxml_route_c_multi_cb_list = +// xbt_dynar_new(sizeof(void_f_void_t), NULL); +// STag_surfxml_cluster_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); +// ETag_surfxml_cluster_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); STag_surfxml_trace_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); ETag_surfxml_trace_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); STag_surfxml_trace_c_connect_cb_list = @@ -208,6 +215,12 @@ void surf_parse_reset_parser(void) xbt_dynar_new(sizeof(void_f_void_t), NULL); STag_surfxml_random_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); ETag_surfxml_random_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); + STag_surfxml_AS_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); // addded by david + ETag_surfxml_AS_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); // addded by david + STag_surfxml_ASroute_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); // addded by david + ETag_surfxml_ASroute_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); // addded by david + STag_surfxml_bypassRoute_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); // addded by david + ETag_surfxml_bypassRoute_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); // addded by david } void STag_surfxml_include(void) @@ -264,7 +277,7 @@ void STag_surfxml_platform(void) void ETag_surfxml_platform(void) { - convert_route_multi_to_routes(); +// convert_route_multi_to_routes(); surfxml_call_cb_functions(ETag_surfxml_platform_cb_list); @@ -274,6 +287,7 @@ void ETag_surfxml_platform(void) void STag_surfxml_host(void) { surfxml_call_cb_functions(STag_surfxml_host_cb_list); + } void ETag_surfxml_host(void) @@ -374,39 +388,32 @@ void ETag_surfxml_foreach(void) /* free the temporary dynar and restore original */ xbt_dynar_free(&STag_surfxml_host_cb_list); - xbt_dynar_free(&ETag_surfxml_host_cb_list); - STag_surfxml_host_cb_list = main_STag_surfxml_host_cb_list; - ETag_surfxml_host_cb_list = main_ETag_surfxml_host_cb_list; /* free the temporary dynar and restore original */ xbt_dynar_free(&STag_surfxml_link_cb_list); - xbt_dynar_free(&ETag_surfxml_link_cb_list); - STag_surfxml_link_cb_list = main_STag_surfxml_link_cb_list; - ETag_surfxml_link_cb_list = main_ETag_surfxml_link_cb_list; - -} - -void STag_surfxml_route_c_multi(void) -{ - surfxml_call_cb_functions(STag_surfxml_route_c_multi_cb_list); -} - -void ETag_surfxml_route_c_multi(void) -{ - surfxml_call_cb_functions(ETag_surfxml_route_c_multi_cb_list); -} - -void STag_surfxml_cluster(void) -{ - surfxml_call_cb_functions(STag_surfxml_cluster_cb_list); } -void ETag_surfxml_cluster(void) -{ - surfxml_call_cb_functions(ETag_surfxml_cluster_cb_list); -} +// void STag_surfxml_route_c_multi(void) +// { +// surfxml_call_cb_functions(STag_surfxml_route_c_multi_cb_list); +// } +// +// void ETag_surfxml_route_c_multi(void) +// { +// surfxml_call_cb_functions(ETag_surfxml_route_c_multi_cb_list); +// } +// +// void STag_surfxml_cluster(void) +// { +// surfxml_call_cb_functions(STag_surfxml_cluster_cb_list); +// } +// +// void ETag_surfxml_cluster(void) +// { +// surfxml_call_cb_functions(ETag_surfxml_cluster_cb_list); +// } void STag_surfxml_trace(void) { @@ -438,6 +445,36 @@ void ETag_surfxml_random(void) surfxml_call_cb_functions(ETag_surfxml_random_cb_list); } +void STag_surfxml_AS(void) // addded by david +{ + surfxml_call_cb_functions(STag_surfxml_AS_cb_list); +} + +void ETag_surfxml_AS(void) // addded by david +{ + surfxml_call_cb_functions(ETag_surfxml_AS_cb_list); +} + +void STag_surfxml_ASroute(void) // addded by david +{ + surfxml_call_cb_functions(STag_surfxml_ASroute_cb_list); +} + +void ETag_surfxml_ASroute(void) // addded by david +{ + surfxml_call_cb_functions(ETag_surfxml_ASroute_cb_list); +} + +void STag_surfxml_bypassRoute(void) // addded by david +{ + surfxml_call_cb_functions(STag_surfxml_bypassRoute_cb_list); +} + +void ETag_surfxml_bypassRoute(void) // addded by david +{ + surfxml_call_cb_functions(ETag_surfxml_bypassRoute_cb_list); +} + void surf_parse_open(const char *file) { static int warned = 0; /* warn only once */ @@ -449,13 +486,14 @@ void surf_parse_open(const char *file) } return; } + surf_file_to_parse = surf_fopen(file, "r"); + xbt_assert1((surf_file_to_parse), "Unable to open \"%s\"\n", file); + if (!surf_input_buffer_stack) surf_input_buffer_stack = xbt_dynar_new(sizeof(YY_BUFFER_STATE), NULL); if (!surf_file_to_parse_stack) surf_file_to_parse_stack = xbt_dynar_new(sizeof(FILE *), NULL); - surf_file_to_parse = surf_fopen(file, "r"); - xbt_assert1((surf_file_to_parse), "Unable to open \"%s\"\n", file); surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, 10); surf_parse__switch_to_buffer(surf_input_buffer); surf_parse_lineno = 1; @@ -474,7 +512,6 @@ void surf_parse_close(void) } } - static int _surf_parse(void) { return surf_parse_lex(); @@ -523,12 +560,24 @@ void surfxml_add_callback(xbt_dynar_t cb_list, void_f_void_t function) xbt_dynar_push(cb_list, &function); } +void surfxml_del_callback(xbt_dynar_t* p_cb_list, void_f_void_t function) +{ + xbt_dynar_t new_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); + unsigned int it; + void_f_void_t func; + xbt_dynar_foreach(*p_cb_list,it,func) { + if( func != function ) + xbt_dynar_push(new_cb_list, &func); + } + xbt_dynar_free(p_cb_list); + *p_cb_list = new_cb_list; +} + static XBT_INLINE void surfxml_call_cb_functions(xbt_dynar_t cb_list) { unsigned int iterator; void_f_void_t fun; xbt_dynar_foreach(cb_list, iterator, fun) { - DEBUG2("call %p %p", fun, *fun); (*fun) (); } } @@ -546,8 +595,8 @@ static void init_data(void) if (!surfxml_bufferstack_stack) surfxml_bufferstack_stack = xbt_dynar_new(sizeof(char *), NULL); - route_multi_table = xbt_dict_new(); - route_multi_elements = xbt_dynar_new(sizeof(char *), NULL); +// route_multi_table = xbt_dict_new(); +// route_multi_elements = xbt_dynar_new(sizeof(char *), NULL); traces_set_list = xbt_dict_new(); if (set_list == NULL) set_list = xbt_dict_new(); @@ -559,22 +608,18 @@ static void init_data(void) trace_connect_list_latency = xbt_dict_new(); random_data_list = xbt_dict_new(); - surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties); - surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem); - surfxml_add_callback(STag_surfxml_route_cb_list, - &parse_route_set_endpoints); - surfxml_add_callback(STag_surfxml_set_cb_list, &parse_sets); - surfxml_add_callback(STag_surfxml_route_c_multi_cb_list, - &parse_route_multi_set_endpoints); - surfxml_add_callback(ETag_surfxml_route_c_multi_cb_list, - &parse_route_multi_set_route); - surfxml_add_callback(STag_surfxml_foreach_cb_list, &parse_foreach); - surfxml_add_callback(STag_surfxml_trace_cb_list, &parse_trace_init); - surfxml_add_callback(ETag_surfxml_trace_cb_list, &parse_trace_finalize); - surfxml_add_callback(STag_surfxml_trace_c_connect_cb_list, - &parse_trace_c_connect); - surfxml_add_callback(STag_surfxml_random_cb_list, &init_randomness); - surfxml_add_callback(ETag_surfxml_random_cb_list, &add_randomness); +// surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties); +// surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem); +// surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints); +// surfxml_add_callback(STag_surfxml_set_cb_list, &parse_sets); +// surfxml_add_callback(STag_surfxml_route_c_multi_cb_list, &parse_Stag_route_multi); +// surfxml_add_callback(ETag_surfxml_route_c_multi_cb_list, &parse_Etag_route_multi); +// surfxml_add_callback(STag_surfxml_foreach_cb_list, &parse_Stag_foreach); +// surfxml_add_callback(STag_surfxml_trace_cb_list, &parse_Stag_trace); +// surfxml_add_callback(ETag_surfxml_trace_cb_list, &parse_Etag_trace); +// surfxml_add_callback(STag_surfxml_trace_c_connect_cb_list, &parse_Stag_trace_c_connect); +// surfxml_add_callback(STag_surfxml_random_cb_list, &init_randomness); +// surfxml_add_callback(ETag_surfxml_random_cb_list, &add_randomness); } static void free_data(void) @@ -595,10 +640,10 @@ static void free_data(void) xbt_dict_free(&route_table); route_link_list = NULL; - xbt_dict_free(&route_multi_table); - - xbt_dynar_foreach(route_multi_elements, cpt, name) free(name); - xbt_dynar_free(&route_multi_elements); +// xbt_dict_free(&route_multi_table); +// +// xbt_dynar_foreach(route_multi_elements, cpt, name) free(name); +// xbt_dynar_free(&route_multi_elements); xbt_dict_foreach(set_list, cursor, key, data) { xbt_dynar_t set = (xbt_dynar_t) data; @@ -621,56 +666,28 @@ static void free_data(void) void parse_platform_file(const char *file) { + int parse_status; surf_parse_open(file); init_data(); - xbt_assert1((!(*surf_parse) ()), "Parse error in %s", file); + parse_status = surf_parse(); free_data(); surf_parse_close(); + if (parse_status) + xbt_dict_free(&random_data_list); + xbt_assert1(!parse_status, "Parse error in %s", file); } -/* Functions to bypass route, host and link tags. Used by the foreach and route:multi tags */ - -static void parse_make_temporary_route(const char *src, const char *dst, - int action) -{ - int AX_ptr = 0; - - A_surfxml_route_action = action; - SURFXML_BUFFER_SET(route_src, src); - SURFXML_BUFFER_SET(route_dst, dst); -} - -static void parse_change_cpu_data(const char *hostName, - const char *surfxml_host_power, - const char *surfxml_host_availability, - const char *surfxml_host_availability_file, - const char *surfxml_host_state_file) -{ - int AX_ptr = 0; - - SURFXML_BUFFER_SET(host_id, hostName); - SURFXML_BUFFER_SET(host_power, surfxml_host_power /*hostPower */ ); - SURFXML_BUFFER_SET(host_availability, surfxml_host_availability); - SURFXML_BUFFER_SET(host_availability_file, surfxml_host_availability_file); - SURFXML_BUFFER_SET(host_state_file, surfxml_host_state_file); -} +/* Functions to bypass route tag. Used by the route:multi tag */ -static void parse_change_link_data(const char *linkName, - const char *surfxml_link_bandwidth, - const char *surfxml_link_bandwidth_file, - const char *surfxml_link_latency, - const char *surfxml_link_latency_file, - const char *surfxml_link_state_file) -{ - int AX_ptr = 0; - - SURFXML_BUFFER_SET(link_id, linkName); - SURFXML_BUFFER_SET(link_bandwidth, surfxml_link_bandwidth); - SURFXML_BUFFER_SET(link_bandwidth_file, surfxml_link_bandwidth_file); - SURFXML_BUFFER_SET(link_latency, surfxml_link_latency); - SURFXML_BUFFER_SET(link_latency_file, surfxml_link_latency_file); - SURFXML_BUFFER_SET(link_state_file, surfxml_link_state_file); -} +// static void parse_make_temporary_route(const char *src, const char *dst, +// int action) +// { +// int AX_ptr = 0; +// +// A_surfxml_route_action = action; +// SURFXML_BUFFER_SET(route_src, src); +// SURFXML_BUFFER_SET(route_dst, dst); +// } /* Functions for the sets and foreach tags */ @@ -736,27 +753,19 @@ static void parse_sets(void) free(id); } -static const char *surfxml_host_power; -static const char *surfxml_host_availability; -static const char *surfxml_host_availability_file; -static const char *surfxml_host_state_file; - -static void parse_host_foreach(void) -{ - surfxml_host_power = A_surfxml_host_power; - surfxml_host_availability = A_surfxml_host_availability; - surfxml_host_availability_file = A_surfxml_host_availability_file; - surfxml_host_state_file = A_surfxml_host_state_file; -} +static void parse_host_foreach(void){ -static void finalize_host_foreach(void) -{ xbt_dynar_t names = NULL; unsigned int cpt = 0; char *name; xbt_dict_cursor_t cursor = NULL; char *key, *data; + const char *surfxml_host_power = A_surfxml_host_power; + const char *surfxml_host_availability = A_surfxml_host_availability; + const char *surfxml_host_availability_file = A_surfxml_host_availability_file; + const char *surfxml_host_state_file = A_surfxml_host_state_file; + xbt_dict_t cluster_host_props = current_property_set; names = xbt_dict_get_or_null(set_list, foreach_set_name); @@ -771,10 +780,16 @@ static void finalize_host_foreach(void) /* foreach name in set call the main host callback */ xbt_dynar_foreach(names, cpt, name) { + int AX_ptr = 0; /* needed by the SURFXML_BUFFER_SET macro */ + surfxml_bufferstack_push(1); - parse_change_cpu_data(name, surfxml_host_power, surfxml_host_availability, - surfxml_host_availability_file, - surfxml_host_state_file); + + SURFXML_BUFFER_SET(host_id, name); + SURFXML_BUFFER_SET(host_power, surfxml_host_power /*hostPower */ ); + SURFXML_BUFFER_SET(host_availability, surfxml_host_availability); + SURFXML_BUFFER_SET(host_availability_file, surfxml_host_availability_file); + SURFXML_BUFFER_SET(host_state_file, surfxml_host_state_file); + surfxml_call_cb_functions(main_STag_surfxml_host_cb_list); xbt_dict_foreach(cluster_host_props, cursor, key, data) { @@ -782,7 +797,8 @@ static void finalize_host_foreach(void) free); } - surfxml_call_cb_functions(main_ETag_surfxml_host_cb_list); + /* Call the (unmodified) callbacks of , if any */ + surfxml_call_cb_functions(ETag_surfxml_host_cb_list); surfxml_bufferstack_pop(1); } @@ -791,23 +807,13 @@ static void finalize_host_foreach(void) surfxml_bufferstack_pop(0); } -static const char *surfxml_link_bandwidth; -static const char *surfxml_link_bandwidth_file; -static const char *surfxml_link_latency; -static const char *surfxml_link_latency_file; -static const char *surfxml_link_state_file; - -static void parse_link_foreach(void) -{ - surfxml_link_bandwidth = A_surfxml_link_bandwidth; - surfxml_link_bandwidth_file = A_surfxml_link_bandwidth_file; - surfxml_link_latency = A_surfxml_link_latency; - surfxml_link_latency_file = A_surfxml_link_latency_file; - surfxml_link_state_file = A_surfxml_link_state_file; -} +static void parse_link_foreach(void) { + const char *surfxml_link_bandwidth = A_surfxml_link_bandwidth; + const char *surfxml_link_bandwidth_file = A_surfxml_link_bandwidth_file; + const char *surfxml_link_latency = A_surfxml_link_latency; + const char *surfxml_link_latency_file = A_surfxml_link_latency_file; + const char *surfxml_link_state_file = A_surfxml_link_state_file; -static void finalize_link_foreach(void) -{ xbt_dynar_t names = NULL; unsigned int cpt = 0; char *name; @@ -827,11 +833,17 @@ static void finalize_link_foreach(void) /* for each name in set call the main link callback */ xbt_dynar_foreach(names, cpt, name) { + int AX_ptr = 0; /* needed by the SURFXML_BUFFER_SET */ + surfxml_bufferstack_push(1); - parse_change_link_data(name, surfxml_link_bandwidth, - surfxml_link_bandwidth_file, surfxml_link_latency, - surfxml_link_latency_file, - surfxml_link_state_file); + + SURFXML_BUFFER_SET(link_id, name); + SURFXML_BUFFER_SET(link_bandwidth, surfxml_link_bandwidth); + SURFXML_BUFFER_SET(link_bandwidth_file, surfxml_link_bandwidth_file); + SURFXML_BUFFER_SET(link_latency, surfxml_link_latency); + SURFXML_BUFFER_SET(link_latency_file, surfxml_link_latency_file); + SURFXML_BUFFER_SET(link_state_file, surfxml_link_state_file); + surfxml_call_cb_functions(main_STag_surfxml_link_cb_list); xbt_dict_foreach(cluster_link_props, cursor, key, data) { @@ -839,7 +851,8 @@ static void finalize_link_foreach(void) free); } - surfxml_call_cb_functions(main_ETag_surfxml_link_cb_list); + /* Call the (unmodified) callbacks of , if any */ + surfxml_call_cb_functions(ETag_surfxml_link_cb_list); surfxml_bufferstack_pop(1); } @@ -850,24 +863,18 @@ static void finalize_link_foreach(void) foreach_set_name = NULL; } -static void parse_foreach(void) +static void parse_Stag_foreach(void) { /* save the host & link callbacks */ main_STag_surfxml_host_cb_list = STag_surfxml_host_cb_list; - main_ETag_surfxml_host_cb_list = ETag_surfxml_host_cb_list; main_STag_surfxml_link_cb_list = STag_surfxml_link_cb_list; - main_ETag_surfxml_link_cb_list = ETag_surfxml_link_cb_list; - /* define host & link callbacks to be used only by the foreach tag */ + /* redefine host & link callbacks to be used only by the foreach tag */ STag_surfxml_host_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_host_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); STag_surfxml_link_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_link_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); surfxml_add_callback(STag_surfxml_host_cb_list, &parse_host_foreach); - surfxml_add_callback(ETag_surfxml_host_cb_list, &finalize_host_foreach); surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_foreach); - surfxml_add_callback(ETag_surfxml_link_cb_list, &finalize_link_foreach); /* get set name */ foreach_set_name = xbt_strdup(A_surfxml_foreach_set_id); @@ -875,248 +882,243 @@ static void parse_foreach(void) /* Route:multi functions */ -static int route_multi_size = 0; -static char *src_name, *dst_name; -static int is_symmetric_route; - -static void parse_route_elem(void) -{ - char *val; - - val = xbt_strdup(A_surfxml_link_c_ctn_id); - - xbt_dynar_push(route_link_list, &val); -} - -static void parse_route_multi_set_endpoints(void) -{ - src_name = xbt_strdup(A_surfxml_route_c_multi_src); - dst_name = xbt_strdup(A_surfxml_route_c_multi_dst); - route_action = A_surfxml_route_c_multi_action; - is_symmetric_route = A_surfxml_route_c_multi_symmetric; - route_multi_size++; - - route_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); -} - -static int contains(xbt_dynar_t list, const char *value) -{ - unsigned int cpt; - char *val; - xbt_dynar_foreach(list, cpt, val) { - if (strcmp(val, value) == 0) - return 1; - } - return 0; -} +// static int route_multi_size = 0; +// static char *src_name, *dst_name; +// static int is_symmetric_route; + +// static void parse_route_elem(void) +// { +// char *val; +// +// val = xbt_strdup(A_surfxml_link_c_ctn_id); +// +// xbt_dynar_push(route_link_list, &val); +// //INFO2("Push %s (size now:%ld)",val,xbt_dynar_length(route_link_list)); +// } + +// static void parse_Stag_route_multi(void) +// { +// src_name = xbt_strdup(A_surfxml_route_c_multi_src); +// dst_name = xbt_strdup(A_surfxml_route_c_multi_dst); +// route_action = A_surfxml_route_c_multi_action; +// is_symmetric_route = A_surfxml_route_c_multi_symmetric; +// route_multi_size++; +// +// route_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); +// } /* This function is used to append or override the contents of an already existing route in the case a new one with its name is found. The decision is based upon the value of action specified in the xml route:multi attribute action */ -void manage_route(xbt_dict_t routing_table, const char *route_name, - int action, int isMultiRoute) -{ - unsigned int cpt; - xbt_dynar_t links; - char *value; - - /* get already existing list if it exists */ - links = xbt_dict_get_or_null(routing_table, route_name); - DEBUG1("ROUTE: %s", route_name); - if (links != NULL) { - switch (action) { - case A_surfxml_route_action_PREPEND: /* add existing links at the end; route_link_list + links */ - xbt_dynar_foreach(links, cpt, value) { - xbt_dynar_push(route_link_list, &value); - } - xbt_dynar_free(&links); - break; - case A_surfxml_route_action_POSTPEND: /* add existing links in front; links + route_link_list */ - xbt_dynar_foreach(route_link_list, cpt, value) { - xbt_dynar_push(links, &value); - } - xbt_dynar_free(&route_link_list); - route_link_list = links; - break; - case A_surfxml_route_action_OVERRIDE: - xbt_dynar_free(&links); - break; - default: - break; - } - } - /* this is the final route; do not add if name is a set; add only if name is in set list */ - if (!isMultiRoute) { - xbt_dict_set(routing_table, route_name, route_link_list, NULL); - } -} - -static void parse_route_multi_set_route(void) -{ - char *route_name; - - route_name = - bprintf("%s#%s#%d#%d#%d", src_name, dst_name, route_action, - is_symmetric_route, route_multi_size); - - xbt_dynar_push(route_multi_elements, &route_name); - - /* Add route */ - xbt_dict_set(route_multi_table, route_name, route_link_list, NULL); - /* add symmetric if it is the case */ - if (is_symmetric_route == 1) { - char *symmetric_name = - bprintf("%s#%s#%d#%d#%d", dst_name, src_name, route_action, - !is_symmetric_route, route_multi_size); - - xbt_dict_set(route_multi_table, symmetric_name, route_link_list, NULL); - xbt_dynar_push(route_multi_elements, &symmetric_name); - is_symmetric_route = 0; - } - free(src_name); - free(dst_name); -} - -static void add_multi_links(const char *src, const char *dst, - xbt_dynar_t links, const char *src_name, - const char *dst_name) -{ - unsigned int cpt; - char *value, *val; - - surfxml_bufferstack_push(1); - - parse_make_temporary_route(src_name, dst_name, route_action); - surfxml_call_cb_functions(STag_surfxml_route_cb_list); - DEBUG2("\tADDING ROUTE: %s -> %s", src_name, dst_name); - /* Build link list */ - xbt_dynar_foreach(links, cpt, value) { - if (strcmp(value, src) == 0) - val = xbt_strdup(src_name); - else if (strcmp(value, dst) == 0) - val = xbt_strdup(dst_name); - else if (strcmp(value, "$dst") == 0) - val = xbt_strdup(dst_name); - else if (strcmp(value, "$src") == 0) - val = xbt_strdup(src_name); - else - val = xbt_strdup(value); - DEBUG1("\t\tELEMENT: %s", val); - xbt_dynar_push(route_link_list, &val); - } - surfxml_call_cb_functions(ETag_surfxml_route_cb_list); - surfxml_bufferstack_pop(1); -} - -static void convert_route_multi_to_routes(void) -{ - xbt_dict_cursor_t cursor_w; - int symmetric; - unsigned int cpt, cpt2, cursor; - char *src_host_name, *dst_host_name, *key, *src, *dst, *val, *key_w, - *data_w; - const char *sep = "#"; - xbt_dict_t set = NULL; - xbt_dynar_t src_names = NULL, dst_names = NULL, links; - - if (!route_multi_elements) - return; - - if (surf_cpu_model) - set = surf_model_resource_set(surf_cpu_model); - if (surf_workstation_model != NULL && - surf_model_resource_set(surf_workstation_model) != NULL && - xbt_dict_length(surf_model_resource_set(surf_workstation_model)) > 0) - set = surf_model_resource_set(surf_workstation_model); - - - surfxml_bufferstack_push(0); - /* Get all routes in the exact order they were entered in the platform file */ - xbt_dynar_foreach(route_multi_elements, cursor, key) { - /* Get links for the route */ - links = (xbt_dynar_t) xbt_dict_get_or_null(route_multi_table, key); - keys = xbt_str_split_str(key, sep); - /* Get route ends */ - src = xbt_dynar_get_as(keys, 0, char *); - dst = xbt_dynar_get_as(keys, 1, char *); - route_action = atoi(xbt_dynar_get_as(keys, 2, char *)); - symmetric = atoi(xbt_dynar_get_as(keys, 3, char *)); - - /* Create the dynar of src and dst hosts for the new routes */ - /* NOTE: src and dst can be either set names or simple host names */ - src_names = (xbt_dynar_t) xbt_dict_get_or_null(set_list, src); - dst_names = (xbt_dynar_t) xbt_dict_get_or_null(set_list, dst); - /* Add to dynar even if they are simple names */ - if (src_names == NULL) { - src_names = xbt_dynar_new(sizeof(char *), &xbt_free_ref); - val = xbt_strdup(src); - xbt_dynar_push(src_names, &val); - if (strcmp(val, "$*") != 0 && NULL == xbt_dict_get_or_null(set, val)) - THROW3(unknown_error, 0, - "(In route:multi (%s -> %s) source %s does not exist (not a set or a host)", - src, dst, src); - } - if (dst_names == NULL) { - dst_names = xbt_dynar_new(sizeof(char *), &xbt_free_ref); - val = xbt_strdup(dst); - if (strcmp(val, "$*") != 0 && NULL == xbt_dict_get_or_null(set, val)) - THROW3(unknown_error, 0, - "(In route:multi (%s -> %s) destination %s does not exist (not a set or a host)", - src, dst, dst); - xbt_dynar_push(dst_names, &val); - } - - /* Build the routes */ - DEBUG2("ADDING MULTI ROUTE: %s -> %s", xbt_dynar_get_as(keys, 0, char *), - xbt_dynar_get_as(keys, 1, char *)); - xbt_dynar_foreach(src_names, cpt, src_host_name) { - xbt_dynar_foreach(dst_names, cpt2, dst_host_name) { - /* If dst is $* then set this route to have its dst point to all hosts */ - if (strcmp(src_host_name, "$*") != 0 - && strcmp(dst_host_name, "$*") == 0) { - xbt_dict_foreach(set, cursor_w, key_w, data_w) { - //int n = xbt_dynar_member(src_names, (char*)key_w); - add_multi_links(src, dst, links, src_host_name, key_w); - } - } - /* If src is $* then set this route to have its dst point to all hosts */ - if (strcmp(src_host_name, "$*") == 0 - && strcmp(dst_host_name, "$*") != 0) { - xbt_dict_foreach(set, cursor_w, key_w, data_w) { - // if (!symmetric || (symmetric && !contains(dst_names, key_w))) - add_multi_links(src, dst, links, key_w, dst_host_name); - } - } - /* if none of them are equal to $* */ - if (strcmp(src_host_name, "$*") != 0 - && strcmp(dst_host_name, "$*") != 0) { - add_multi_links(src, dst, links, src_host_name, dst_host_name); - } - } - } - xbt_dynar_free(&keys); - } - surfxml_bufferstack_pop(0); -} +// void manage_route(xbt_dict_t routing_table, const char *route_name, +// int action, int isMultiRoute) +// { +// unsigned int cpt; +// xbt_dynar_t links; +// char *value; +// +// /* get already existing list if it exists */ +// links = xbt_dict_get_or_null(routing_table, route_name); +// DEBUG3("ROUTE: %s (action:%s; len:%ld)", route_name, +// (action==A_surfxml_route_action_OVERRIDE?"override":( +// action==A_surfxml_route_action_PREPEND?"prepend":"postpend")), +// (links?xbt_dynar_length(links):0)); +// +// if (links != NULL) { +// switch (action) { +// case A_surfxml_route_action_PREPEND: /* add existing links at the end; route_link_list + links */ +// xbt_dynar_foreach(links, cpt, value) { +// xbt_dynar_push(route_link_list, &value); +// } +// xbt_dynar_free(&links); +// break; +// case A_surfxml_route_action_POSTPEND: /* add existing links in front; links + route_link_list */ +// xbt_dynar_foreach(route_link_list, cpt, value) { +// xbt_dynar_push(links, &value); +// } +// xbt_dynar_free(&route_link_list); +// route_link_list = links; +// break; +// case A_surfxml_route_action_OVERRIDE: +// xbt_dynar_free(&links); +// break; +// default: +// xbt_die(bprintf("While dealing with routes of %s, got action=%d. Please report this bug.", +// route_name,action)); +// break; +// } +// +// } +// /* this is the final route; do not add if name is a set; add only if name is in set list */ +// if (!isMultiRoute) { +// xbt_dict_set(routing_table, route_name, route_link_list, NULL); +// } +// } + +// static void parse_Etag_route_multi(void) +// { +// char *route_name; +// +// route_name = +// bprintf("%s#%s#%d#%d#%d", src_name, dst_name, route_action, +// is_symmetric_route, route_multi_size); +// +// xbt_dynar_push(route_multi_elements, &route_name); +// +// /* Add route */ +// xbt_dict_set(route_multi_table, route_name, route_link_list, NULL); +// /* add symmetric if it is the case */ +// if (is_symmetric_route == 1) { +// char *symmetric_name = +// bprintf("%s#%s#%d#%d#%d", dst_name, src_name, route_action, +// !is_symmetric_route, route_multi_size); +// +// xbt_dict_set(route_multi_table, symmetric_name, route_link_list, NULL); +// xbt_dynar_push(route_multi_elements, &symmetric_name); +// is_symmetric_route = 0; +// } +// free(src_name); +// free(dst_name); +// } + +// static void add_multi_links(const char *src, const char *dst, +// xbt_dynar_t links, const char *src_name, +// const char *dst_name) +// { +// unsigned int cpt; +// char *value, *val; +// +// surfxml_bufferstack_push(1); +// +// parse_make_temporary_route(src_name, dst_name, route_action); +// surfxml_call_cb_functions(STag_surfxml_route_cb_list); +// DEBUG2("\tADDING ROUTE: %s -> %s", src_name, dst_name); +// /* Build link list */ +// xbt_dynar_foreach(links, cpt, value) { +// if (strcmp(value, src) == 0) +// val = xbt_strdup(src_name); +// else if (strcmp(value, dst) == 0) +// val = xbt_strdup(dst_name); +// else if (strcmp(value, "$dst") == 0) +// val = xbt_strdup(dst_name); +// else if (strcmp(value, "$src") == 0) +// val = xbt_strdup(src_name); +// else +// val = xbt_strdup(value); +// DEBUG1("\t\tELEMENT: %s", val); +// xbt_dynar_push(route_link_list, &val); +// } +// surfxml_call_cb_functions(ETag_surfxml_route_cb_list); +// surfxml_bufferstack_pop(1); +// } + +// static void convert_route_multi_to_routes(void) +// { +// xbt_dict_cursor_t cursor_w; +// int symmetric; +// unsigned int cpt, cpt2, cursor; +// char *src_host_name, *dst_host_name, *key, *src, *dst, *val, *key_w, +// *data_w; +// const char *sep = "#"; +// xbt_dict_t set = NULL; +// xbt_dynar_t src_names = NULL, dst_names = NULL, links; +// +// if (!route_multi_elements) +// return; +// +// if (surf_cpu_model) +// set = surf_model_resource_set(surf_cpu_model); +// if (surf_workstation_model != NULL && +// surf_model_resource_set(surf_workstation_model) != NULL && +// xbt_dict_length(surf_model_resource_set(surf_workstation_model)) > 0) +// set = surf_model_resource_set(surf_workstation_model); +// +// +// surfxml_bufferstack_push(0); +// /* Get all routes in the exact order they were entered in the platform file */ +// xbt_dynar_foreach(route_multi_elements, cursor, key) { +// /* Get links for the route */ +// links = (xbt_dynar_t) xbt_dict_get_or_null(route_multi_table, key); +// keys = xbt_str_split_str(key, sep); +// /* Get route ends */ +// src = xbt_dynar_get_as(keys, 0, char *); +// dst = xbt_dynar_get_as(keys, 1, char *); +// route_action = atoi(xbt_dynar_get_as(keys, 2, char *)); +// symmetric = atoi(xbt_dynar_get_as(keys, 3, char *)); +// +// /* Create the dynar of src and dst hosts for the new routes */ +// /* NOTE: src and dst can be either set names or simple host names */ +// src_names = (xbt_dynar_t) xbt_dict_get_or_null(set_list, src); +// dst_names = (xbt_dynar_t) xbt_dict_get_or_null(set_list, dst); +// /* Add to dynar even if they are simple names */ +// if (src_names == NULL) { +// src_names = xbt_dynar_new(sizeof(char *), &xbt_free_ref); +// val = xbt_strdup(src); +// xbt_dynar_push(src_names, &val); +// if (strcmp(val, "$*") != 0 && NULL == xbt_dict_get_or_null(set, val)) +// THROW3(unknown_error, 0, +// "(In route:multi (%s -> %s) source %s does not exist (not a set or a host)", +// src, dst, src); +// } +// if (dst_names == NULL) { +// dst_names = xbt_dynar_new(sizeof(char *), &xbt_free_ref); +// val = xbt_strdup(dst); +// if (strcmp(val, "$*") != 0 && NULL == xbt_dict_get_or_null(set, val)) +// THROW3(unknown_error, 0, +// "(In route:multi (%s -> %s) destination %s does not exist (not a set or a host)", +// src, dst, dst); +// xbt_dynar_push(dst_names, &val); +// } +// +// /* Build the routes */ +// DEBUG2("ADDING MULTI ROUTE: %s -> %s", xbt_dynar_get_as(keys, 0, char *), +// xbt_dynar_get_as(keys, 1, char *)); +// xbt_dynar_foreach(src_names, cpt, src_host_name) { +// xbt_dynar_foreach(dst_names, cpt2, dst_host_name) { +// /* If dst is $* then set this route to have its dst point to all hosts */ +// if (strcmp(src_host_name, "$*") != 0 +// && strcmp(dst_host_name, "$*") == 0) { +// xbt_dict_foreach(set, cursor_w, key_w, data_w) { +// //int n = xbt_dynar_member(src_names, (char*)key_w); +// add_multi_links(src, dst, links, src_host_name, key_w); +// } +// } +// /* If src is $* then set this route to have its dst point to all hosts */ +// if (strcmp(src_host_name, "$*") == 0 +// && strcmp(dst_host_name, "$*") != 0) { +// xbt_dict_foreach(set, cursor_w, key_w, data_w) { +// // if (!symmetric || (symmetric && !contains(dst_names, key_w))) +// add_multi_links(src, dst, links, key_w, dst_host_name); +// } +// } +// /* if none of them are equal to $* */ +// if (strcmp(src_host_name, "$*") != 0 +// && strcmp(dst_host_name, "$*") != 0) { +// add_multi_links(src, dst, links, src_host_name, dst_host_name); +// } +// } +// } +// xbt_dynar_free(&keys); +// } +// surfxml_bufferstack_pop(0); +// } /* Trace management functions */ static double trace_periodicity = -1.0; -static double trace_timestep = -1.0; static char *trace_file = NULL; static char *trace_id; -static void parse_trace_init(void) +static void parse_Stag_trace(void) { trace_id = strdup(A_surfxml_trace_id); trace_file = strdup(A_surfxml_trace_file); surf_parse_get_double(&trace_periodicity, A_surfxml_trace_periodicity); - surf_parse_get_double(&trace_timestep, A_surfxml_trace_timestep); } -static void parse_trace_finalize(void) +static void parse_Etag_trace(void) { tmgr_trace_t trace; if (!trace_file || strcmp(trace_file, "") != 0) { @@ -1127,12 +1129,12 @@ static void parse_trace_finalize(void) else trace = tmgr_trace_new_from_string(trace_id, surfxml_pcdata, - trace_periodicity, trace_timestep); + trace_periodicity); } xbt_dict_set(traces_set_list, trace_id, (void *) trace, NULL); } -static void parse_trace_c_connect(void) +static void parse_Stag_trace_c_connect(void) { xbt_assert2(xbt_dict_get_or_null (traces_set_list, A_surfxml_trace_c_connect_trace), @@ -1220,3 +1222,130 @@ static void add_randomness(void) random_std_deviation); xbt_dict_set(random_data_list, random_id, (void *) random, NULL); } + +/** + * create CPU resource via CPU Model + */ +void surf_host_create_resource(char *name, double power_peak, + double power_scale, + tmgr_trace_t power_trace, + e_surf_resource_state_t state_initial, + tmgr_trace_t state_trace, + xbt_dict_t cpu_properties) +{ + return surf_cpu_model->extension.cpu. + create_resource(name,power_peak,power_scale,power_trace,state_initial,state_trace,cpu_properties); +} + +/* + * create CPU resource via worsktation_ptask_L07 model + */ + +void surf_wsL07_host_create_resource(char *name, double power_peak, + double power_scale, + tmgr_trace_t power_trace, + e_surf_resource_state_t state_initial, + tmgr_trace_t state_trace, + xbt_dict_t cpu_properties) +{ + surf_workstation_model->extension.workstation. + cpu_create_resource(name,power_peak,power_scale,power_trace,state_initial,state_trace,cpu_properties); +} +/* + * create link resource via network Model + */ +void surf_link_create_resource(char *name, + double bw_initial, + tmgr_trace_t bw_trace, + double lat_initial, + tmgr_trace_t lat_trace, + e_surf_resource_state_t + state_initial, + tmgr_trace_t state_trace, + e_surf_link_sharing_policy_t policy, + xbt_dict_t properties) +{ + return surf_network_model->extension.network. + create_resource(name,bw_initial,bw_trace,lat_initial,lat_trace, + state_initial,state_trace,policy,properties); + +} + +/* + * create link resource via workstation_ptask_L07 model + */ + +void surf_wsL07_link_create_resource(char *name, + double bw_initial, + tmgr_trace_t bw_trace, + double lat_initial, + tmgr_trace_t lat_trace, + e_surf_resource_state_t + state_initial, + tmgr_trace_t state_trace, + e_surf_link_sharing_policy_t + policy, xbt_dict_t properties) +{ + return surf_workstation_model->extension.workstation. + link_create_resource(name,bw_initial,bw_trace,lat_initial,lat_trace, + state_initial,state_trace,policy,properties); +} + + +/** + * Route: add route element bypassing the parser : + * same job as parse_route_elem + */ + +void surf_add_route_element(char* link_ctn_id) +{ + char *val; + val = xbt_strdup(link_ctn_id); + xbt_dynar_push(route_link_list,&val); +} +/** + * set route + */ +void surf_route_set_resource(char *source_id,char *destination_id,xbt_dynar_t links_id,int action) +{ + route_link_list = xbt_dynar_new(sizeof(char *), NULL); + //routing_add_route(source_id,destination_id,links_id,action); // COMMENTED BY DAVID + +} + +/** + * add host to routing host list + */ +void surf_route_add_host(char *host_id) +{ + //routing_add_host(host_id); // COMMENTED BY DAVID +} + +/* + * Add Traces + */ +void surf_add_host_traces(void) +{ + return surf_cpu_model->extension.cpu. + add_traces(); +} + +void surf_add_link_traces(void) +{ + return surf_network_model->extension.network. + add_traces(); +} + +void surf_wsL07_add_traces(void) +{ + return surf_workstation_model->extension.workstation. + add_traces(); +} +/** + * set routes + */ +void surf_set_routes(void) +{ + //routing_set_routes(); // COMMENTED BY DAVID +} +