X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/965a836d38ed45cf03c17e93aa97bc9aaf2917c9..03d87ef83eada5a3cf9aacce9e6a5dc0d169aaa3:/src/surf/surfxml_parseplatf.cpp diff --git a/src/surf/surfxml_parseplatf.cpp b/src/surf/surfxml_parseplatf.cpp index 6fde67c693..51ce41a759 100644 --- a/src/surf/surfxml_parseplatf.cpp +++ b/src/surf/surfxml_parseplatf.cpp @@ -114,7 +114,7 @@ void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect) static int after_config_done; void parse_after_config() { if (!after_config_done) { - TRACE_start(); + TRACE_start(); /* Register classical callbacks */ storage_register_callbacks(); @@ -191,6 +191,17 @@ void parse_platform_file(const char *file) cpu->set_state_trace(trace); } + xbt_dict_foreach(trace_connect_list_host_speed, cursor, trace_name, elm) { + tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); + xbt_assert(trace, "Trace %s undefined", trace_name); + + simgrid::s4u::Host *host = sg_host_by_name(elm); + xbt_assert(host, "Host %s undefined", elm); + simgrid::surf::Cpu *cpu = host->pimpl_cpu; + + cpu->set_speed_trace(trace); + } + /* Free my data */ xbt_dict_free(&trace_connect_list_host_avail); @@ -199,7 +210,6 @@ void parse_platform_file(const char *file) xbt_dict_free(&trace_connect_list_link_bw); xbt_dict_free(&trace_connect_list_link_lat); xbt_dict_free(&traces_set_list); - xbt_dict_free(&random_data_list); xbt_dynar_free(&surfxml_bufferstack_stack); surf_parse_close();