static FILE* surf_file_to_parse = nullptr;
/* Stuff relative to storage */
-void STag_surfxml_storage()
+void STag_simgrid_parse_storage()
{
xbt_die("<storage> tag was removed in SimGrid v3.27. Please stop using it now.");
}
-void ETag_surfxml_storage()
+void ETag_simgrid_parse_storage()
{
/* Won't happen since <storage> is now removed since v3.27. */
}
-void STag_surfxml_storage___type()
+void STag_simgrid_parse_storage___type()
{
xbt_die("<storage_type> tag was removed in SimGrid v3.27. Please stop using it now.");
}
-void ETag_surfxml_storage___type()
+void ETag_simgrid_parse_storage___type()
{
/* Won't happen since <storage_type> is now removed since v3.27. */
}
-void STag_surfxml_mount()
+void STag_simgrid_parse_mount()
{
xbt_die("<mount> tag was removed in SimGrid v3.27. Please stop using it now.");
}
-void ETag_surfxml_mount()
+void ETag_simgrid_parse_mount()
{
/* Won't happen since <mount> is now removed since v3.27. */
}
-void STag_surfxml_include()
+void STag_simgrid_parse_include()
{
xbt_die("<include> tag was removed in SimGrid v3.18. Please stop using it now.");
}
-void ETag_surfxml_include()
+void ETag_simgrid_parse_include()
{
/* Won't happen since <include> is now removed since v3.18. */
}
/* Stag and Etag parse functions */
-void STag_surfxml_platform() {
+void STag_simgrid_parse_platform() {
/* Use fixed point arithmetic to avoid rounding errors ("4.1" for example cannot be represented exactly as a floating
* point number) */
- const long int version = lround(100.0 * surf_parse_get_double(A_surfxml_platform_version));
+ const long int version = lround(100.0 * surf_parse_get_double(A_simgrid_parse_platform_version));
const std::string version_string = std::to_string(version / 100) + "." + std::to_string(version % 100);
surf_parse_assert(version >= 100L, "******* BIG FAT WARNING *********\n "
"The most recent formalism that this version of SimGrid understands is v4.1.\n"
"Please update your code, or use another, more adapted, file.");
}
-void ETag_surfxml_platform(){
+void ETag_simgrid_parse_platform(){
simgrid::s4u::Engine::on_platform_created();
}
-void STag_surfxml_prop()
+void STag_simgrid_parse_prop()
{
- property_sets.back().try_emplace(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().try_emplace(A_simgrid_parse_prop_id, A_simgrid_parse_prop_value);
+ XBT_DEBUG("add prop %s=%s into current property set %p", A_simgrid_parse_prop_id, A_simgrid_parse_prop_value,
&(property_sets.back()));
}
-void STag_surfxml_host()
+void STag_simgrid_parse_host()
{
simgrid::kernel::routing::HostCreationArgs host;
property_sets.emplace_back();
- host.id = A_surfxml_host_id;
+ host.id = A_simgrid_parse_host_id;
- host.speed_per_pstate = xbt_parse_get_all_speeds(surf_parsed_filename, surf_parse_lineno, A_surfxml_host_speed,
+ host.speed_per_pstate = xbt_parse_get_all_speeds(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_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);
+ XBT_DEBUG("pstate: %s", A_simgrid_parse_host_pstate);
+ host.core_amount = surf_parse_get_int(A_simgrid_parse_host_core);
- if (A_surfxml_host_availability___file[0] != '\0') {
+ if (A_simgrid_parse_host_availability___file[0] != '\0') {
XBT_WARN("The availability_file attribute in <host> is now deprecated. Please, use 'speed_file' instead.");
- host.speed_trace = simgrid::kernel::profile::ProfileBuilder::from_file(A_surfxml_host_availability___file);
+ host.speed_trace = simgrid::kernel::profile::ProfileBuilder::from_file(A_simgrid_parse_host_availability___file);
}
- if (A_surfxml_host_speed___file[0] != '\0')
- host.speed_trace = simgrid::kernel::profile::ProfileBuilder::from_file(A_surfxml_host_speed___file);
- host.state_trace = A_surfxml_host_state___file[0]
- ? simgrid::kernel::profile::ProfileBuilder::from_file(A_surfxml_host_state___file)
+ if (A_simgrid_parse_host_speed___file[0] != '\0')
+ host.speed_trace = simgrid::kernel::profile::ProfileBuilder::from_file(A_simgrid_parse_host_speed___file);
+ host.state_trace = A_simgrid_parse_host_state___file[0]
+ ? simgrid::kernel::profile::ProfileBuilder::from_file(A_simgrid_parse_host_state___file)
: nullptr;
- host.coord = A_surfxml_host_coordinates;
+ host.coord = A_simgrid_parse_host_coordinates;
sg_platf_new_host_begin(&host);
}
-void ETag_surfxml_host()
+void ETag_simgrid_parse_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));
+ sg_platf_new_host_seal(surf_parse_get_int(A_simgrid_parse_host_pstate));
}
-void STag_surfxml_disk() {
+void STag_simgrid_parse_disk() {
property_sets.emplace_back();
}
-void ETag_surfxml_disk() {
+void ETag_simgrid_parse_disk() {
simgrid::kernel::routing::DiskCreationArgs disk;
disk.properties = property_sets.back();
property_sets.pop_back();
- disk.id = A_surfxml_disk_id;
- disk.read_bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_disk_read___bw,
+ disk.id = A_simgrid_parse_disk_id;
+ disk.read_bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_disk_read___bw,
"read_bw of disk " + disk.id);
- disk.write_bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_disk_write___bw,
+ disk.write_bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_disk_write___bw,
"write_bw of disk " + disk.id);
sg_platf_new_disk(&disk);
}
-void STag_surfxml_host___link(){
- XBT_DEBUG("Create a Host_link for %s",A_surfxml_host___link_id);
+void STag_simgrid_parse_host___link(){
+ XBT_DEBUG("Create a Host_link for %s",A_simgrid_parse_host___link_id);
simgrid::kernel::routing::HostLinkCreationArgs host_link;
- host_link.id = A_surfxml_host___link_id;
- host_link.link_up = A_surfxml_host___link_up;
- host_link.link_down = A_surfxml_host___link_down;
+ host_link.id = A_simgrid_parse_host___link_id;
+ host_link.link_up = A_simgrid_parse_host___link_up;
+ host_link.link_down = A_simgrid_parse_host___link_down;
sg_platf_new_hostlink(&host_link);
}
-void STag_surfxml_router(){
- sg_platf_new_router(A_surfxml_router_id, A_surfxml_router_coordinates);
+void STag_simgrid_parse_router(){
+ sg_platf_new_router(A_simgrid_parse_router_id, A_simgrid_parse_router_coordinates);
}
-void ETag_surfxml_cluster(){
+void ETag_simgrid_parse_cluster(){
simgrid::kernel::routing::ClusterCreationArgs cluster;
cluster.properties = property_sets.back();
property_sets.pop_back();
- cluster.id = A_surfxml_cluster_id;
- cluster.prefix = A_surfxml_cluster_prefix;
- cluster.suffix = A_surfxml_cluster_suffix;
- explodesRadical(A_surfxml_cluster_radical, &cluster.radicals);
+ cluster.id = A_simgrid_parse_cluster_id;
+ cluster.prefix = A_simgrid_parse_cluster_prefix;
+ cluster.suffix = A_simgrid_parse_cluster_suffix;
+ explodesRadical(A_simgrid_parse_cluster_radical, &cluster.radicals);
- cluster.speeds = xbt_parse_get_all_speeds(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_speed,
+ cluster.speeds = xbt_parse_get_all_speeds(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_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,
+ cluster.core_amount = surf_parse_get_int(A_simgrid_parse_cluster_core);
+ cluster.bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cluster_bw,
"bw of cluster " + cluster.id);
- cluster.lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_lat,
+ cluster.lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_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,
+ if(strcmp(A_simgrid_parse_cluster_bb___bw,""))
+ cluster.bb_bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cluster_bb___bw,
"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,
+ if(strcmp(A_simgrid_parse_cluster_bb___lat,""))
+ cluster.bb_lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cluster_bb___lat,
"bb_lat of cluster " + cluster.id);
- if(strcmp(A_surfxml_cluster_limiter___link,""))
+ if(strcmp(A_simgrid_parse_cluster_limiter___link,""))
cluster.limiter_link =
- xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_limiter___link,
+ xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cluster_limiter___link,
"limiter_link of cluster " + cluster.id);
- if(strcmp(A_surfxml_cluster_loopback___bw,""))
+ if(strcmp(A_simgrid_parse_cluster_loopback___bw,""))
cluster.loopback_bw =
- xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_loopback___bw,
+ xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_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,
+ if(strcmp(A_simgrid_parse_cluster_loopback___lat,""))
+ cluster.loopback_lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cluster_loopback___lat,
"loopback_lat of cluster " + cluster.id);
- switch(AX_surfxml_cluster_topology){
- case A_surfxml_cluster_topology_FLAT:
+ switch(AX_simgrid_parse_cluster_topology){
+ case A_simgrid_parse_cluster_topology_FLAT:
cluster.topology = simgrid::kernel::routing::ClusterTopology::FLAT;
break;
- case A_surfxml_cluster_topology_TORUS:
+ case A_simgrid_parse_cluster_topology_TORUS:
cluster.topology = simgrid::kernel::routing::ClusterTopology::TORUS;
break;
- case A_surfxml_cluster_topology_FAT___TREE:
+ case A_simgrid_parse_cluster_topology_FAT___TREE:
cluster.topology = simgrid::kernel::routing::ClusterTopology::FAT_TREE;
break;
- case A_surfxml_cluster_topology_DRAGONFLY:
+ case A_simgrid_parse_cluster_topology_DRAGONFLY:
cluster.topology = simgrid::kernel::routing::ClusterTopology::DRAGONFLY;
break;
default:
surf_parse_error("Invalid cluster topology for cluster " + cluster.id);
}
- cluster.topo_parameters = A_surfxml_cluster_topo___parameters;
- cluster.router_id = A_surfxml_cluster_router___id;
+ cluster.topo_parameters = A_simgrid_parse_cluster_topo___parameters;
+ cluster.router_id = A_simgrid_parse_cluster_router___id;
- switch (AX_surfxml_cluster_sharing___policy) {
- case A_surfxml_cluster_sharing___policy_SHARED:
+ switch (AX_simgrid_parse_cluster_sharing___policy) {
+ case A_simgrid_parse_cluster_sharing___policy_SHARED:
cluster.sharing_policy = simgrid::s4u::Link::SharingPolicy::SHARED;
break;
- case A_surfxml_cluster_sharing___policy_FULLDUPLEX:
+ case A_simgrid_parse_cluster_sharing___policy_FULLDUPLEX:
XBT_WARN("FULLDUPLEX is now deprecated. Please update your platform file to use SPLITDUPLEX instead.");
cluster.sharing_policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX;
break;
- case A_surfxml_cluster_sharing___policy_SPLITDUPLEX:
+ case A_simgrid_parse_cluster_sharing___policy_SPLITDUPLEX:
cluster.sharing_policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX;
break;
- case A_surfxml_cluster_sharing___policy_FATPIPE:
+ case A_simgrid_parse_cluster_sharing___policy_FATPIPE:
cluster.sharing_policy = simgrid::s4u::Link::SharingPolicy::FATPIPE;
break;
default:
surf_parse_error("Invalid cluster sharing policy for cluster " + cluster.id);
}
- switch (AX_surfxml_cluster_bb___sharing___policy) {
- case A_surfxml_cluster_bb___sharing___policy_FATPIPE:
+ switch (AX_simgrid_parse_cluster_bb___sharing___policy) {
+ case A_simgrid_parse_cluster_bb___sharing___policy_FATPIPE:
cluster.bb_sharing_policy = simgrid::s4u::Link::SharingPolicy::FATPIPE;
break;
- case A_surfxml_cluster_bb___sharing___policy_SHARED:
+ case A_simgrid_parse_cluster_bb___sharing___policy_SHARED:
cluster.bb_sharing_policy = simgrid::s4u::Link::SharingPolicy::SHARED;
break;
default:
sg_platf_new_tag_cluster(&cluster);
}
-void STag_surfxml_cluster(){
+void STag_simgrid_parse_cluster(){
property_sets.emplace_back();
}
-void STag_surfxml_cabinet(){
+void STag_simgrid_parse_cabinet(){
simgrid::kernel::routing::CabinetCreationArgs cabinet;
- cabinet.id = A_surfxml_cabinet_id;
- 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,
+ cabinet.id = A_simgrid_parse_cabinet_id;
+ cabinet.prefix = A_simgrid_parse_cabinet_prefix;
+ cabinet.suffix = A_simgrid_parse_cabinet_suffix;
+ cabinet.speed = xbt_parse_get_speed(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cabinet_speed,
"speed of cabinet " + cabinet.id);
- cabinet.bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_cabinet_bw,
+ cabinet.bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cabinet_bw,
"bw of cabinet " + cabinet.id);
- cabinet.lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_cabinet_lat,
+ cabinet.lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cabinet_lat,
"lat of cabinet " + cabinet.id);
- explodesRadical(A_surfxml_cabinet_radical, &cabinet.radicals);
+ explodesRadical(A_simgrid_parse_cabinet_radical, &cabinet.radicals);
sg_platf_new_cabinet(&cabinet);
}
-void STag_surfxml_peer(){
+void STag_simgrid_parse_peer(){
simgrid::kernel::routing::PeerCreationArgs peer;
- peer.id = A_surfxml_peer_id;
+ peer.id = A_simgrid_parse_peer_id;
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,
+ xbt_parse_get_speed(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_peer_speed, "speed of peer " + peer.id);
+ peer.bw_in = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_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,
+ peer.bw_out = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_peer_bw___out,
"bw_out of peer " + peer.id);
- peer.coord = A_surfxml_peer_coordinates;
+ peer.coord = A_simgrid_parse_peer_coordinates;
peer.speed_trace = nullptr;
- if (A_surfxml_peer_availability___file[0] != '\0') {
+ if (A_simgrid_parse_peer_availability___file[0] != '\0') {
XBT_WARN("The availability_file attribute in <peer> is now deprecated. Please, use 'speed_file' instead.");
- peer.speed_trace = simgrid::kernel::profile::ProfileBuilder::from_file(A_surfxml_peer_availability___file);
+ peer.speed_trace = simgrid::kernel::profile::ProfileBuilder::from_file(A_simgrid_parse_peer_availability___file);
}
- if (A_surfxml_peer_speed___file[0] != '\0')
- peer.speed_trace = simgrid::kernel::profile::ProfileBuilder::from_file(A_surfxml_peer_speed___file);
- peer.state_trace = A_surfxml_peer_state___file[0]
- ? simgrid::kernel::profile::ProfileBuilder::from_file(A_surfxml_peer_state___file)
+ if (A_simgrid_parse_peer_speed___file[0] != '\0')
+ peer.speed_trace = simgrid::kernel::profile::ProfileBuilder::from_file(A_simgrid_parse_peer_speed___file);
+ peer.state_trace = A_simgrid_parse_peer_state___file[0]
+ ? simgrid::kernel::profile::ProfileBuilder::from_file(A_simgrid_parse_peer_state___file)
: nullptr;
- if (A_surfxml_peer_lat[0] != '\0')
+ if (A_simgrid_parse_peer_lat[0] != '\0')
XBT_WARN("The latency attribute in <peer> is now deprecated. Use the z coordinate instead of '%s'.",
- A_surfxml_peer_lat);
+ A_simgrid_parse_peer_lat);
sg_platf_new_peer(&peer);
}
-void STag_surfxml_link(){
+void STag_simgrid_parse_link(){
property_sets.emplace_back();
}
-void ETag_surfxml_link(){
+void ETag_simgrid_parse_link(){
simgrid::kernel::routing::LinkCreationArgs link;
link.properties = property_sets.back();
property_sets.pop_back();
- link.id = A_surfxml_link_id;
- link.bandwidths = xbt_parse_get_bandwidths(surf_parsed_filename, surf_parse_lineno, A_surfxml_link_bandwidth,
+ link.id = A_simgrid_parse_link_id;
+ link.bandwidths = xbt_parse_get_bandwidths(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_link_bandwidth,
"bandwidth of link " + link.id);
- link.bandwidth_trace = A_surfxml_link_bandwidth___file[0]
- ? simgrid::kernel::profile::ProfileBuilder::from_file(A_surfxml_link_bandwidth___file)
+ link.bandwidth_trace = A_simgrid_parse_link_bandwidth___file[0]
+ ? simgrid::kernel::profile::ProfileBuilder::from_file(A_simgrid_parse_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);
- link.latency_trace = A_surfxml_link_latency___file[0]
- ? simgrid::kernel::profile::ProfileBuilder::from_file(A_surfxml_link_latency___file)
+ xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_link_latency, "latency of link " + link.id);
+ link.latency_trace = A_simgrid_parse_link_latency___file[0]
+ ? simgrid::kernel::profile::ProfileBuilder::from_file(A_simgrid_parse_link_latency___file)
: nullptr;
- link.state_trace = A_surfxml_link_state___file[0]
- ? simgrid::kernel::profile::ProfileBuilder::from_file(A_surfxml_link_state___file)
+ link.state_trace = A_simgrid_parse_link_state___file[0]
+ ? simgrid::kernel::profile::ProfileBuilder::from_file(A_simgrid_parse_link_state___file)
: nullptr;
- switch (A_surfxml_link_sharing___policy) {
- case A_surfxml_link_sharing___policy_SHARED:
+ switch (A_simgrid_parse_link_sharing___policy) {
+ case A_simgrid_parse_link_sharing___policy_SHARED:
link.policy = simgrid::s4u::Link::SharingPolicy::SHARED;
break;
- case A_surfxml_link_sharing___policy_FATPIPE:
+ case A_simgrid_parse_link_sharing___policy_FATPIPE:
link.policy = simgrid::s4u::Link::SharingPolicy::FATPIPE;
break;
- case A_surfxml_link_sharing___policy_FULLDUPLEX:
+ case A_simgrid_parse_link_sharing___policy_FULLDUPLEX:
XBT_WARN("FULLDUPLEX is now deprecated. Please update your platform file to use SPLITDUPLEX instead.");
link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX;
break;
- case A_surfxml_link_sharing___policy_SPLITDUPLEX:
+ case A_simgrid_parse_link_sharing___policy_SPLITDUPLEX:
link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX;
break;
- case A_surfxml_link_sharing___policy_WIFI:
+ case A_simgrid_parse_link_sharing___policy_WIFI:
link.policy = simgrid::s4u::Link::SharingPolicy::WIFI;
break;
default:
sg_platf_new_link(&link);
}
-void STag_surfxml_link___ctn()
+void STag_simgrid_parse_link___ctn()
{
const auto engine = simgrid::s4u::Engine::get_instance();
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 = engine->link_by_name(A_surfxml_link___ctn_id);
+ switch (A_simgrid_parse_link___ctn_direction) {
+ case AU_simgrid_parse_link___ctn_direction:
+ case A_simgrid_parse_link___ctn_direction_NONE:
+ link = engine->link_by_name(A_simgrid_parse_link___ctn_id);
break;
- case A_surfxml_link___ctn_direction_UP:
- link = engine->split_duplex_link_by_name(A_surfxml_link___ctn_id);
+ case A_simgrid_parse_link___ctn_direction_UP:
+ link = engine->split_duplex_link_by_name(A_simgrid_parse_link___ctn_id);
direction = simgrid::s4u::LinkInRoute::Direction::UP;
break;
- case A_surfxml_link___ctn_direction_DOWN:
- link = engine->split_duplex_link_by_name(A_surfxml_link___ctn_id);
+ case A_simgrid_parse_link___ctn_direction_DOWN:
+ link = engine->split_duplex_link_by_name(A_simgrid_parse_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);
+ surf_parse_error(std::string("Invalid direction for link ") + A_simgrid_parse_link___ctn_id);
}
const char* dirname;
- switch (A_surfxml_link___ctn_direction) {
- case A_surfxml_link___ctn_direction_UP:
+ switch (A_simgrid_parse_link___ctn_direction) {
+ case A_simgrid_parse_link___ctn_direction_UP:
dirname = " (upward)";
break;
- case A_surfxml_link___ctn_direction_DOWN:
+ case A_simgrid_parse_link___ctn_direction_DOWN:
dirname = " (downward)";
break;
default:
dirname = "";
}
- surf_parse_assert(link != nullptr, std::string("No such link: '") + A_surfxml_link___ctn_id + "'" + dirname);
+ surf_parse_assert(link != nullptr, std::string("No such link: '") + A_simgrid_parse_link___ctn_id + "'" + dirname);
parsed_link_list.emplace_back(link, direction);
}
-void ETag_surfxml_backbone()
+void ETag_simgrid_parse_backbone()
{
auto link = std::make_unique<simgrid::kernel::routing::LinkCreationArgs>();
- link->id = A_surfxml_backbone_id;
+ link->id = A_simgrid_parse_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,
+ surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_backbone_bandwidth, "bandwidth of backbone " + link->id));
+ link->latency = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_backbone_latency,
"latency of backbone " + link->id);
link->policy = simgrid::s4u::Link::SharingPolicy::SHARED;
routing_cluster_add_backbone(std::move(link));
}
-void STag_surfxml_route(){
- surf_parse_assert_netpoint(A_surfxml_route_src, "Route src='", "' does name a node.");
- surf_parse_assert_netpoint(A_surfxml_route_dst, "Route dst='", "' does name a node.");
+void STag_simgrid_parse_route(){
+ surf_parse_assert_netpoint(A_simgrid_parse_route_src, "Route src='", "' does name a node.");
+ surf_parse_assert_netpoint(A_simgrid_parse_route_dst, "Route dst='", "' does name a node.");
}
-void STag_surfxml_ASroute(){
- surf_parse_assert_netpoint(A_surfxml_ASroute_src, "ASroute src='", "' does name a node.");
- surf_parse_assert_netpoint(A_surfxml_ASroute_dst, "ASroute dst='", "' does name a node.");
+void STag_simgrid_parse_ASroute(){
+ surf_parse_assert_netpoint(A_simgrid_parse_ASroute_src, "ASroute src='", "' does name a node.");
+ surf_parse_assert_netpoint(A_simgrid_parse_ASroute_dst, "ASroute dst='", "' does name a node.");
- surf_parse_assert_netpoint(A_surfxml_ASroute_gw___src, "ASroute gw_src='", "' does name a node.");
- surf_parse_assert_netpoint(A_surfxml_ASroute_gw___dst, "ASroute gw_dst='", "' does name a node.");
+ surf_parse_assert_netpoint(A_simgrid_parse_ASroute_gw___src, "ASroute gw_src='", "' does name a node.");
+ surf_parse_assert_netpoint(A_simgrid_parse_ASroute_gw___dst, "ASroute gw_dst='", "' does name a node.");
}
-void STag_surfxml_zoneRoute(){
- surf_parse_assert_netpoint(A_surfxml_zoneRoute_src, "zoneRoute src='", "' does name a node.");
- surf_parse_assert_netpoint(A_surfxml_zoneRoute_dst, "zoneRoute dst='", "' does name a node.");
- surf_parse_assert_netpoint(A_surfxml_zoneRoute_gw___src, "zoneRoute gw_src='", "' does name a node.");
- surf_parse_assert_netpoint(A_surfxml_zoneRoute_gw___dst, "zoneRoute gw_dst='", "' does name a node.");
+void STag_simgrid_parse_zoneRoute(){
+ surf_parse_assert_netpoint(A_simgrid_parse_zoneRoute_src, "zoneRoute src='", "' does name a node.");
+ surf_parse_assert_netpoint(A_simgrid_parse_zoneRoute_dst, "zoneRoute dst='", "' does name a node.");
+ surf_parse_assert_netpoint(A_simgrid_parse_zoneRoute_gw___src, "zoneRoute gw_src='", "' does name a node.");
+ surf_parse_assert_netpoint(A_simgrid_parse_zoneRoute_gw___dst, "zoneRoute gw_dst='", "' does name a node.");
}
-void STag_surfxml_bypassRoute(){
- surf_parse_assert_netpoint(A_surfxml_bypassRoute_src, "bypassRoute src='", "' does name a node.");
- surf_parse_assert_netpoint(A_surfxml_bypassRoute_dst, "bypassRoute dst='", "' does name a node.");
+void STag_simgrid_parse_bypassRoute(){
+ surf_parse_assert_netpoint(A_simgrid_parse_bypassRoute_src, "bypassRoute src='", "' does name a node.");
+ surf_parse_assert_netpoint(A_simgrid_parse_bypassRoute_dst, "bypassRoute dst='", "' does name a node.");
}
-void STag_surfxml_bypassASroute(){
- surf_parse_assert_netpoint(A_surfxml_bypassASroute_src, "bypassASroute src='", "' does name a node.");
- surf_parse_assert_netpoint(A_surfxml_bypassASroute_dst, "bypassASroute dst='", "' does name a node.");
- surf_parse_assert_netpoint(A_surfxml_bypassASroute_gw___src, "bypassASroute gw_src='", "' does name a node.");
- surf_parse_assert_netpoint(A_surfxml_bypassASroute_gw___dst, "bypassASroute gw_dst='", "' does name a node.");
+void STag_simgrid_parse_bypassASroute(){
+ surf_parse_assert_netpoint(A_simgrid_parse_bypassASroute_src, "bypassASroute src='", "' does name a node.");
+ surf_parse_assert_netpoint(A_simgrid_parse_bypassASroute_dst, "bypassASroute dst='", "' does name a node.");
+ surf_parse_assert_netpoint(A_simgrid_parse_bypassASroute_gw___src, "bypassASroute gw_src='", "' does name a node.");
+ surf_parse_assert_netpoint(A_simgrid_parse_bypassASroute_gw___dst, "bypassASroute gw_dst='", "' does name a node.");
}
-void STag_surfxml_bypassZoneRoute(){
- surf_parse_assert_netpoint(A_surfxml_bypassZoneRoute_src, "bypassZoneRoute src='", "' does name a node.");
- surf_parse_assert_netpoint(A_surfxml_bypassZoneRoute_dst, "bypassZoneRoute dst='", "' does name a node.");
- surf_parse_assert_netpoint(A_surfxml_bypassZoneRoute_gw___src, "bypassZoneRoute gw_src='", "' does name a node.");
- surf_parse_assert_netpoint(A_surfxml_bypassZoneRoute_gw___dst, "bypassZoneRoute gw_dst='", "' does name a node.");
+void STag_simgrid_parse_bypassZoneRoute(){
+ surf_parse_assert_netpoint(A_simgrid_parse_bypassZoneRoute_src, "bypassZoneRoute src='", "' does name a node.");
+ surf_parse_assert_netpoint(A_simgrid_parse_bypassZoneRoute_dst, "bypassZoneRoute dst='", "' does name a node.");
+ surf_parse_assert_netpoint(A_simgrid_parse_bypassZoneRoute_gw___src, "bypassZoneRoute gw_src='", "' does name a node.");
+ surf_parse_assert_netpoint(A_simgrid_parse_bypassZoneRoute_gw___dst, "bypassZoneRoute gw_dst='", "' does name a node.");
}
-void ETag_surfxml_route(){
+void ETag_simgrid_parse_route(){
simgrid::kernel::routing::RouteCreationArgs 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.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.src = sg_netpoint_by_name_or_null(A_simgrid_parse_route_src); // tested to not be nullptr in start tag
+ route.dst = sg_netpoint_by_name_or_null(A_simgrid_parse_route_dst); // tested to not be nullptr in start tag
+ route.symmetrical = (A_simgrid_parse_route_symmetrical == AU_simgrid_parse_route_symmetrical ||
+ A_simgrid_parse_route_symmetrical == A_simgrid_parse_route_symmetrical_YES ||
+ A_simgrid_parse_route_symmetrical == A_simgrid_parse_route_symmetrical_yes);
route.link_list.swap(parsed_link_list);
sg_platf_new_route(&route);
}
-void ETag_surfxml_ASroute()
+void ETag_simgrid_parse_ASroute()
{
- AX_surfxml_zoneRoute_src = AX_surfxml_ASroute_src;
- AX_surfxml_zoneRoute_dst = AX_surfxml_ASroute_dst;
- AX_surfxml_zoneRoute_gw___src = AX_surfxml_ASroute_gw___src;
- AX_surfxml_zoneRoute_gw___dst = AX_surfxml_ASroute_gw___dst;
- AX_surfxml_zoneRoute_symmetrical = (AT_surfxml_zoneRoute_symmetrical)AX_surfxml_ASroute_symmetrical;
- ETag_surfxml_zoneRoute();
+ AX_simgrid_parse_zoneRoute_src = AX_simgrid_parse_ASroute_src;
+ AX_simgrid_parse_zoneRoute_dst = AX_simgrid_parse_ASroute_dst;
+ AX_simgrid_parse_zoneRoute_gw___src = AX_simgrid_parse_ASroute_gw___src;
+ AX_simgrid_parse_zoneRoute_gw___dst = AX_simgrid_parse_ASroute_gw___dst;
+ AX_simgrid_parse_zoneRoute_symmetrical = (AT_simgrid_parse_zoneRoute_symmetrical)AX_simgrid_parse_ASroute_symmetrical;
+ ETag_simgrid_parse_zoneRoute();
}
-void ETag_surfxml_zoneRoute()
+void ETag_simgrid_parse_zoneRoute()
{
simgrid::kernel::routing::RouteCreationArgs ASroute;
- ASroute.src = sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_src); // tested to not be nullptr in start tag
- ASroute.dst = sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_dst); // tested to not be nullptr in start tag
+ ASroute.src = sg_netpoint_by_name_or_null(A_simgrid_parse_zoneRoute_src); // tested to not be nullptr in start tag
+ ASroute.dst = sg_netpoint_by_name_or_null(A_simgrid_parse_zoneRoute_dst); // tested to not be nullptr in start tag
- ASroute.gw_src = sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_gw___src); // tested to not be nullptr in start tag
- ASroute.gw_dst = sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_gw___dst); // tested to not be nullptr in start tag
+ ASroute.gw_src = sg_netpoint_by_name_or_null(A_simgrid_parse_zoneRoute_gw___src); // tested to not be nullptr in start tag
+ ASroute.gw_dst = sg_netpoint_by_name_or_null(A_simgrid_parse_zoneRoute_gw___dst); // tested to not be nullptr in start tag
ASroute.link_list.swap(parsed_link_list);
- 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);
+ ASroute.symmetrical = (A_simgrid_parse_zoneRoute_symmetrical == AU_simgrid_parse_zoneRoute_symmetrical ||
+ A_simgrid_parse_zoneRoute_symmetrical == A_simgrid_parse_zoneRoute_symmetrical_YES ||
+ A_simgrid_parse_zoneRoute_symmetrical == A_simgrid_parse_zoneRoute_symmetrical_yes);
sg_platf_new_route(&ASroute);
}
-void ETag_surfxml_bypassRoute(){
+void ETag_simgrid_parse_bypassRoute(){
simgrid::kernel::routing::RouteCreationArgs route;
- 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.src = sg_netpoint_by_name_or_null(A_simgrid_parse_bypassRoute_src); // tested to not be nullptr in start tag
+ route.dst = sg_netpoint_by_name_or_null(A_simgrid_parse_bypassRoute_dst); // tested to not be nullptr in start tag
route.symmetrical = false;
route.link_list.swap(parsed_link_list);
sg_platf_new_bypass_route(&route);
}
-void ETag_surfxml_bypassASroute()
+void ETag_simgrid_parse_bypassASroute()
{
- AX_surfxml_bypassZoneRoute_src = AX_surfxml_bypassASroute_src;
- AX_surfxml_bypassZoneRoute_dst = AX_surfxml_bypassASroute_dst;
- AX_surfxml_bypassZoneRoute_gw___src = AX_surfxml_bypassASroute_gw___src;
- AX_surfxml_bypassZoneRoute_gw___dst = AX_surfxml_bypassASroute_gw___dst;
- ETag_surfxml_bypassZoneRoute();
+ AX_simgrid_parse_bypassZoneRoute_src = AX_simgrid_parse_bypassASroute_src;
+ AX_simgrid_parse_bypassZoneRoute_dst = AX_simgrid_parse_bypassASroute_dst;
+ AX_simgrid_parse_bypassZoneRoute_gw___src = AX_simgrid_parse_bypassASroute_gw___src;
+ AX_simgrid_parse_bypassZoneRoute_gw___dst = AX_simgrid_parse_bypassASroute_gw___dst;
+ ETag_simgrid_parse_bypassZoneRoute();
}
-void ETag_surfxml_bypassZoneRoute()
+void ETag_simgrid_parse_bypassZoneRoute()
{
simgrid::kernel::routing::RouteCreationArgs ASroute;
- 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.src = sg_netpoint_by_name_or_null(A_simgrid_parse_bypassZoneRoute_src);
+ ASroute.dst = sg_netpoint_by_name_or_null(A_simgrid_parse_bypassZoneRoute_dst);
ASroute.link_list.swap(parsed_link_list);
ASroute.symmetrical = false;
- 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);
+ ASroute.gw_src = sg_netpoint_by_name_or_null(A_simgrid_parse_bypassZoneRoute_gw___src);
+ ASroute.gw_dst = sg_netpoint_by_name_or_null(A_simgrid_parse_bypassZoneRoute_gw___dst);
sg_platf_new_bypass_route(&ASroute);
}
-void ETag_surfxml_trace(){
+void ETag_simgrid_parse_trace(){
simgrid::kernel::routing::ProfileCreationArgs trace;
- trace.id = A_surfxml_trace_id;
- trace.file = A_surfxml_trace_file;
- trace.periodicity = surf_parse_get_double(A_surfxml_trace_periodicity);
- trace.pc_data = surfxml_pcdata;
+ trace.id = A_simgrid_parse_trace_id;
+ trace.file = A_simgrid_parse_trace_file;
+ trace.periodicity = surf_parse_get_double(A_simgrid_parse_trace_periodicity);
+ trace.pc_data = simgrid_parse_pcdata;
sg_platf_new_trace(&trace);
}
-void STag_surfxml_trace___connect()
+void STag_simgrid_parse_trace___connect()
{
simgrid::kernel::routing::TraceConnectCreationArgs trace_connect;
- trace_connect.element = A_surfxml_trace___connect_element;
- trace_connect.trace = A_surfxml_trace___connect_trace;
+ trace_connect.element = A_simgrid_parse_trace___connect_element;
+ trace_connect.trace = A_simgrid_parse_trace___connect_trace;
- switch (A_surfxml_trace___connect_kind) {
- case AU_surfxml_trace___connect_kind:
- case A_surfxml_trace___connect_kind_SPEED:
+ switch (A_simgrid_parse_trace___connect_kind) {
+ case AU_simgrid_parse_trace___connect_kind:
+ case A_simgrid_parse_trace___connect_kind_SPEED:
trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::SPEED;
break;
- case A_surfxml_trace___connect_kind_BANDWIDTH:
+ case A_simgrid_parse_trace___connect_kind_BANDWIDTH:
trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::BANDWIDTH;
break;
- case A_surfxml_trace___connect_kind_HOST___AVAIL:
+ case A_simgrid_parse_trace___connect_kind_HOST___AVAIL:
trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::HOST_AVAIL;
break;
- case A_surfxml_trace___connect_kind_LATENCY:
+ case A_simgrid_parse_trace___connect_kind_LATENCY:
trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::LATENCY;
break;
- case A_surfxml_trace___connect_kind_LINK___AVAIL:
+ case A_simgrid_parse_trace___connect_kind_LINK___AVAIL:
trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::LINK_AVAIL;
break;
default:
sg_platf_trace_connect(&trace_connect);
}
-void STag_surfxml_AS()
+void STag_simgrid_parse_AS()
{
- AX_surfxml_zone_id = AX_surfxml_AS_id;
- AX_surfxml_zone_routing = AX_surfxml_AS_routing;
- STag_surfxml_zone();
+ AX_simgrid_parse_zone_id = AX_simgrid_parse_AS_id;
+ AX_simgrid_parse_zone_routing = AX_simgrid_parse_AS_routing;
+ STag_simgrid_parse_zone();
}
-void ETag_surfxml_AS()
+void ETag_simgrid_parse_AS()
{
- ETag_surfxml_zone();
+ ETag_simgrid_parse_zone();
}
-void STag_surfxml_zone()
+void STag_simgrid_parse_zone()
{
property_sets.emplace_back();
simgrid::kernel::routing::ZoneCreationArgs zone;
- zone.id = A_surfxml_zone_id;
- zone.routing = A_surfxml_zone_routing;
+ zone.id = A_simgrid_parse_zone_id;
+ zone.routing = A_simgrid_parse_zone_routing;
sg_platf_new_zone_begin(&zone);
}
-void ETag_surfxml_zone()
+void ETag_simgrid_parse_zone()
{
sg_platf_new_zone_set_properties(property_sets.back());
property_sets.pop_back();
sg_platf_new_zone_seal();
}
-void STag_surfxml_config()
+void STag_simgrid_parse_config()
{
property_sets.emplace_back();
- XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);
+ XBT_DEBUG("START configuration name = %s",A_simgrid_parse_config_id);
if (_sg_cfg_init_status == 2) {
surf_parse_error("All <config> tags must be given before any platform elements (such as <zone>, <host>, <cluster>, "
"<link>, etc).");
}
}
-void ETag_surfxml_config()
+void ETag_simgrid_parse_config()
{
// Sort config elements before applying.
// That's a little waste of time, but not doing so would break the tests
} 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);
+ XBT_DEBUG("End configuration name = %s",A_simgrid_parse_config_id);
property_sets.pop_back();
}
static std::vector<std::string> arguments;
-void STag_surfxml_process()
+void STag_simgrid_parse_process()
{
- AX_surfxml_actor_function = AX_surfxml_process_function;
- STag_surfxml_actor();
+ AX_simgrid_parse_actor_function = AX_simgrid_parse_process_function;
+ STag_simgrid_parse_actor();
}
-void STag_surfxml_actor()
+void STag_simgrid_parse_actor()
{
property_sets.emplace_back();
- arguments.assign(1, A_surfxml_actor_function);
+ arguments.assign(1, A_simgrid_parse_actor_function);
}
-void ETag_surfxml_process()
+void ETag_simgrid_parse_process()
{
- AX_surfxml_actor_host = AX_surfxml_process_host;
- AX_surfxml_actor_function = AX_surfxml_process_function;
- AX_surfxml_actor_start___time = AX_surfxml_process_start___time;
- AX_surfxml_actor_kill___time = AX_surfxml_process_kill___time;
- AX_surfxml_actor_on___failure = (AT_surfxml_actor_on___failure)AX_surfxml_process_on___failure;
- ETag_surfxml_actor();
+ AX_simgrid_parse_actor_host = AX_simgrid_parse_process_host;
+ AX_simgrid_parse_actor_function = AX_simgrid_parse_process_function;
+ AX_simgrid_parse_actor_start___time = AX_simgrid_parse_process_start___time;
+ AX_simgrid_parse_actor_kill___time = AX_simgrid_parse_process_kill___time;
+ AX_simgrid_parse_actor_on___failure = (AT_simgrid_parse_actor_on___failure)AX_simgrid_parse_process_on___failure;
+ ETag_simgrid_parse_actor();
}
-void ETag_surfxml_actor()
+void ETag_simgrid_parse_actor()
{
simgrid::kernel::routing::ActorCreationArgs actor;
property_sets.pop_back();
actor.args.swap(arguments);
- actor.host = A_surfxml_actor_host;
- actor.function = A_surfxml_actor_function;
- actor.start_time = surf_parse_get_double(A_surfxml_actor_start___time);
- actor.kill_time = surf_parse_get_double(A_surfxml_actor_kill___time);
-
- switch (A_surfxml_actor_on___failure) {
- case AU_surfxml_actor_on___failure:
- case A_surfxml_actor_on___failure_DIE:
+ actor.host = A_simgrid_parse_actor_host;
+ actor.function = A_simgrid_parse_actor_function;
+ actor.start_time = surf_parse_get_double(A_simgrid_parse_actor_start___time);
+ actor.kill_time = surf_parse_get_double(A_simgrid_parse_actor_kill___time);
+
+ switch (A_simgrid_parse_actor_on___failure) {
+ case AU_simgrid_parse_actor_on___failure:
+ case A_simgrid_parse_actor_on___failure_DIE:
actor.restart_on_failure = false;
break;
- case A_surfxml_actor_on___failure_RESTART:
+ case A_simgrid_parse_actor_on___failure_RESTART:
actor.restart_on_failure = true;
break;
default:
sg_platf_new_actor(&actor);
}
-void STag_surfxml_argument(){
- arguments.emplace_back(A_surfxml_argument_value);
+void STag_simgrid_parse_argument(){
+ arguments.emplace_back(A_simgrid_parse_argument_value);
}
-void STag_surfxml_model___prop(){
+void STag_simgrid_parse_model___prop(){
XBT_INFO("Deprecated tag <model_prop> ignored");
}
-void ETag_surfxml_prop(){/* Nothing to do */}
-void STag_surfxml_random(){/* Nothing to do */}
-void ETag_surfxml_random(){/* Nothing to do */}
-void ETag_surfxml_trace___connect()
+void ETag_simgrid_parse_prop(){/* Nothing to do */}
+void STag_simgrid_parse_random(){/* Nothing to do */}
+void ETag_simgrid_parse_random(){/* Nothing to do */}
+void ETag_simgrid_parse_trace___connect()
{ /* Nothing to do */
}
-void STag_surfxml_trace()
+void STag_simgrid_parse_trace()
{ /* Nothing to do */
}
-void ETag_surfxml_router(){/*Nothing to do*/}
-void ETag_surfxml_host___link(){/* Nothing to do */}
-void ETag_surfxml_cabinet(){/* Nothing to do */}
-void ETag_surfxml_peer(){/* Nothing to do */}
-void STag_surfxml_backbone(){/* Nothing to do */}
-void ETag_surfxml_link___ctn(){/* Nothing to do */}
-void ETag_surfxml_argument(){/* Nothing to do */}
-void ETag_surfxml_model___prop(){/* Nothing to do */}
+void ETag_simgrid_parse_router(){/*Nothing to do*/}
+void ETag_simgrid_parse_host___link(){/* Nothing to do */}
+void ETag_simgrid_parse_cabinet(){/* Nothing to do */}
+void ETag_simgrid_parse_peer(){/* Nothing to do */}
+void STag_simgrid_parse_backbone(){/* Nothing to do */}
+void ETag_simgrid_parse_link___ctn(){/* Nothing to do */}
+void ETag_simgrid_parse_argument(){/* Nothing to do */}
+void ETag_simgrid_parse_model___prop(){/* Nothing to do */}
/* Open and Close parse file */
static YY_BUFFER_STATE surf_input_buffer;
