X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b9625f82f86db0674e911887addce45dca31b57f..cf6a1d5f1eddea2b377415ab57c5185058488269:/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 f8fcade127..fc31b33291 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2021. 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. */ @@ -30,10 +30,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF std::string surf_parsed_filename; // Currently parsed file (for the error messages) std::vector parsed_link_list; /* temporary store of current link list of a route */ -std::vector parsed_disk_list; /* temporary store of current disk list of a host */ -/* - * Helping functions - */ + +/* Helping functions */ void surf_parse_assert(bool cond, const std::string& msg) { if (not cond) @@ -73,7 +71,7 @@ void surf_parse_assert_netpoint(const std::string& hostname, const std::string& break; } } - surf_parse_error(std::move(msg)); + surf_parse_error(msg); } double surf_parse_get_double(const std::string& s) @@ -95,10 +93,8 @@ int surf_parse_get_int(const std::string& s) } /* Turn something like "1-4,6,9-11" into the vector {1,2,3,4,6,9,10,11} */ -static std::vector* explodesRadical(const std::string& radicals) +static void explodesRadical(const std::string& radicals, std::vector* exploded) { - std::vector* exploded = new std::vector(); - // Make all hosts std::vector radical_elements; boost::split(radical_elements, radicals, boost::is_any_of(",")); @@ -121,8 +117,6 @@ static std::vector* explodesRadical(const std::string& radicals) for (int i = start; i <= end; i++) exploded->push_back(i); } - - return exploded; } @@ -133,73 +127,40 @@ static std::vector* explodesRadical(const std::string& radicals) /* make sure these symbols are defined as strong ones in this file so that the linker can resolve them */ -std::vector*> property_sets; +std::vector> property_sets; /* The default current property receiver. Setup in the corresponding opening callbacks. */ -std::unordered_map* current_model_property_set = nullptr; +std::unordered_map current_model_property_set; FILE *surf_file_to_parse = nullptr; /* Stuff relative to storage */ void STag_surfxml_storage() { - XBT_DEBUG("STag_surfxml_storage"); - property_sets.push_back(new std::unordered_map()); + xbt_die(" tag was removed in SimGrid v3.27. Please stop using it now."); } void ETag_surfxml_storage() { - simgrid::kernel::routing::StorageCreationArgs storage; - - storage.properties = property_sets.back(); - property_sets.pop_back(); - - storage.filename = surf_parsed_filename; - storage.lineno = surf_parse_lineno; - storage.id = A_surfxml_storage_id; - storage.type_id = A_surfxml_storage_typeId; - storage.content = A_surfxml_storage_content; - storage.attach = A_surfxml_storage_attach; - - sg_platf_new_storage(&storage); + /* Won't happen since is now removed since v3.27. */ } void STag_surfxml_storage___type() { - XBT_DEBUG("STag_surfxml_storage___type"); - property_sets.push_back(new std::unordered_map()); - xbt_assert(current_model_property_set == nullptr, "Someone forgot to reset the model property set to nullptr in its closing tag (or XML malformed)"); + xbt_die(" tag was removed in SimGrid v3.27. Please stop using it now."); } void ETag_surfxml_storage___type() { - simgrid::kernel::routing::StorageTypeCreationArgs storage_type; - - storage_type.properties = property_sets.back(); - property_sets.pop_back(); - - storage_type.model_properties = current_model_property_set; - current_model_property_set = nullptr; - - 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.size = - static_cast(surf_parse_get_size(surf_parsed_filename, surf_parse_lineno, A_surfxml_storage___type_size, - "size of storage type", storage_type.id.c_str())); - sg_platf_new_storage_type(&storage_type); + /* Won't happen since is now removed since v3.27. */ } void STag_surfxml_mount() { - XBT_DEBUG("STag_surfxml_mount"); + xbt_die(" tag was removed in SimGrid v3.27. Please stop using it now."); } void ETag_surfxml_mount() { - simgrid::kernel::routing::MountCreationArgs mount; - - mount.name = A_surfxml_mount_name; - mount.storageId = A_surfxml_mount_storageId; - sg_platf_new_mount(&mount); + /* Won't happen since is now removed since v3.27. */ } void STag_surfxml_include() @@ -263,23 +224,17 @@ void ETag_surfxml_platform(){ simgrid::s4u::Engine::on_platform_created(); } -void STag_surfxml_host(){ - property_sets.push_back(new std::unordered_map()); -} - void STag_surfxml_prop() { - property_sets.back()->insert({A_surfxml_prop_id, A_surfxml_prop_value}); + property_sets.back().insert({A_surfxml_prop_id, A_surfxml_prop_value}); XBT_DEBUG("add prop %s=%s into current property set %p", A_surfxml_prop_id, A_surfxml_prop_value, - property_sets.back()); + &(property_sets.back())); } -void ETag_surfxml_host() { +void STag_surfxml_host() +{ simgrid::kernel::routing::HostCreationArgs host; - - host.properties = property_sets.back(); - property_sets.pop_back(); - + property_sets.emplace_back(); host.id = A_surfxml_host_id; host.speed_per_pstate = @@ -288,7 +243,6 @@ void ETag_surfxml_host() { XBT_DEBUG("pstate: %s", A_surfxml_host_pstate); host.core_amount = surf_parse_get_int(A_surfxml_host_core); - host.speed_trace = nullptr; if (A_surfxml_host_availability___file[0] != '\0') { XBT_WARN("The availability_file attribute in is now deprecated. Please, use 'speed_file' instead."); host.speed_trace = simgrid::kernel::profile::Profile::from_file(A_surfxml_host_availability___file); @@ -298,15 +252,21 @@ void ETag_surfxml_host() { host.state_trace = A_surfxml_host_state___file[0] ? simgrid::kernel::profile::Profile::from_file(A_surfxml_host_state___file) : nullptr; - host.pstate = surf_parse_get_int(A_surfxml_host_pstate); host.coord = A_surfxml_host_coordinates; - host.disks.swap(parsed_disk_list); - sg_platf_new_host(&host); + sg_platf_new_host_begin(&host); +} + +void ETag_surfxml_host() +{ + sg_platf_new_host_set_properties(property_sets.back()); + property_sets.pop_back(); + + sg_platf_new_host_seal(surf_parse_get_int(A_surfxml_host_pstate)); } void STag_surfxml_disk() { - property_sets.push_back(new std::unordered_map()); + property_sets.emplace_back(); } void ETag_surfxml_disk() { @@ -320,7 +280,7 @@ void ETag_surfxml_disk() { disk.write_bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_disk_write___bw, "write_bw of disk ", disk.id); - parsed_disk_list.push_back(sg_platf_new_disk(&disk)); + sg_platf_new_disk(&disk); } void STag_surfxml_host___link(){ @@ -345,7 +305,8 @@ void ETag_surfxml_cluster(){ cluster.id = A_surfxml_cluster_id; cluster.prefix = A_surfxml_cluster_prefix; cluster.suffix = A_surfxml_cluster_suffix; - cluster.radicals = explodesRadical(A_surfxml_cluster_radical); + explodesRadical(A_surfxml_cluster_radical, &cluster.radicals); + cluster.speeds = xbt_parse_get_all_speeds(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_speed, "speed of cluster", cluster.id); cluster.core_amount = surf_parse_get_int(A_surfxml_cluster_core); @@ -417,11 +378,11 @@ void ETag_surfxml_cluster(){ surf_parse_error(std::string("Invalid bb sharing policy in cluster ") + cluster.id); } - sg_platf_new_cluster(&cluster); + sg_platf_new_tag_cluster(&cluster); } void STag_surfxml_cluster(){ - property_sets.push_back(new std::unordered_map()); + property_sets.emplace_back(); } void STag_surfxml_cabinet(){ @@ -435,7 +396,7 @@ void STag_surfxml_cabinet(){ cabinet.id.c_str()); cabinet.lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_cabinet_lat, "lat of cabinet", cabinet.id.c_str()); - cabinet.radicals = explodesRadical(A_surfxml_cabinet_radical); + explodesRadical(A_surfxml_cabinet_radical, &cabinet.radicals); sg_platf_new_cabinet(&cabinet); } @@ -470,7 +431,7 @@ void STag_surfxml_peer(){ } void STag_surfxml_link(){ - property_sets.push_back(new std::unordered_map()); + property_sets.emplace_back(); } void ETag_surfxml_link(){ @@ -536,7 +497,7 @@ void STag_surfxml_link___ctn() surf_parse_error(std::string("Invalid direction for link ") + A_surfxml_link___ctn_id); } - const char* dirname = ""; + const char* dirname; switch (A_surfxml_link___ctn_direction) { case A_surfxml_link___ctn_direction_UP: dirname = " (upward)"; @@ -551,19 +512,19 @@ void STag_surfxml_link___ctn() parsed_link_list.push_back(link); } -void ETag_surfxml_backbone(){ - simgrid::kernel::routing::LinkCreationArgs link; +void ETag_surfxml_backbone() +{ + auto link = std::make_unique(); - link.properties = nullptr; - link.id = std::string(A_surfxml_backbone_id); - link.bandwidths.push_back(xbt_parse_get_bandwidth( - surf_parsed_filename, surf_parse_lineno, A_surfxml_backbone_bandwidth, "bandwidth of backbone", link.id.c_str())); - link.latency = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_backbone_latency, - "latency of backbone", link.id.c_str()); - link.policy = simgrid::s4u::Link::SharingPolicy::SHARED; + link->id = std::string(A_surfxml_backbone_id); + link->bandwidths.push_back(xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, + A_surfxml_backbone_bandwidth, "bandwidth of backbone", + link->id.c_str())); + link->latency = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_backbone_latency, + "latency of backbone", link->id.c_str()); + link->policy = simgrid::s4u::Link::SharingPolicy::SHARED; - sg_platf_new_link(&link); - routing_cluster_add_backbone(simgrid::s4u::Link::by_name(std::string(A_surfxml_backbone_id))->get_impl()); + routing_cluster_add_backbone(std::move(link)); } void STag_surfxml_route(){ @@ -608,9 +569,9 @@ void ETag_surfxml_route(){ route.src = sg_netpoint_by_name_or_null(A_surfxml_route_src); // tested to not be nullptr in start tag route.dst = sg_netpoint_by_name_or_null(A_surfxml_route_dst); // tested to not be nullptr in start tag - route.gw_src = nullptr; - route.gw_dst = nullptr; - route.symmetrical = (A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES); + route.symmetrical = (A_surfxml_route_symmetrical == AU_surfxml_route_symmetrical || + A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES || + A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_yes); route.link_list.swap(parsed_link_list); @@ -638,17 +599,9 @@ void ETag_surfxml_zoneRoute() ASroute.link_list.swap(parsed_link_list); - switch (A_surfxml_zoneRoute_symmetrical) { - case AU_surfxml_zoneRoute_symmetrical: - case A_surfxml_zoneRoute_symmetrical_YES: - ASroute.symmetrical = true; - break; - case A_surfxml_zoneRoute_symmetrical_NO: - ASroute.symmetrical = false; - break; - default: - THROW_IMPOSSIBLE; - } + ASroute.symmetrical = (A_surfxml_zoneRoute_symmetrical == AU_surfxml_zoneRoute_symmetrical || + A_surfxml_zoneRoute_symmetrical == A_surfxml_zoneRoute_symmetrical_YES || + A_surfxml_zoneRoute_symmetrical == A_surfxml_zoneRoute_symmetrical_yes); sg_platf_new_route(&ASroute); } @@ -658,8 +611,6 @@ void ETag_surfxml_bypassRoute(){ route.src = sg_netpoint_by_name_or_null(A_surfxml_bypassRoute_src); // tested to not be nullptr in start tag route.dst = sg_netpoint_by_name_or_null(A_surfxml_bypassRoute_dst); // tested to not be nullptr in start tag - route.gw_src = nullptr; - route.gw_dst = nullptr; route.symmetrical = false; route.link_list.swap(parsed_link_list); @@ -735,7 +686,7 @@ void STag_surfxml_trace___connect() void STag_surfxml_AS() { AX_surfxml_zone_id = AX_surfxml_AS_id; - AX_surfxml_zone_routing = (AT_surfxml_zone_routing)AX_surfxml_AS_routing; + AX_surfxml_zone_routing = AX_surfxml_AS_routing; STag_surfxml_zone(); } @@ -746,25 +697,23 @@ void ETag_surfxml_AS() void STag_surfxml_zone() { - property_sets.push_back(new std::unordered_map()); + property_sets.emplace_back(); simgrid::kernel::routing::ZoneCreationArgs zone; zone.id = A_surfxml_zone_id; - zone.routing = static_cast(A_surfxml_zone_routing); + zone.routing = A_surfxml_zone_routing; sg_platf_new_Zone_begin(&zone); } void ETag_surfxml_zone() { sg_platf_new_Zone_set_properties(property_sets.back()); - delete property_sets.back(); property_sets.pop_back(); - sg_platf_new_Zone_seal(); } void STag_surfxml_config() { - property_sets.push_back(new std::unordered_map()); + property_sets.emplace_back(); XBT_DEBUG("START configuration name = %s",A_surfxml_config_id); if (_sg_cfg_init_status == 2) { surf_parse_error("All tags must be given before any platform elements (such as , , , " @@ -779,20 +728,19 @@ void ETag_surfxml_config() auto current_property_set = property_sets.back(); std::vector keys; - for (auto const& kv : *current_property_set) { + for (auto const& kv : current_property_set) { keys.push_back(kv.first); } std::sort(keys.begin(), keys.end()); - for (std::string key : keys) { + for (const std::string& key : keys) { if (simgrid::config::is_default(key.c_str())) { - std::string cfg = key + ":" + current_property_set->at(key); - simgrid::config::set_parse(std::move(cfg)); + std::string cfg = key + ":" + current_property_set.at(key); + simgrid::config::set_parse(cfg); } else XBT_INFO("The custom configuration '%s' is already defined by user!", key.c_str()); } XBT_DEBUG("End configuration name = %s",A_surfxml_config_id); - delete current_property_set; property_sets.pop_back(); } @@ -806,7 +754,7 @@ void STag_surfxml_process() void STag_surfxml_actor() { - property_sets.push_back(new std::unordered_map()); + property_sets.emplace_back(); arguments.assign(1, A_surfxml_actor_function); } @@ -849,14 +797,11 @@ void ETag_surfxml_actor() } void STag_surfxml_argument(){ - arguments.push_back(A_surfxml_argument_value); + arguments.emplace_back(A_surfxml_argument_value); } void STag_surfxml_model___prop(){ - if (not current_model_property_set) - current_model_property_set = new std::unordered_map(); - - current_model_property_set->insert({A_surfxml_model___prop_id, A_surfxml_model___prop_value}); + current_model_property_set.insert({A_surfxml_model___prop_id, A_surfxml_model___prop_value}); } void ETag_surfxml_prop(){/* Nothing to do */}