X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ce5c470afd6b579354fd46d5ed50967df28a437..7fdb9c9ac44fba9f76a3b45d032561995bec2e0d:/src/surf/surfxml_parse.c diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 2a39d393b4..abe5856b4e 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -4,11 +4,13 @@ /* 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. */ +#include /* va_arg */ + #include "xbt/misc.h" #include "xbt/log.h" #include "xbt/str.h" #include "xbt/dict.h" -#include "surf/surfxml_parse_private.h" +#include "surf/surfxml_parse.h" #include "surf/surf_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, @@ -18,18 +20,32 @@ int ETag_surfxml_include_state(void); #include "simgrid_dtd.c" +char* surf_parsed_filename = NULL; // to locate parse error messages + /* * Helping functions */ -static void surf_parse_error(char *msg) { - xbt_die("Parse error on line %d: %s\n", surf_parse_lineno, msg); +void surf_parse_error(const char *fmt, ...) { + va_list va; + va_start(va,fmt); + char *msg = bvprintf(fmt,va); + va_end(va); + xbt_die("Parse error at %s:%d: %s", surf_parsed_filename, surf_parse_lineno, msg); +} +void surf_parse_warn(const char *fmt, ...) { + va_list va; + va_start(va,fmt); + char *msg = bvprintf(fmt,va); + va_end(va); + XBT_WARN("%s:%d: %s", surf_parsed_filename, surf_parse_lineno, msg); + free(msg); } double surf_parse_get_double(const char *string) { double res; int ret = sscanf(string, "%lg", &res); if (ret != 1) - surf_parse_error(bprintf("%s is not a double", string)); + surf_parse_error("%s is not a double", string); return res; } @@ -37,22 +53,17 @@ int surf_parse_get_int(const char *string) { int res; int ret = sscanf(string, "%d", &res); if (ret != 1) - surf_parse_error(bprintf("%s is not an integer", string)); + surf_parse_error("%s is not an integer", string); return res; } /* - * All the callback lists that can be overiden anywhere. + * All the callback lists that can be overridden anywhere. * (this list should probably be reduced to the bare minimum to allow the models to work) */ /* make sure these symbols are defined as strong ones in this file so that the linker can resolve them */ -//xbt_dynar_t STag_surfxml_host_cb_list = NULL; -xbt_dynar_t STag_surfxml_platform_cb_list = NULL; -xbt_dynar_t ETag_surfxml_platform_cb_list = NULL; -xbt_dynar_t STag_surfxml_link_cb_list = NULL; -xbt_dynar_t ETag_surfxml_link_cb_list = NULL; xbt_dynar_t STag_surfxml_route_cb_list = NULL; xbt_dynar_t ETag_surfxml_route_cb_list = NULL; xbt_dynar_t STag_surfxml_link_ctn_cb_list = NULL; @@ -63,8 +74,6 @@ xbt_dynar_t STag_surfxml_argument_cb_list = NULL; xbt_dynar_t ETag_surfxml_argument_cb_list = NULL; xbt_dynar_t STag_surfxml_prop_cb_list = NULL; xbt_dynar_t ETag_surfxml_prop_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_peer_cb_list = NULL; xbt_dynar_t ETag_surfxml_peer_cb_list = NULL; xbt_dynar_t STag_surfxml_trace_cb_list = NULL; @@ -73,15 +82,24 @@ xbt_dynar_t STag_surfxml_trace_connect_cb_list = NULL; xbt_dynar_t ETag_surfxml_trace_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; -xbt_dynar_t ETag_surfxml_AS_cb_list = NULL; xbt_dynar_t STag_surfxml_ASroute_cb_list = NULL; xbt_dynar_t ETag_surfxml_ASroute_cb_list = NULL; xbt_dynar_t STag_surfxml_bypassRoute_cb_list = NULL; xbt_dynar_t ETag_surfxml_bypassRoute_cb_list = NULL; +xbt_dynar_t STag_surfxml_bypassASroute_cb_list = NULL; +xbt_dynar_t ETag_surfxml_bypassASroute_cb_list = NULL; xbt_dynar_t STag_surfxml_include_cb_list = NULL; xbt_dynar_t ETag_surfxml_include_cb_list = NULL; +xbt_dynar_t STag_surfxml_storage_cb_list = NULL; +xbt_dynar_t ETag_surfxml_storage_cb_list = NULL; +xbt_dynar_t STag_surfxml_storage_type_cb_list = NULL; +xbt_dynar_t ETag_surfxml_storage_type_cb_list = NULL; +xbt_dynar_t STag_surfxml_mount_cb_list = NULL; +xbt_dynar_t ETag_surfxml_mount_cb_list = NULL; +xbt_dynar_t STag_surfxml_mstorage_cb_list = NULL; +xbt_dynar_t ETag_surfxml_mstorage_cb_list = NULL; + /* The default current property receiver. Setup in the corresponding opening callbacks. */ xbt_dict_t current_property_set = NULL; /* dictionary of random generator data */ @@ -93,31 +111,93 @@ 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 parse_Stag_trace(void); -static void parse_Etag_trace(void); -static void parse_Stag_trace_connect(void); - static void init_randomness(void); static void add_randomness(void); /* - * Stuff relative to the tag + * Stuff relative to storage */ +void STag_surfxml_storage(void) +{ + XBT_DEBUG("STag_surfxml_storage"); +} +void ETag_surfxml_storage(void) +{ + s_sg_platf_storage_cbarg_t storage; + memset(&storage,0,sizeof(storage)); + + storage.id = A_surfxml_storage_id; + storage.type_id = A_surfxml_storage_typeId; + storage.content = A_surfxml_storage_content; + sg_platf_new_storage(&storage); +} +void STag_surfxml_storage_type(void) +{ + XBT_DEBUG("STag_surfxml_storage_type"); + xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)"); +} +void ETag_surfxml_storage_type(void) +{ + s_sg_platf_storage_type_cbarg_t storage_type; + memset(&storage_type,0,sizeof(storage_type)); + + storage_type.content = A_surfxml_storage_type_content; + storage_type.id = A_surfxml_storage_type_id; + storage_type.model = A_surfxml_storage_type_model; + storage_type.properties = current_property_set; + storage_type.size = surf_parse_get_int(A_surfxml_storage_type_size); + sg_platf_new_storage_type(&storage_type); + current_property_set = NULL; +} +void STag_surfxml_mstorage(void) +{ + XBT_DEBUG("STag_surfxml_mstorage"); +} +void ETag_surfxml_mstorage(void) +{ + s_sg_platf_mstorage_cbarg_t mstorage; + memset(&mstorage,0,sizeof(mstorage)); + + mstorage.name = A_surfxml_mstorage_name; + mstorage.type_id = A_surfxml_mstorage_typeId; + sg_platf_new_mstorage(&mstorage); +} +void STag_surfxml_mount(void) +{ + XBT_DEBUG("STag_surfxml_mount"); +} +void ETag_surfxml_mount(void) +{ + s_sg_platf_mount_cbarg_t mount; + memset(&mount,0,sizeof(mount)); + mount.name = A_surfxml_mount_name; + mount.id = A_surfxml_mount_id; + sg_platf_new_mount(&mount); +} + +/* + * Stuff relative to the tag + */ static xbt_dynar_t surf_input_buffer_stack = NULL; static xbt_dynar_t surf_file_to_parse_stack = NULL; +static xbt_dynar_t surf_parsed_filename_stack = NULL; void STag_surfxml_include(void) { - XBT_INFO("STag_surfxml_include '%s'",A_surfxml_include_file); - xbt_dynar_push(surf_file_to_parse_stack, &surf_file_to_parse); //save old filename + XBT_DEBUG("STag_surfxml_include '%s'",A_surfxml_include_file); + xbt_dynar_push(surf_parsed_filename_stack,&surf_parsed_filename); // save old file name + surf_parsed_filename = xbt_strdup(A_surfxml_include_file); + + xbt_dynar_push(surf_file_to_parse_stack, &surf_file_to_parse); //save old file descriptor - surf_file_to_parse = surf_fopen(A_surfxml_include_file, "r"); // read new filename + surf_file_to_parse = surf_fopen(A_surfxml_include_file, "r"); // read new file descriptor xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n", A_surfxml_include_file); xbt_dynar_push(surf_input_buffer_stack,&surf_input_buffer); surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE); surf_parse_push_buffer_state(surf_input_buffer); + fflush(NULL); } @@ -135,94 +215,99 @@ void ETag_surfxml_include(void) { * * Yeah, that's terribly hackish, but it works. A better solution should be dealed with in flexml * directly: a command line flag could instruct it to do the correct thing when #include is encountered - * on a line. + * on a line. One day maybe, if the maya allow it. */ int ETag_surfxml_include_state(void) { fflush(NULL); - XBT_INFO("ETag_surfxml_include_state '%s'",A_surfxml_include_file); - if(xbt_dynar_length(surf_input_buffer_stack)!= 0) - return 1; + XBT_DEBUG("ETag_surfxml_include_state '%s'",A_surfxml_include_file); + + if(xbt_dynar_is_empty(surf_input_buffer_stack)) // nope, that's a true premature EOF. Let the parser die verbosely. + return 0; + + // Yeah, we were in an Restore state and proceed. fclose(surf_file_to_parse); xbt_dynar_pop(surf_file_to_parse_stack, &surf_file_to_parse); surf_parse_pop_buffer_state(); - xbt_dynar_pop(surf_input_buffer_stack,surf_input_buffer); - return 0; + xbt_dynar_pop(surf_input_buffer_stack,&surf_input_buffer); + + // Restore the filename for error messages + free(surf_parsed_filename); + xbt_dynar_pop(surf_parsed_filename_stack,&surf_parsed_filename); + + return 1; } void surf_parse_init_callbacks(void) { - STag_surfxml_platform_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_platform_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - - sg_platf_init(); - 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); - STag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_link_ctn_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_link_ctn_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_process_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_process_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_argument_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_argument_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_prop_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_prop_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_connect_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_trace_connect_cb_list = - 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); - ETag_surfxml_AS_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_ASroute_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_ASroute_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_bypassRoute_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_bypassRoute_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_peer_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_peer_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_include_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_include_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); + sg_platf_init(); // FIXME: move to a proper place? + + STag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); + ETag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); + STag_surfxml_link_ctn_cb_list = + xbt_dynar_new(sizeof(void_f_void_t), NULL); + ETag_surfxml_link_ctn_cb_list = + xbt_dynar_new(sizeof(void_f_void_t), NULL); + STag_surfxml_process_cb_list = + xbt_dynar_new(sizeof(void_f_void_t), NULL); + ETag_surfxml_process_cb_list = + xbt_dynar_new(sizeof(void_f_void_t), NULL); + STag_surfxml_argument_cb_list = + xbt_dynar_new(sizeof(void_f_void_t), NULL); + ETag_surfxml_argument_cb_list = + xbt_dynar_new(sizeof(void_f_void_t), NULL); + STag_surfxml_prop_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); + ETag_surfxml_prop_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_connect_cb_list = + xbt_dynar_new(sizeof(void_f_void_t), NULL); + ETag_surfxml_trace_connect_cb_list = + 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_ASroute_cb_list = + xbt_dynar_new(sizeof(void_f_void_t), NULL); + ETag_surfxml_ASroute_cb_list = + xbt_dynar_new(sizeof(void_f_void_t), NULL); + STag_surfxml_bypassRoute_cb_list = + xbt_dynar_new(sizeof(void_f_void_t), NULL); + ETag_surfxml_bypassRoute_cb_list = + xbt_dynar_new(sizeof(void_f_void_t), NULL); + STag_surfxml_bypassASroute_cb_list = + xbt_dynar_new(sizeof(void_f_void_t), NULL); + ETag_surfxml_bypassASroute_cb_list = + xbt_dynar_new(sizeof(void_f_void_t), NULL); + STag_surfxml_peer_cb_list = + xbt_dynar_new(sizeof(void_f_void_t), NULL); + ETag_surfxml_peer_cb_list = + xbt_dynar_new(sizeof(void_f_void_t), NULL); + STag_surfxml_include_cb_list = + xbt_dynar_new(sizeof(void_f_void_t), NULL); + ETag_surfxml_include_cb_list = + xbt_dynar_new(sizeof(void_f_void_t), NULL); + + STag_surfxml_storage_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); + ETag_surfxml_storage_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); + STag_surfxml_storage_type_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); + ETag_surfxml_storage_type_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); + STag_surfxml_mount_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); + ETag_surfxml_mount_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); + STag_surfxml_mstorage_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); + ETag_surfxml_mstorage_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); } void surf_parse_reset_callbacks(void) { - surf_parse_free_callbacks(); - surf_parse_init_callbacks(); + surf_parse_free_callbacks(); + surf_parse_init_callbacks(); } void surf_parse_free_callbacks(void) { - sg_platf_exit(); + sg_platf_exit(); // FIXME: better place? - xbt_dynar_free(&STag_surfxml_platform_cb_list); - xbt_dynar_free(&ETag_surfxml_platform_cb_list); - xbt_dynar_free(&STag_surfxml_link_cb_list); - xbt_dynar_free(&ETag_surfxml_link_cb_list); xbt_dynar_free(&STag_surfxml_route_cb_list); xbt_dynar_free(&ETag_surfxml_route_cb_list); xbt_dynar_free(&STag_surfxml_link_ctn_cb_list); @@ -239,26 +324,31 @@ void surf_parse_free_callbacks(void) xbt_dynar_free(&ETag_surfxml_trace_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); - xbt_dynar_free(&ETag_surfxml_AS_cb_list); xbt_dynar_free(&STag_surfxml_ASroute_cb_list); xbt_dynar_free(&ETag_surfxml_ASroute_cb_list); xbt_dynar_free(&STag_surfxml_bypassRoute_cb_list); xbt_dynar_free(&ETag_surfxml_bypassRoute_cb_list); - xbt_dynar_free(&STag_surfxml_cluster_cb_list); - xbt_dynar_free(&ETag_surfxml_cluster_cb_list); + xbt_dynar_free(&STag_surfxml_bypassASroute_cb_list); + xbt_dynar_free(&ETag_surfxml_bypassASroute_cb_list); xbt_dynar_free(&STag_surfxml_peer_cb_list); xbt_dynar_free(&ETag_surfxml_peer_cb_list); xbt_dynar_free(&STag_surfxml_include_cb_list); xbt_dynar_free(&ETag_surfxml_include_cb_list); + + xbt_dynar_free(&STag_surfxml_storage_cb_list); + xbt_dynar_free(&ETag_surfxml_storage_cb_list); + xbt_dynar_free(&STag_surfxml_mstorage_cb_list); + xbt_dynar_free(&ETag_surfxml_mstorage_cb_list); + xbt_dynar_free(&STag_surfxml_mount_cb_list); + xbt_dynar_free(&ETag_surfxml_mount_cb_list); + xbt_dynar_free(&STag_surfxml_storage_type_cb_list); + xbt_dynar_free(&ETag_surfxml_storage_type_cb_list); } /* Stag and Etag parse functions */ -void ETag_surfxml_host(void) { /* ignored -- do not add content here */ } -void ETag_surfxml_router(void){ /* ignored -- do not add content here */ } +void ETag_surfxml_router(void) { /* ignored -- do not add content here */ } -void STag_surfxml_platform(void) -{ +void STag_surfxml_platform(void) { _XBT_GNUC_UNUSED double version = surf_parse_get_double(A_surfxml_platform_version); xbt_assert((version >= 1.0), "******* BIG FAT WARNING *********\n " @@ -281,32 +371,37 @@ void STag_surfxml_platform(void) "This program is installed automatically with SimGrid, or " "available in the tools/ directory of the source archive."); - surfxml_call_cb_functions(STag_surfxml_platform_cb_list); + sg_platf_begin(); +} +void ETag_surfxml_platform(void){ + sg_platf_end(); } void STag_surfxml_host(void){ + xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)"); +} + +void ETag_surfxml_host(void) { s_sg_platf_host_cbarg_t host; memset(&host,0,sizeof(host)); - xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)"); - host.properties = current_property_set = xbt_dict_new(); - - host.V_host_id = A_surfxml_host_id; - host.V_host_power_peak = get_cpu_power(A_surfxml_host_power); - host.V_host_power_scale = surf_parse_get_double( A_surfxml_host_availability); - host.V_host_core = surf_parse_get_int(A_surfxml_host_core); - host.V_host_power_trace = tmgr_trace_new(A_surfxml_host_availability_file); - host.V_host_state_trace = tmgr_trace_new(A_surfxml_host_state_file); - xbt_assert((A_surfxml_host_state == A_surfxml_host_state_ON) || - (A_surfxml_host_state == A_surfxml_host_state_OFF), "Invalid state"); - if (A_surfxml_host_state == A_surfxml_host_state_ON) - host.V_host_state_initial = SURF_RESOURCE_ON; - if (A_surfxml_host_state == A_surfxml_host_state_OFF) - host.V_host_state_initial = SURF_RESOURCE_OFF; - host.V_host_coord = A_surfxml_host_coordinates; - - sg_platf_new_host(&host); - + host.properties = current_property_set; + + host.id = A_surfxml_host_id; + host.power_peak = get_cpu_power(A_surfxml_host_power); + host.power_scale = surf_parse_get_double( A_surfxml_host_availability); + host.core_amount = surf_parse_get_int(A_surfxml_host_core); + host.power_trace = tmgr_trace_new_from_file(A_surfxml_host_availability_file); + host.state_trace = tmgr_trace_new_from_file(A_surfxml_host_state_file); + xbt_assert((A_surfxml_host_state == A_surfxml_host_state_ON) || + (A_surfxml_host_state == A_surfxml_host_state_OFF), "Invalid state"); + if (A_surfxml_host_state == A_surfxml_host_state_ON) + host.initial_state = SURF_RESOURCE_ON; + if (A_surfxml_host_state == A_surfxml_host_state_OFF) + host.initial_state = SURF_RESOURCE_OFF; + host.coord = A_surfxml_host_coordinates; + + sg_platf_new_host(&host); current_property_set = NULL; } @@ -314,145 +409,170 @@ void STag_surfxml_router(void){ s_sg_platf_router_cbarg_t router; memset(&router, 0, sizeof(router)); - router.V_router_id = A_surfxml_router_id; - router.V_router_coord = A_surfxml_router_coordinates; - sg_platf_new_router(&router); + router.id = A_surfxml_router_id; + router.coord = A_surfxml_router_coordinates; + + sg_platf_new_router(&router); } void STag_surfxml_cluster(void){ - struct_cluster = xbt_new0(s_surf_parsing_cluster_arg_t, 1); - struct_cluster->V_cluster_id = A_surfxml_cluster_id; - struct_cluster->V_cluster_prefix = A_surfxml_cluster_prefix; - struct_cluster->V_cluster_suffix = A_surfxml_cluster_suffix; - struct_cluster->V_cluster_radical = A_surfxml_cluster_radical; - struct_cluster->S_cluster_power= surf_parse_get_double(A_surfxml_cluster_power); - struct_cluster->S_cluster_core = surf_parse_get_int(A_surfxml_cluster_core); - struct_cluster->S_cluster_bw = surf_parse_get_double(A_surfxml_cluster_bw); - struct_cluster->S_cluster_lat = surf_parse_get_double(A_surfxml_cluster_lat); - if(strcmp(A_surfxml_cluster_bb_bw,"")) - struct_cluster->S_cluster_bb_bw = surf_parse_get_double(A_surfxml_cluster_bb_bw); - if(strcmp(A_surfxml_cluster_bb_lat,"")) - struct_cluster->S_cluster_bb_lat = surf_parse_get_double(A_surfxml_cluster_bb_lat); - if(!strcmp(A_surfxml_cluster_router_id,"")) - struct_cluster->S_cluster_router_id = bprintf("%s%s_router%s", - struct_cluster->V_cluster_prefix, - struct_cluster->V_cluster_id, - struct_cluster->V_cluster_suffix); - else - struct_cluster->S_cluster_router_id = A_surfxml_cluster_router_id; - - struct_cluster->V_cluster_sharing_policy = AX_surfxml_cluster_sharing_policy; - struct_cluster->V_cluster_bb_sharing_policy = AX_surfxml_cluster_bb_sharing_policy; - - struct_cluster->V_cluster_availability_file = xbt_strdup(A_surfxml_cluster_availability_file); - struct_cluster->V_cluster_state_file = xbt_strdup(A_surfxml_cluster_state_file); - - surfxml_call_cb_functions(STag_surfxml_cluster_cb_list); + s_sg_platf_cluster_cbarg_t cluster; + memset(&cluster,0,sizeof(cluster)); + cluster.id = A_surfxml_cluster_id; + cluster.prefix = A_surfxml_cluster_prefix; + cluster.suffix = A_surfxml_cluster_suffix; + cluster.radical = A_surfxml_cluster_radical; + cluster.power= surf_parse_get_double(A_surfxml_cluster_power); + cluster.core_amount = surf_parse_get_int(A_surfxml_cluster_core); + cluster.bw = surf_parse_get_double(A_surfxml_cluster_bw); + cluster.lat = surf_parse_get_double(A_surfxml_cluster_lat); + if(strcmp(A_surfxml_cluster_bb_bw,"")) + cluster.bb_bw = surf_parse_get_double(A_surfxml_cluster_bb_bw); + if(strcmp(A_surfxml_cluster_bb_lat,"")) + cluster.bb_lat = surf_parse_get_double(A_surfxml_cluster_bb_lat); + cluster.router_id = A_surfxml_cluster_router_id; + + switch (AX_surfxml_cluster_sharing_policy) { + case A_surfxml_cluster_sharing_policy_SHARED: + cluster.sharing_policy = SURF_LINK_SHARED; + break; + case A_surfxml_cluster_sharing_policy_FULLDUPLEX: + cluster.sharing_policy = SURF_LINK_FULLDUPLEX; + break; + case A_surfxml_cluster_sharing_policy_FATPIPE: + cluster.sharing_policy = SURF_LINK_FATPIPE; + break; + default: + surf_parse_error("Invalid cluster sharing policy for cluster %s", + cluster.id); + break; + } + switch (AX_surfxml_cluster_bb_sharing_policy) { + case A_surfxml_cluster_bb_sharing_policy_FATPIPE: + cluster.bb_sharing_policy = SURF_LINK_FATPIPE; + break; + case A_surfxml_cluster_bb_sharing_policy_SHARED: + cluster.bb_sharing_policy = SURF_LINK_SHARED; + break; + default: + surf_parse_error("Invalid bb sharing policy in cluster %s", + cluster.id); + break; + } + + cluster.availability_trace = A_surfxml_cluster_availability_file; + cluster.state_trace = A_surfxml_cluster_state_file; + sg_platf_new_cluster(&cluster); } void ETag_surfxml_cluster(void){ - surfxml_call_cb_functions(ETag_surfxml_cluster_cb_list); - if( !strcmp(A_surfxml_cluster_router_id,"")) - xbt_free(struct_cluster->S_cluster_router_id); - xbt_free(struct_cluster->V_cluster_availability_file); - xbt_free(struct_cluster->V_cluster_state_file); - xbt_free(struct_cluster); + /* nothing I can think of */ } void STag_surfxml_peer(void){ - struct_peer = xbt_new0(s_surf_parsing_peer_arg_t, 1); - struct_peer->V_peer_id = xbt_strdup(A_surfxml_peer_id); - struct_peer->V_peer_power = xbt_strdup(A_surfxml_peer_power); - struct_peer->V_peer_bw_in = xbt_strdup(A_surfxml_peer_bw_in); - struct_peer->V_peer_bw_out = xbt_strdup(A_surfxml_peer_bw_out); - struct_peer->V_peer_lat = xbt_strdup(A_surfxml_peer_lat); - struct_peer->V_peer_coord = xbt_strdup(A_surfxml_peer_coordinates); - struct_peer->V_peer_availability_trace = xbt_strdup(A_surfxml_peer_availability_file); - struct_peer->V_peer_state_trace = xbt_strdup(A_surfxml_peer_state_file); - surfxml_call_cb_functions(STag_surfxml_peer_cb_list); + s_sg_platf_peer_cbarg_t peer; + memset(&peer,0,sizeof(peer)); + peer.id = A_surfxml_peer_id; + peer.power = surf_parse_get_double(A_surfxml_peer_power); + peer.bw_in = surf_parse_get_double(A_surfxml_peer_bw_in); + peer.bw_out = surf_parse_get_double(A_surfxml_peer_bw_out); + peer.lat = surf_parse_get_double(A_surfxml_peer_lat); + peer.coord = A_surfxml_peer_coordinates; + peer.availability_trace = tmgr_trace_new_from_file(A_surfxml_peer_availability_file); + peer.state_trace = tmgr_trace_new_from_file(A_surfxml_peer_state_file); + + surfxml_call_cb_functions(STag_surfxml_peer_cb_list); + sg_platf_new_peer(&peer); } void ETag_surfxml_peer(void){ - surfxml_call_cb_functions(ETag_surfxml_peer_cb_list); - xbt_free(struct_peer->V_peer_id); - xbt_free(struct_peer->V_peer_power); - xbt_free(struct_peer->V_peer_bw_in); - xbt_free(struct_peer->V_peer_bw_out); - xbt_free(struct_peer->V_peer_lat); - xbt_free(struct_peer->V_peer_coord); - xbt_free(struct_peer->V_peer_availability_trace); - xbt_free(struct_peer->V_peer_state_trace); - xbt_free(struct_peer); + /* nothing to do here */ } void STag_surfxml_link(void){ - struct_lnk = xbt_new0(s_surf_parsing_link_arg_t, 1); - struct_lnk->V_link_id = A_surfxml_link_id; - struct_lnk->V_link_bandwidth = surf_parse_get_double(A_surfxml_link_bandwidth); - struct_lnk->V_link_bandwidth_file = tmgr_trace_new(A_surfxml_link_bandwidth_file); - struct_lnk->V_link_latency = surf_parse_get_double(A_surfxml_link_latency); - struct_lnk->V_link_latency_file = tmgr_trace_new(A_surfxml_link_latency_file); - xbt_assert((A_surfxml_link_state == A_surfxml_link_state_ON) || - (A_surfxml_link_state == A_surfxml_link_state_OFF), "Invalid state"); - if (A_surfxml_link_state == A_surfxml_link_state_ON) - struct_lnk->V_link_state = SURF_RESOURCE_ON; - if (A_surfxml_link_state == A_surfxml_link_state_OFF) - struct_lnk->V_link_state = SURF_RESOURCE_OFF; - struct_lnk->V_link_state_file = tmgr_trace_new(A_surfxml_link_state_file); - 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(); -} -void surf_parse_link(void){ - surfxml_call_cb_functions(STag_surfxml_link_cb_list); + xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)"); } void ETag_surfxml_link(void){ - surfxml_call_cb_functions(ETag_surfxml_link_cb_list); - xbt_free(struct_lnk); + s_sg_platf_link_cbarg_t link; + memset(&link,0,sizeof(link)); + + link.properties = current_property_set; + + link.id = A_surfxml_link_id; + link.bandwidth = surf_parse_get_double(A_surfxml_link_bandwidth); + link.bandwidth_trace = tmgr_trace_new_from_file(A_surfxml_link_bandwidth_file); + link.latency = surf_parse_get_double(A_surfxml_link_latency); + link.latency_trace = tmgr_trace_new_from_file(A_surfxml_link_latency_file); + + switch (A_surfxml_link_state) { + case A_surfxml_link_state_ON: + link.state = SURF_RESOURCE_ON; + break; + case A_surfxml_link_state_OFF: + link.state = SURF_RESOURCE_OFF; + break; + default: + surf_parse_error("invalid state for link %s", link.id); + break; + } + link.state_trace = tmgr_trace_new_from_file(A_surfxml_link_state_file); + + switch (A_surfxml_link_sharing_policy) { + case A_surfxml_link_sharing_policy_SHARED: + link.policy = SURF_LINK_SHARED; + break; + case A_surfxml_link_sharing_policy_FATPIPE: + link.policy = SURF_LINK_FATPIPE; + break; + case A_surfxml_link_sharing_policy_FULLDUPLEX: + link.policy = SURF_LINK_FULLDUPLEX; + break; + default: + surf_parse_error("Invalid sharing policy in link %s", link.id); + break; + } + + sg_platf_new_link(&link); + + current_property_set = NULL; } void STag_surfxml_route(void){ - surfxml_call_cb_functions(STag_surfxml_route_cb_list); + surfxml_call_cb_functions(STag_surfxml_route_cb_list); } void STag_surfxml_link_ctn(void){ - surfxml_call_cb_functions(STag_surfxml_link_ctn_cb_list); + surfxml_call_cb_functions(STag_surfxml_link_ctn_cb_list); } void STag_surfxml_process(void){ - surfxml_call_cb_functions(STag_surfxml_process_cb_list); + surfxml_call_cb_functions(STag_surfxml_process_cb_list); } void STag_surfxml_argument(void){ - surfxml_call_cb_functions(STag_surfxml_argument_cb_list); + surfxml_call_cb_functions(STag_surfxml_argument_cb_list); } void STag_surfxml_prop(void){ - surfxml_call_cb_functions(STag_surfxml_prop_cb_list); + surfxml_call_cb_functions(STag_surfxml_prop_cb_list); } void STag_surfxml_trace(void){ - surfxml_call_cb_functions(STag_surfxml_trace_cb_list); + surfxml_call_cb_functions(STag_surfxml_trace_cb_list); } void STag_surfxml_trace_connect(void){ - surfxml_call_cb_functions(STag_surfxml_trace_connect_cb_list); + surfxml_call_cb_functions(STag_surfxml_trace_connect_cb_list); } void STag_surfxml_AS(void){ - surfxml_call_cb_functions(STag_surfxml_AS_cb_list); + sg_platf_new_AS_begin(A_surfxml_AS_id, (int)A_surfxml_AS_routing); +} +void ETag_surfxml_AS(void){ + sg_platf_new_AS_end(); } void STag_surfxml_ASroute(void){ - surfxml_call_cb_functions(STag_surfxml_ASroute_cb_list); + surfxml_call_cb_functions(STag_surfxml_ASroute_cb_list); } void STag_surfxml_bypassRoute(void){ - surfxml_call_cb_functions(STag_surfxml_bypassRoute_cb_list); + surfxml_call_cb_functions(STag_surfxml_bypassRoute_cb_list); +} +void STag_surfxml_bypassASroute(void){ + surfxml_call_cb_functions(STag_surfxml_bypassASroute_cb_list); } void STag_surfxml_config(void){ XBT_DEBUG("START configuration name = %s",A_surfxml_config_id); xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)"); - current_property_set = xbt_dict_new(); - } void ETag_surfxml_config(void){ xbt_dict_cursor_t cursor = NULL; @@ -468,16 +588,17 @@ void ETag_surfxml_config(void){ free(cfg); } XBT_DEBUG("End configuration name = %s",A_surfxml_config_id); - current_property_set = NULL; + xbt_dict_free(¤t_property_set); } void STag_surfxml_random(void){ - surfxml_call_cb_functions(STag_surfxml_random_cb_list); + surfxml_call_cb_functions(STag_surfxml_random_cb_list); } -#define parse_method(type,name) \ -void type##Tag_surfxml_##name(void) \ -{ surfxml_call_cb_functions(type##Tag_surfxml_##name##_cb_list); } -parse_method(E, platform); +#define parse_method(type,name) \ + void type##Tag_surfxml_##name(void) \ + { surfxml_call_cb_functions(type##Tag_surfxml_##name##_cb_list); } \ + void type##Tag_surfxml_##name(void) + parse_method(E, route); parse_method(E, link_ctn); parse_method(E, process); @@ -486,9 +607,9 @@ parse_method(E, prop); parse_method(E, trace); parse_method(E, trace_connect); parse_method(E, random); -parse_method(E, AS); parse_method(E, ASroute); parse_method(E, bypassRoute); +parse_method(E, bypassASroute); /* Open and Close parse file */ @@ -510,6 +631,10 @@ void surf_parse_open(const char *file) if (!surf_file_to_parse_stack) surf_file_to_parse_stack = xbt_dynar_new(sizeof(FILE *), NULL); + if (!surf_parsed_filename_stack) + surf_parsed_filename_stack = xbt_dynar_new(sizeof(char *), &xbt_free_ref); + surf_parsed_filename = xbt_strdup(file); + surf_file_to_parse = surf_fopen(file, "r"); xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n", file); surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE); @@ -519,10 +644,11 @@ void surf_parse_open(const char *file) void surf_parse_close(void) { - if (surf_input_buffer_stack) - xbt_dynar_free(&surf_input_buffer_stack); - if (surf_file_to_parse_stack) - xbt_dynar_free(&surf_file_to_parse_stack); + xbt_dynar_free(&surf_input_buffer_stack); + xbt_dynar_free(&surf_file_to_parse_stack); + xbt_dynar_free(&surf_parsed_filename_stack); + + free(surf_parsed_filename); if (surf_file_to_parse) { surf_parse__delete_buffer(surf_input_buffer); @@ -571,40 +697,22 @@ 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) { - if (fun) (*fun) (); + if (fun) fun(); } } /* Prop tag functions */ -void parse_properties(const char* prop_id, const char* prop_value) -{ - char *value = NULL; - if (!current_property_set) - current_property_set = xbt_dict_new(); // Maybe, it should raise an error - if(!strcmp(prop_id,"coordinates")){ - if(!strcmp(prop_value,"yes") && !COORD_HOST_LEVEL) - { - XBT_INFO("Configuration change: Set '%s' to '%s'", prop_id, prop_value); - COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_dynar_free_voidp); - COORD_ASR_LEVEL = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp); - } - if(strcmp(A_surfxml_prop_value,"yes")) - xbt_die("Setting XML prop coordinates must be \"yes\""); - } - else{ - value = xbt_strdup(prop_value); - xbt_dict_set(current_property_set, prop_id, value, free); - } -} - /** * With XML parser */ -void parse_properties_XML(void) +void parse_properties(void) { - parse_properties(A_surfxml_prop_id, A_surfxml_prop_value); + if (!current_property_set) + current_property_set = xbt_dict_new_homogeneous(xbt_free_f); // Maybe, it should raise an error + + xbt_dict_set(current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), NULL); } @@ -633,8 +741,8 @@ double get_cpu_power(const char *power) return power_scale; } -double random_min, random_max, random_mean, random_std_deviation, - random_generator; +double random_min, random_max, random_mean, random_std_deviation; +e_random_generator_t random_generator; char *random_id; static void init_randomness(void) @@ -644,7 +752,24 @@ static void init_randomness(void) random_max = surf_parse_get_double(A_surfxml_random_max); random_mean = surf_parse_get_double(A_surfxml_random_mean); random_std_deviation = surf_parse_get_double(A_surfxml_random_std_deviation); - random_generator = A_surfxml_random_generator; + switch (A_surfxml_random_generator) { + case AU_surfxml_random_generator: + case A_surfxml_random_generator_NONE: + random_generator = NONE; + break; + case A_surfxml_random_generator_DRAND48: + random_generator = DRAND48; + break; + case A_surfxml_random_generator_RAND: + random_generator = RAND; + break; + case A_surfxml_random_generator_RNGSTREAM: + random_generator = RNGSTREAM; + break; + default: + surf_parse_error("Invalid random generator"); + break; + } } static void add_randomness(void) @@ -657,130 +782,3 @@ static void add_randomness(void) &xbt_free_ref); } -/** - * create CPU resource via CPU Model - */ -void* surf_host_create_resource(char *name, double power_peak, - double power_scale, - tmgr_trace_t power_trace, int core, - 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, - core, - 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) -{ - return 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); -} - -/* - * add host to the network element list - */ -void surf_route_add_host(const char *host_id) -{ - routing_add_host(host_id); -} - -/** - * set route - */ -void surf_routing_add_route(const char *src_id, const char *dst_id, - xbt_dynar_t links_id) -{ - unsigned int i; - const char *link_id; - routing_set_route(src_id, dst_id); - xbt_dynar_foreach(links_id, i, link_id) { - routing_add_link(link_id); - } - - //store the route - routing_store_route(); -} - -/** - * 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(); -}