-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2018. 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. */
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/sg_config.h"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/sg_config.hpp"
#include "src/surf/network_interface.hpp"
#include "xbt/file.hpp"
surf_parse_error(msg);
}
-void surf_parse_warn(std::string msg)
-{
- XBT_WARN("%s:%d: %s", surf_parsed_filename, surf_parse_lineno, msg.c_str());
-}
-
double surf_parse_get_double(std::string s)
{
try {
void ETag_surfxml_storage()
{
- StorageCreationArgs storage;
+ simgrid::kernel::routing::StorageCreationArgs storage;
storage.properties = current_property_set;
current_property_set = nullptr;
}
void ETag_surfxml_storage___type()
{
- StorageTypeCreationArgs storage_type;
+ simgrid::kernel::routing::StorageTypeCreationArgs storage_type;
storage_type.properties = current_property_set;
current_property_set = nullptr;
void ETag_surfxml_mount()
{
- MountCreationArgs mount;
+ simgrid::kernel::routing::MountCreationArgs mount;
mount.name = A_surfxml_mount_name;
mount.storageId = A_surfxml_mount_storageId;
if (version < 4.1) {
XBT_INFO("You're using a v%.1f XML file (%s) while the current standard is v4.1 "
"That's fine, the new version is backward compatible. \n\n"
- "Use simgrid_update_xml to update your file automatically. "
+ "Use simgrid_update_xml to update your file automatically to get rid of this warning. "
"This program is installed automatically with SimGrid, or "
"available in the tools/ directory of the source archive.",
version, surf_parsed_filename);
}
void ETag_surfxml_host() {
- s_sg_platf_host_cbarg_t host;
+ simgrid::kernel::routing::HostCreationArgs host;
host.properties = current_property_set;
current_property_set = nullptr;
void STag_surfxml_host___link(){
XBT_DEBUG("Create a Host_link for %s",A_surfxml_host___link_id);
- HostLinkCreationArgs host_link;
+ simgrid::kernel::routing::HostLinkCreationArgs host_link;
host_link.id = A_surfxml_host___link_id;
host_link.link_up = A_surfxml_host___link_up;
}
void ETag_surfxml_cluster(){
- ClusterCreationArgs cluster;
+ simgrid::kernel::routing::ClusterCreationArgs cluster;
cluster.properties = current_property_set;
current_property_set = nullptr;
switch(AX_surfxml_cluster_topology){
case A_surfxml_cluster_topology_FLAT:
- cluster.topology= SURF_CLUSTER_FLAT ;
+ cluster.topology = simgrid::kernel::routing::ClusterTopology::FLAT;
break;
case A_surfxml_cluster_topology_TORUS:
- cluster.topology= SURF_CLUSTER_TORUS ;
+ cluster.topology = simgrid::kernel::routing::ClusterTopology::TORUS;
break;
case A_surfxml_cluster_topology_FAT___TREE:
- cluster.topology = SURF_CLUSTER_FAT_TREE;
+ cluster.topology = simgrid::kernel::routing::ClusterTopology::FAT_TREE;
break;
case A_surfxml_cluster_topology_DRAGONFLY:
- cluster.topology= SURF_CLUSTER_DRAGONFLY ;
+ cluster.topology = simgrid::kernel::routing::ClusterTopology::DRAGONFLY;
break;
default:
surf_parse_error(std::string("Invalid cluster topology for cluster ") + cluster.id);
cluster.sharing_policy = SURF_LINK_SHARED;
break;
case A_surfxml_cluster_sharing___policy_FULLDUPLEX:
- cluster.sharing_policy = SURF_LINK_FULLDUPLEX;
+ XBT_WARN("FULLDUPLEX is now deprecated. Please update your platform file to use SPLITDUPLEX instead.");
+ cluster.sharing_policy = SURF_LINK_SPLITDUPLEX;
+ break;
+ case A_surfxml_cluster_sharing___policy_SPLITDUPLEX:
+ cluster.sharing_policy = SURF_LINK_SPLITDUPLEX;
break;
case A_surfxml_cluster_sharing___policy_FATPIPE:
cluster.sharing_policy = SURF_LINK_FATPIPE;
void STag_surfxml_cabinet(){
parse_after_config();
- CabinetCreationArgs cabinet;
+ simgrid::kernel::routing::CabinetCreationArgs cabinet;
cabinet.id = A_surfxml_cabinet_id;
cabinet.prefix = A_surfxml_cabinet_prefix;
cabinet.suffix = A_surfxml_cabinet_suffix;
void STag_surfxml_peer(){
parse_after_config();
- PeerCreationArgs peer;
+ simgrid::kernel::routing::PeerCreationArgs peer;
peer.id = std::string(A_surfxml_peer_id);
peer.speed = surf_parse_get_speed(A_surfxml_peer_speed, "speed of peer", peer.id.c_str());
}
void ETag_surfxml_link(){
- LinkCreationArgs link;
+ simgrid::kernel::routing::LinkCreationArgs link;
link.properties = current_property_set;
current_property_set = nullptr;
link.policy = SURF_LINK_FATPIPE;
break;
case A_surfxml_link_sharing___policy_FULLDUPLEX:
- link.policy = SURF_LINK_FULLDUPLEX;
- break;
+ XBT_WARN("FULLDUPLEX is now deprecated. Please update your platform file to use SPLITDUPLEX instead.");
+ link.policy = SURF_LINK_SPLITDUPLEX;
+ break;
+ case A_surfxml_link_sharing___policy_SPLITDUPLEX:
+ link.policy = SURF_LINK_SPLITDUPLEX;
+ break;
default:
surf_parse_error(std::string("Invalid sharing policy in link ") + link.id);
break;
}
void ETag_surfxml_backbone(){
- LinkCreationArgs link;
+ simgrid::kernel::routing::LinkCreationArgs link;
link.properties = nullptr;
link.id = std::string(A_surfxml_backbone_id);
}
void ETag_surfxml_route(){
- s_sg_platf_route_cbarg_t 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
}
void ETag_surfxml_zoneRoute()
{
- s_sg_platf_route_cbarg_t ASroute;
+ 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
}
void ETag_surfxml_bypassRoute(){
- s_sg_platf_route_cbarg_t route;
+ 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
}
void ETag_surfxml_bypassZoneRoute()
{
- s_sg_platf_route_cbarg_t ASroute;
+ 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);
}
void ETag_surfxml_trace(){
- TraceCreationArgs trace;
+ simgrid::kernel::routing::TraceCreationArgs trace;
trace.id = A_surfxml_trace_id;
trace.file = A_surfxml_trace_file;
void STag_surfxml_trace___connect()
{
parse_after_config();
- TraceConnectCreationArgs trace_connect;
+ simgrid::kernel::routing::TraceConnectCreationArgs trace_connect;
trace_connect.element = A_surfxml_trace___connect_element;
trace_connect.trace = A_surfxml_trace___connect_trace;
switch (A_surfxml_trace___connect_kind) {
case AU_surfxml_trace___connect_kind:
case A_surfxml_trace___connect_kind_SPEED:
- trace_connect.kind = SURF_TRACE_CONNECT_KIND_SPEED;
+ trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::SPEED;
break;
case A_surfxml_trace___connect_kind_BANDWIDTH:
- trace_connect.kind = SURF_TRACE_CONNECT_KIND_BANDWIDTH;
+ trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::BANDWIDTH;
break;
case A_surfxml_trace___connect_kind_HOST___AVAIL:
- trace_connect.kind = SURF_TRACE_CONNECT_KIND_HOST_AVAIL;
+ trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::HOST_AVAIL;
break;
case A_surfxml_trace___connect_kind_LATENCY:
- trace_connect.kind = SURF_TRACE_CONNECT_KIND_LATENCY;
+ trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::LATENCY;
break;
case A_surfxml_trace___connect_kind_LINK___AVAIL:
- trace_connect.kind = SURF_TRACE_CONNECT_KIND_LINK_AVAIL;
+ trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::LINK_AVAIL;
break;
default:
surf_parse_error("Invalid trace kind");
{
parse_after_config();
ZONE_TAG = 1;
- ZoneCreationArgs zone;
+ simgrid::kernel::routing::ZoneCreationArgs zone;
zone.id = A_surfxml_zone_id;
zone.routing = static_cast<int>(A_surfxml_zone_routing);
void ETag_surfxml_actor()
{
- s_sg_platf_process_cbarg_t actor;
+ simgrid::kernel::routing::ActorCreationArgs actor;
actor.properties = current_property_set;
current_property_set = nullptr;
switch (A_surfxml_actor_on___failure) {
case AU_surfxml_actor_on___failure:
case A_surfxml_actor_on___failure_DIE:
- actor.on_failure = SURF_ACTOR_ON_FAILURE_DIE;
+ actor.on_failure = simgrid::kernel::routing::ActorOnFailure::DIE;
break;
case A_surfxml_actor_on___failure_RESTART:
- actor.on_failure = SURF_ACTOR_ON_FAILURE_RESTART;
+ actor.on_failure = simgrid::kernel::routing::ActorOnFailure::RESTART;
break;
default:
surf_parse_error("Invalid on failure behavior");
break;
}
- sg_platf_new_process(&actor);
+ sg_platf_new_actor(&actor);
}
void STag_surfxml_argument(){