X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bb8f6bfd84abe7eb538cdeb93cf77c4a2d47e3f5..237fd22b56db7d1c67360c37559ce3aab16a002d:/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 3647205430..62947af7a7 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. */ @@ -28,12 +28,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module"); 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 - */ +std::vector parsed_link_list; /* temporary store of current link list of a route */ + +/* Helping functions */ void surf_parse_assert(bool cond, const std::string& msg) { if (not cond) @@ -95,10 +92,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) { - auto* exploded = new std::vector(); - // Make all hosts std::vector radical_elements; boost::split(radical_elements, radicals, boost::is_any_of(",")); @@ -121,8 +116,6 @@ static std::vector* explodesRadical(const std::string& radicals) for (int i = start; i <= end; i++) exploded->push_back(i); } - - return exploded; } @@ -133,73 +126,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,27 +223,21 @@ 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 = - xbt_parse_get_all_speeds(surf_parsed_filename, surf_parse_lineno, A_surfxml_host_speed, "speed of host", host.id); + host.speed_per_pstate = xbt_parse_get_all_speeds(surf_parsed_filename, surf_parse_lineno, A_surfxml_host_speed, + "speed of host " + host.id); XBT_DEBUG("pstate: %s", A_surfxml_host_pstate); host.core_amount = surf_parse_get_int(A_surfxml_host_core); @@ -297,15 +251,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() { @@ -315,11 +275,11 @@ void ETag_surfxml_disk() { disk.id = A_surfxml_disk_id; disk.read_bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_disk_read___bw, - "read_bw of disk ", disk.id); + "read_bw of disk " + disk.id); disk.write_bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_disk_write___bw, - "write_bw of disk ", disk.id); + "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(){ @@ -344,30 +304,32 @@ 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); - cluster.speeds = xbt_parse_get_all_speeds(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_speed, - "speed of cluster", cluster.id); + 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); - cluster.bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_bw, "bw of cluster", - cluster.id); - cluster.lat = - xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_lat, "lat of cluster", cluster.id); + cluster.bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_bw, + "bw of cluster " + cluster.id); + cluster.lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_lat, + "lat of cluster " + cluster.id); if(strcmp(A_surfxml_cluster_bb___bw,"")) cluster.bb_bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_bb___bw, - "bb_bw of cluster", cluster.id); + "bb_bw of cluster " + cluster.id); if(strcmp(A_surfxml_cluster_bb___lat,"")) cluster.bb_lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_bb___lat, - "bb_lat of cluster", cluster.id); + "bb_lat of cluster " + cluster.id); if(strcmp(A_surfxml_cluster_limiter___link,"")) cluster.limiter_link = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_limiter___link, - "limiter_link of cluster", cluster.id); + "limiter_link of cluster " + cluster.id); if(strcmp(A_surfxml_cluster_loopback___bw,"")) - cluster.loopback_bw = xbt_parse_get_bandwidth( - surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_loopback___bw, "loopback_bw of cluster", cluster.id); + cluster.loopback_bw = + xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_loopback___bw, + "loopback_bw of cluster " + cluster.id); if(strcmp(A_surfxml_cluster_loopback___lat,"")) cluster.loopback_lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_loopback___lat, - "loopback_lat of cluster", cluster.id); + "loopback_lat of cluster " + cluster.id); switch(AX_surfxml_cluster_topology){ case A_surfxml_cluster_topology_FLAT: @@ -416,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(){ @@ -429,12 +391,12 @@ void STag_surfxml_cabinet(){ cabinet.prefix = A_surfxml_cabinet_prefix; cabinet.suffix = A_surfxml_cabinet_suffix; cabinet.speed = xbt_parse_get_speed(surf_parsed_filename, surf_parse_lineno, A_surfxml_cabinet_speed, - "speed of cabinet", cabinet.id.c_str()); - cabinet.bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_cabinet_bw, "bw of 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); + "speed of cabinet " + cabinet.id); + cabinet.bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_cabinet_bw, + "bw of cabinet " + cabinet.id); + cabinet.lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_cabinet_lat, + "lat of cabinet " + cabinet.id); + explodesRadical(A_surfxml_cabinet_radical, &cabinet.radicals); sg_platf_new_cabinet(&cabinet); } @@ -443,12 +405,12 @@ void STag_surfxml_peer(){ simgrid::kernel::routing::PeerCreationArgs peer; peer.id = std::string(A_surfxml_peer_id); - peer.speed = xbt_parse_get_speed(surf_parsed_filename, surf_parse_lineno, A_surfxml_peer_speed, "speed of peer", - peer.id.c_str()); - peer.bw_in = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_peer_bw___in, "bw_in of peer", - peer.id.c_str()); - peer.bw_out = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_peer_bw___out, - "bw_out of peer", peer.id.c_str()); + peer.speed = + xbt_parse_get_speed(surf_parsed_filename, surf_parse_lineno, A_surfxml_peer_speed, "speed of peer " + peer.id); + peer.bw_in = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_peer_bw___in, + "bw_in of peer " + peer.id); + peer.bw_out = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_peer_bw___out, + "bw_out of peer " + peer.id); peer.coord = A_surfxml_peer_coordinates; peer.speed_trace = nullptr; if (A_surfxml_peer_availability___file[0] != '\0') { @@ -469,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(){ @@ -480,12 +442,12 @@ void ETag_surfxml_link(){ link.id = std::string(A_surfxml_link_id); link.bandwidths = xbt_parse_get_bandwidths(surf_parsed_filename, surf_parse_lineno, A_surfxml_link_bandwidth, - "bandwidth of link", link.id.c_str()); + "bandwidth of link " + link.id); link.bandwidth_trace = A_surfxml_link_bandwidth___file[0] ? simgrid::kernel::profile::Profile::from_file(A_surfxml_link_bandwidth___file) : nullptr; - link.latency = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_link_latency, "latency of link", - link.id.c_str()); + link.latency = + xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_link_latency, "latency of link " + link.id); link.latency_trace = A_surfxml_link_latency___file[0] ? simgrid::kernel::profile::Profile::from_file(A_surfxml_link_latency___file) : nullptr; @@ -519,23 +481,26 @@ void ETag_surfxml_link(){ void STag_surfxml_link___ctn() { - simgrid::kernel::resource::LinkImpl* link = nullptr; + const simgrid::s4u::Link* link; + simgrid::s4u::LinkInRoute::Direction direction = simgrid::s4u::LinkInRoute::Direction::NONE; switch (A_surfxml_link___ctn_direction) { case AU_surfxml_link___ctn_direction: case A_surfxml_link___ctn_direction_NONE: - link = simgrid::s4u::Link::by_name(std::string(A_surfxml_link___ctn_id))->get_impl(); + link = simgrid::s4u::Link::by_name(std::string(A_surfxml_link___ctn_id)); break; case A_surfxml_link___ctn_direction_UP: - link = simgrid::s4u::Link::by_name(std::string(A_surfxml_link___ctn_id) + "_UP")->get_impl(); + link = simgrid::s4u::SplitDuplexLink::by_name(std::string(A_surfxml_link___ctn_id)); + direction = simgrid::s4u::LinkInRoute::Direction::UP; break; case A_surfxml_link___ctn_direction_DOWN: - link = simgrid::s4u::Link::by_name(std::string(A_surfxml_link___ctn_id) + "_DOWN")->get_impl(); + link = simgrid::s4u::SplitDuplexLink::by_name(std::string(A_surfxml_link___ctn_id)); + direction = simgrid::s4u::LinkInRoute::Direction::DOWN; break; default: 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)"; @@ -547,21 +512,21 @@ void STag_surfxml_link___ctn() dirname = ""; } surf_parse_assert(link != nullptr, std::string("No such link: '") + A_surfxml_link___ctn_id + "'" + dirname); - parsed_link_list.push_back(link); + parsed_link_list.emplace_back(link, direction); } -void ETag_surfxml_backbone(){ - simgrid::kernel::routing::LinkCreationArgs link; +void ETag_surfxml_backbone() +{ + auto link = std::make_unique(); - 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)); + link->latency = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_backbone_latency, + "latency of backbone " + link->id); + 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(){ @@ -652,7 +617,7 @@ void ETag_surfxml_bypassRoute(){ route.link_list.swap(parsed_link_list); - sg_platf_new_bypassRoute(&route); + sg_platf_new_bypass_route(&route); } void ETag_surfxml_bypassASroute() @@ -676,7 +641,7 @@ void ETag_surfxml_bypassZoneRoute() ASroute.gw_src = sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_gw___src); ASroute.gw_dst = sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_gw___dst); - sg_platf_new_bypassRoute(&ASroute); + sg_platf_new_bypass_route(&ASroute); } void ETag_surfxml_trace(){ @@ -734,25 +699,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 = A_surfxml_zone_routing; - sg_platf_new_Zone_begin(&zone); + sg_platf_new_zone_begin(&zone); } void ETag_surfxml_zone() { - sg_platf_new_Zone_set_properties(property_sets.back()); - delete property_sets.back(); + sg_platf_new_zone_set_properties(property_sets.back()); property_sets.pop_back(); - - sg_platf_new_Zone_seal(); + 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 , , , " @@ -767,20 +730,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); + 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(); } @@ -794,7 +756,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); } @@ -841,10 +803,7 @@ void STag_surfxml_argument(){ } 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 */}