X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bdfe4f8674f98efbf2d67ad854ef83a1d5f855ed..6211c588d514efac018d071c4304df3f7bace3bd:/src/surf/surfxml_parse.c diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 4d48cad5a5..6c757e587c 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2013. The SimGrid Team. +/* Copyright (c) 2006-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -14,6 +14,7 @@ #include "xbt/dict.h" #include "surf/surfxml_parse.h" #include "surf/surf_private.h" +#include "surf/random_mgr.h" #include "simgrid/sg_config.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, @@ -33,9 +34,12 @@ extern AS_t current_routing; void surf_parse_error(const char *fmt, ...) { va_list va; va_start(va,fmt); + int lineno = surf_parse_lineno; char *msg = bvprintf(fmt,va); va_end(va); - xbt_die("Parse error at %s:%d: %s", surf_parsed_filename, surf_parse_lineno, msg); + cleanup(); + surf_exit(); + xbt_die("Parse error at %s:%d: %s", surf_parsed_filename, lineno, msg); } void surf_parse_warn(const char *fmt, ...) { va_list va; @@ -51,7 +55,7 @@ double surf_parse_get_double(const char *string) { int ret = sscanf(string, "%lg", &res); if (ret != 1) surf_parse_error("%s is not a double", string); - //printf("Parsed double [%lg] %s\n", res, string); + //printf("Parsed double [%g] %s\n", res, string); return res; } @@ -199,6 +203,7 @@ double surf_parse_get_power(const char *string) /* The default current property receiver. Setup in the corresponding opening callbacks. */ xbt_dict_t current_property_set = NULL; +xbt_dict_t current_model_property_set = NULL; xbt_dict_t as_current_property_set = NULL; int AS_TAG = 0; char* as_name_tab[1024]; @@ -242,6 +247,7 @@ void STag_surfxml_storage___type(void) AS_TAG = 0; 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)"); + xbt_assert(current_model_property_set == NULL, "Someone forgot to reset the model property set to NULL in its closing tag (or XML malformed)"); } void ETag_surfxml_storage___type(void) { @@ -253,9 +259,11 @@ void ETag_surfxml_storage___type(void) storage_type.id = A_surfxml_storage___type_id; storage_type.model = A_surfxml_storage___type_model; storage_type.properties = current_property_set; + storage_type.model_properties = current_model_property_set; storage_type.size = surf_parse_get_size(A_surfxml_storage___type_size); sg_platf_new_storage_type(&storage_type); current_property_set = NULL; + current_model_property_set = NULL; } void STag_surfxml_mstorage(void) { @@ -447,7 +455,7 @@ void ETag_surfxml_host(void) { xbt_str_trim(power_value_str, NULL); power_value = get_cpu_power(power_value_str); xbt_dynar_push_as(host.power_peak, double, power_value); - XBT_DEBUG("Power value: %lf", power_value); + XBT_DEBUG("Power value: %f", power_value); } xbt_dynar_free(&pstate_list); } @@ -516,6 +524,20 @@ void ETag_surfxml_cluster(void){ cluster.loopback_bw = surf_parse_get_bandwidth(A_surfxml_cluster_loopback___bw); if(strcmp(A_surfxml_cluster_loopback___lat,"")) cluster.loopback_lat = surf_parse_get_time(A_surfxml_cluster_loopback___lat); + + switch(AX_surfxml_cluster_topology){ + case A_surfxml_cluster_topology_FLAT: + cluster.topology= SURF_CLUSTER_FLAT ; + break; + case A_surfxml_cluster_topology_TORUS: + cluster.topology= SURF_CLUSTER_TORUS ; + break; + default: + surf_parse_error("Invalid cluster topology for cluster %s", + cluster.id); + break; + } + cluster.topo_parameters = A_surfxml_cluster_topo___parameters; cluster.router_id = A_surfxml_cluster_router___id; switch (AX_surfxml_cluster_sharing___policy) { @@ -599,10 +621,10 @@ void ETag_surfxml_link(void){ link.id = A_surfxml_link_id; link.bandwidth = surf_parse_get_bandwidth(A_surfxml_link_bandwidth); - //printf("Link bandwidth [%lg]\n", link.bandwidth); + //printf("Link bandwidth [%g]\n", link.bandwidth); link.bandwidth_trace = tmgr_trace_new_from_file(A_surfxml_link_bandwidth___file); link.latency = surf_parse_get_time(A_surfxml_link_latency); - //printf("Link latency [%lg]\n", link.latency); + //printf("Link latency [%g]\n", link.latency); link.latency_trace = tmgr_trace_new_from_file(A_surfxml_link_latency___file); switch (A_surfxml_link_state) { @@ -858,13 +880,11 @@ void ETag_surfxml_AS(void){ sg_platf_new_AS_end(); } -extern int _sg_init_status; /* FIXME: find a proper way to export this at some point */ - void STag_surfxml_config(void){ AS_TAG = 0; xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)"); XBT_DEBUG("START configuration name = %s",A_surfxml_config_id); - if (_sg_init_status == 2) { + if (_sg_cfg_init_status == 2) { surf_parse_error("All tags must be given before any platform elements (such as , , , , etc)."); } } @@ -929,6 +949,13 @@ void STag_surfxml_argument(void){ argv[(argc) - 1] = xbt_strdup(A_surfxml_argument_value); } +void STag_surfxml_model___prop(void){ + if (!current_model_property_set) + current_model_property_set = xbt_dict_new_homogeneous(xbt_free_f); + + xbt_dict_set(current_model_property_set, A_surfxml_model___prop_id, xbt_strdup(A_surfxml_model___prop_value), NULL); +} + /* ***************************************** */ /* TUTORIAL: New TAG */ void STag_surfxml_gpu(void) @@ -959,6 +986,7 @@ void ETag_surfxml_peer(void){} void STag_surfxml_backbone(void){} void ETag_surfxml_link___ctn(void){} void ETag_surfxml_argument(void){} +void ETag_surfxml_model___prop(void){} /* Open and Close parse file */