X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/290296c62f5642c1d74a9c902a57ab72ac230f1e..5dc2edab900d42d23920364fc24cb59b662e899d:/src/surf/xml/surfxml_sax_cb.cpp diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp index bd7ffc5d36..46fe64ba18 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -64,7 +64,7 @@ void surf_parse_assert_netpoint(std::string hostname, std::string pre, std::stri return a->name() < b->name(); }); bool first = true; - for (auto np : list) { + for (auto const& np : list) { if (np->isNetZone()) continue; @@ -114,7 +114,7 @@ static std::vector* explodesRadical(std::string radicals) // Make all hosts std::vector radical_elements; boost::split(radical_elements, radicals, boost::is_any_of(",")); - for (auto group : radical_elements) { + for (auto const& group : radical_elements) { std::vector radical_ends; boost::split(radical_ends, group, boost::is_any_of("-")); int start = surf_parse_get_int(radical_ends.front()); @@ -144,8 +144,9 @@ struct unit_scale { }; /* Note: field `unit' for the last element of parameter `units' should be nullptr. */ -static double surf_parse_get_value_with_unit(const char *string, const struct unit_scale *units, - const char *entity_kind, const char *name, const char *error_msg, const char *default_unit) +static double surf_parse_get_value_with_unit(const char* string, const struct unit_scale* units, + const char* entity_kind, std::string name, const char* error_msg, + const char* default_unit) { char* ptr; int i; @@ -159,7 +160,7 @@ static double surf_parse_get_value_with_unit(const char *string, const struct un if (res == 0) return res; // Ok, 0 can be unit-less - XBT_WARN("Deprecated unit-less value '%s' for %s %s. %s",string, entity_kind, name, error_msg); + XBT_WARN("Deprecated unit-less value '%s' for %s %s. %s", string, entity_kind, name.c_str(), error_msg); ptr = (char*)default_unit; } for (i = 0; units[i].unit != nullptr && strcmp(ptr, units[i].unit) != 0; i++); @@ -171,7 +172,7 @@ static double surf_parse_get_value_with_unit(const char *string, const struct un return res; } -double surf_parse_get_time(const char *string, const char *entity_kind, const char *name) +double surf_parse_get_time(const char* string, const char* entity_kind, std::string name) { const struct unit_scale units[] = { { "w", 7 * 24 * 60 * 60 }, @@ -189,7 +190,7 @@ double surf_parse_get_time(const char *string, const char *entity_kind, const ch "Append 's' to your time to get seconds", "s"); } -double surf_parse_get_size(const char *string, const char *entity_kind, const char *name) +double surf_parse_get_size(const char* string, const char* entity_kind, std::string name) { const struct unit_scale units[] = { { "EiB", pow(1024, 6) }, @@ -224,7 +225,7 @@ double surf_parse_get_size(const char *string, const char *entity_kind, const ch "Append 'B' to get bytes (or 'b' for bits but 1B = 8b).", "B"); } -double surf_parse_get_bandwidth(const char *string, const char *entity_kind, const char *name) +double surf_parse_get_bandwidth(const char* string, const char* entity_kind, std::string name) { const struct unit_scale units[] = { { "EiBps", pow(1024, 6) }, @@ -257,7 +258,7 @@ double surf_parse_get_bandwidth(const char *string, const char *entity_kind, con "Append 'Bps' to get bytes per second (or 'bps' for bits but 1Bps = 8bps)", "Bps"); } -double surf_parse_get_speed(const char *string, const char *entity_kind, const char *name) +double surf_parse_get_speed(const char* string, const char* entity_kind, std::string name) { const struct unit_scale units[] = { { "yottaflops", 1e24 }, @@ -284,7 +285,8 @@ double surf_parse_get_speed(const char *string, const char *entity_kind, const c "Append 'f' or 'flops' to your speed to get flop per second", "f"); } -static std::vector surf_parse_get_all_speeds(char* speeds, const char* entity_kind, const char* id){ +static std::vector surf_parse_get_all_speeds(char* speeds, const char* entity_kind, std::string id) +{ std::vector speed_per_pstate; @@ -389,6 +391,7 @@ static std::vector surf_parsed_filename_stack; void STag_surfxml_include() { + XBT_ERROR(" tag is deprecated, and will be removed in SimGrid v3.19. Please stop using it now (or tell us why you need it)."); parse_after_config(); XBT_DEBUG("STag_surfxml_include '%s'",A_surfxml_include_file); surf_parsed_filename_stack.push_back(surf_parsed_filename); // save old file name @@ -542,8 +545,7 @@ void ETag_surfxml_host() { void STag_surfxml_host___link(){ XBT_DEBUG("Create a Host_link for %s",A_surfxml_host___link_id); - s_sg_platf_host_link_cbarg_t host_link; - memset(&host_link,0,sizeof(host_link)); + HostLinkCreationArgs host_link; host_link.id = A_surfxml_host___link_id; host_link.link_up = A_surfxml_host___link_up; @@ -556,9 +558,8 @@ void STag_surfxml_router(){ } void ETag_surfxml_cluster(){ - s_sg_platf_cluster_cbarg_t cluster; - memset(&cluster,0,sizeof(cluster)); - cluster.properties = current_property_set; + ClusterCreationArgs cluster; + cluster.properties = current_property_set; current_property_set = nullptr; cluster.id = A_surfxml_cluster_id; @@ -799,7 +800,7 @@ void ETag_surfxml_route(){ route.link_list = new std::vector(); route.symmetrical = (A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES); - for (auto link: parsed_link_list) + for (auto const& link : parsed_link_list) route.link_list->push_back(link); parsed_link_list.clear(); @@ -829,7 +830,7 @@ void ETag_surfxml_zoneRoute() ASroute.link_list = new std::vector(); - for (auto link: parsed_link_list) + for (auto const& link : parsed_link_list) ASroute.link_list->push_back(link); parsed_link_list.clear(); @@ -858,7 +859,7 @@ void ETag_surfxml_bypassRoute(){ route.symmetrical = false; route.link_list = new std::vector(); - for (auto link: parsed_link_list) + for (auto const& link : parsed_link_list) route.link_list->push_back(link); parsed_link_list.clear(); @@ -882,7 +883,7 @@ void ETag_surfxml_bypassZoneRoute() ASroute.src = sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_src); ASroute.dst = sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_dst); ASroute.link_list = new std::vector(); - for (auto link: parsed_link_list) + for (auto const& link : parsed_link_list) ASroute.link_list->push_back(link); parsed_link_list.clear(); @@ -910,7 +911,6 @@ void STag_surfxml_trace___connect() { parse_after_config(); TraceConnectCreationArgs trace_connect; - memset(&trace_connect,0,sizeof(trace_connect)); trace_connect.element = A_surfxml_trace___connect_element; trace_connect.trace = A_surfxml_trace___connect_trace; @@ -981,7 +981,7 @@ void STag_surfxml_config() void ETag_surfxml_config() { - for (auto elm : *current_property_set) { + for (auto const& elm : *current_property_set) { if (xbt_cfg_is_default_value(elm.first.c_str())) { std::string cfg = elm.first + ":" + elm.second; xbt_cfg_set_parse(cfg.c_str()); @@ -1027,9 +1027,11 @@ void ETag_surfxml_actor() s_sg_platf_process_cbarg_t actor; memset(&actor,0,sizeof(actor)); + actor.properties = current_property_set; + current_property_set = nullptr; + actor.argc = argc; actor.argv = (const char **)argv; - actor.properties = current_property_set; actor.host = A_surfxml_actor_host; actor.function = A_surfxml_actor_function; actor.start_time = surf_parse_get_double(A_surfxml_actor_start___time); @@ -1054,8 +1056,6 @@ void ETag_surfxml_actor() xbt_free(argv[i]); xbt_free(argv); argv = nullptr; - - current_property_set = nullptr; } void STag_surfxml_argument(){