X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7bc01999f5003e51cc1d12f93647999a1a143f23..d469f50b8c4288a559b6e1c561b1c0e6efbec864:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 1a90883272..b6b2ec26df 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -23,16 +23,16 @@ #include "src/surf/network_interface.hpp" #include "surf/surf_routing.h" // FIXME: brain dead public header -#include "src/routing/AsImpl.hpp" -#include "src/routing/AsCluster.hpp" -#include "src/routing/AsClusterTorus.hpp" -#include "src/routing/AsClusterFatTree.hpp" -#include "src/routing/AsClusterDragonfly.hpp" -#include "src/routing/AsDijkstra.hpp" -#include "src/routing/AsFloyd.hpp" -#include "src/routing/AsFull.hpp" -#include "src/routing/AsNone.hpp" -#include "src/routing/AsVivaldi.hpp" +#include "src/kernel/routing/AsImpl.hpp" +#include "src/kernel/routing/AsCluster.hpp" +#include "src/kernel/routing/AsClusterTorus.hpp" +#include "src/kernel/routing/AsClusterFatTree.hpp" +#include "src/kernel/routing/AsClusterDragonfly.hpp" +#include "src/kernel/routing/AsDijkstra.hpp" +#include "src/kernel/routing/AsFloyd.hpp" +#include "src/kernel/routing/AsFull.hpp" +#include "src/kernel/routing/AsNone.hpp" +#include "src/kernel/routing/AsVivaldi.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); @@ -88,18 +88,18 @@ static std::vector *explodesRadical(const char*radicals){ /** The current AS in the parsing */ -static simgrid::routing::AsImpl *current_routing = nullptr; -static simgrid::routing::AsImpl* routing_get_current() +static simgrid::kernel::routing::AsImpl *current_routing = nullptr; +static simgrid::kernel::routing::AsImpl* routing_get_current() { return current_routing; } /** Module management function: creates all internal data structures */ -void sg_platf_init(void) { +void sg_platf_init() { } /** Module management function: frees all internal data structures */ -void sg_platf_exit(void) { +void sg_platf_exit() { simgrid::surf::on_link.disconnect_all_slots(); simgrid::surf::on_cluster.disconnect_all_slots(); simgrid::surf::on_postparse.disconnect_all_slots(); @@ -114,12 +114,12 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) { xbt_assert(sg_host_by_name(host->id) == nullptr, "Refusing to create a second host named '%s'.", host->id); - simgrid::routing::AsImpl* current_routing = routing_get_current(); - if (current_routing->hierarchy_ == simgrid::routing::AsImpl::RoutingMode::unset) - current_routing->hierarchy_ = simgrid::routing::AsImpl::RoutingMode::base; + simgrid::kernel::routing::AsImpl* current_routing = routing_get_current(); + if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset) + current_routing->hierarchy_ = simgrid::kernel::routing::AsImpl::RoutingMode::base; - simgrid::routing::NetCard *netcard = - new simgrid::routing::NetCardImpl(host->id, simgrid::routing::NetCard::Type::Host, current_routing); + simgrid::kernel::routing::NetCard *netcard = + new simgrid::kernel::routing::NetCardImpl(host->id, simgrid::kernel::routing::NetCard::Type::Host, current_routing); sg_host_t h = simgrid::s4u::Host::by_name_or_create(host->id); h->pimpl_netcard = netcard; @@ -148,7 +148,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) h->extension_set(COORD_HOST_LEVEL, (void *) ctn); } - simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu( h, host->speed_per_pstate, host->core_amount); + simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu( h, &host->speed_per_pstate, host->core_amount); if (host->state_trace) cpu->setStateTrace(host->state_trace); if (host->speed_trace) @@ -175,16 +175,16 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) /** @brief Add a "router" to the network element list */ void sg_platf_new_router(sg_platf_router_cbarg_t router) { - using simgrid::routing::AsCluster; - simgrid::routing::AsImpl* current_routing = routing_get_current(); + using simgrid::kernel::routing::AsCluster; + simgrid::kernel::routing::AsImpl* current_routing = routing_get_current(); - if (current_routing->hierarchy_ == simgrid::routing::AsImpl::RoutingMode::unset) - current_routing->hierarchy_ = simgrid::routing::AsImpl::RoutingMode::base; + if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset) + current_routing->hierarchy_ = simgrid::kernel::routing::AsImpl::RoutingMode::base; xbt_assert(nullptr == xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL), "Refusing to create a router named '%s': this name already describes a node.", router->id); - simgrid::routing::NetCard* netcard = - new simgrid::routing::NetCardImpl(router->id, simgrid::routing::NetCard::Type::Router, current_routing); + simgrid::kernel::routing::NetCard* netcard = + new simgrid::kernel::routing::NetCardImpl(router->id, simgrid::kernel::routing::NetCard::Type::Router, current_routing); xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, netcard); XBT_DEBUG("Router '%s' has the id %d", router->id, netcard->id()); @@ -208,7 +208,7 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router) auto cluster = dynamic_cast(current_routing); if(cluster != nullptr) - cluster->router_ = static_cast(xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL)); + cluster->router_ = static_cast(xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL)); if (TRACE_is_enabled() && TRACE_needs_platform()) sg_instr_new_router(router); @@ -241,10 +241,10 @@ void sg_platf_new_link(sg_platf_link_cbarg_t link){ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) { - using simgrid::routing::AsCluster; - using simgrid::routing::AsClusterDragonfly; - using simgrid::routing::AsClusterFatTree; - using simgrid::routing::AsClusterTorus; + using simgrid::kernel::routing::AsCluster; + using simgrid::kernel::routing::AsClusterDragonfly; + using simgrid::kernel::routing::AsClusterFatTree; + using simgrid::kernel::routing::AsClusterTorus; int rankId=0; @@ -268,7 +268,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) break; } sg_platf_new_AS_begin(&AS); - simgrid::routing::AsCluster *current_as = static_cast(routing_get_current()); + simgrid::kernel::routing::AsCluster *current_as = static_cast(routing_get_current()); current_as->parse_specific_arguments(cluster); if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){ @@ -301,13 +301,11 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) } } - host.speed_per_pstate = xbt_dynar_new(sizeof(double), nullptr); - xbt_dynar_push(host.speed_per_pstate,&cluster->speed); + host.speed_per_pstate.push_back(cluster->speed); host.pstate = 0; host.core_amount = cluster->core_amount; host.coord = ""; sg_platf_new_host(&host); - xbt_dynar_free(&host.speed_per_pstate); XBT_DEBUG(""); XBT_DEBUG("", link_id, cluster->bw, cluster->lat); @@ -377,7 +375,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) if (!router.id || !strcmp(router.id, "")) router.id = newid = bprintf("%s%s_router%s", cluster->prefix, cluster->id, cluster->suffix); sg_platf_new_router(&router); - current_as->router_ = (simgrid::routing::NetCard*) xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL); + current_as->router_ = (simgrid::kernel::routing::NetCard*) xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL); free(newid); //Make the backbone @@ -402,7 +400,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) simgrid::surf::on_cluster(cluster); } void routing_cluster_add_backbone(simgrid::surf::Link* bb) { - simgrid::routing::AsCluster *cluster = dynamic_cast(current_routing); + simgrid::kernel::routing::AsCluster *cluster = dynamic_cast(current_routing); xbt_assert(cluster, "Only hosts from Cluster can get a backbone."); xbt_assert(nullptr == cluster->backbone_, "Cluster %s already has a backbone link!", cluster->name()); @@ -422,10 +420,8 @@ void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) host.pstate = 0; host.core_amount = 1; host.id = hostname; - host.speed_per_pstate = xbt_dynar_new(sizeof(double), nullptr); - xbt_dynar_push(host.speed_per_pstate,&cabinet->speed); + host.speed_per_pstate.push_back(cabinet->speed); sg_platf_new_host(&host); - xbt_dynar_free(&host.speed_per_pstate); s_sg_platf_link_cbarg_t link; memset(&link, 0, sizeof(link)); @@ -648,8 +644,8 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) { - using simgrid::routing::NetCard; - using simgrid::routing::AsCluster; + using simgrid::kernel::routing::NetCard; + using simgrid::kernel::routing::AsCluster; char *host_id = bprintf("peer_%s", peer->id); char *router_id = bprintf("router_%s", peer->id); @@ -667,14 +663,12 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) memset(&host, 0, sizeof(host)); host.id = host_id; - host.speed_per_pstate = xbt_dynar_new(sizeof(double), nullptr); - xbt_dynar_push(host.speed_per_pstate,&peer->speed); + host.speed_per_pstate.push_back(peer->speed); host.pstate = 0; host.speed_trace = peer->availability_trace; host.state_trace = peer->state_trace; host.core_amount = 1; sg_platf_new_host(&host); - xbt_dynar_free(&host.speed_per_pstate); s_sg_platf_link_cbarg_t link; memset(&link, 0, sizeof(link)); @@ -827,23 +821,23 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) /* search the routing model */ - simgrid::routing::AsImpl *new_as = nullptr; + simgrid::kernel::routing::AsImpl *new_as = nullptr; switch(AS->routing){ - case A_surfxml_AS_routing_Cluster: new_as = new simgrid::routing::AsCluster(AS->id); break; - case A_surfxml_AS_routing_ClusterDragonfly: new_as = new simgrid::routing::AsClusterDragonfly(AS->id); break; - case A_surfxml_AS_routing_ClusterTorus: new_as = new simgrid::routing::AsClusterTorus(AS->id); break; - case A_surfxml_AS_routing_ClusterFatTree: new_as = new simgrid::routing::AsClusterFatTree(AS->id); break; - case A_surfxml_AS_routing_Dijkstra: new_as = new simgrid::routing::AsDijkstra(AS->id, 0); break; - case A_surfxml_AS_routing_DijkstraCache: new_as = new simgrid::routing::AsDijkstra(AS->id, 1); break; - case A_surfxml_AS_routing_Floyd: new_as = new simgrid::routing::AsFloyd(AS->id); break; - case A_surfxml_AS_routing_Full: new_as = new simgrid::routing::AsFull(AS->id); break; - case A_surfxml_AS_routing_None: new_as = new simgrid::routing::AsNone(AS->id); break; - case A_surfxml_AS_routing_Vivaldi: new_as = new simgrid::routing::AsVivaldi(AS->id); break; + case A_surfxml_AS_routing_Cluster: new_as = new simgrid::kernel::routing::AsCluster(AS->id); break; + case A_surfxml_AS_routing_ClusterDragonfly: new_as = new simgrid::kernel::routing::AsClusterDragonfly(AS->id); break; + case A_surfxml_AS_routing_ClusterTorus: new_as = new simgrid::kernel::routing::AsClusterTorus(AS->id); break; + case A_surfxml_AS_routing_ClusterFatTree: new_as = new simgrid::kernel::routing::AsClusterFatTree(AS->id); break; + case A_surfxml_AS_routing_Dijkstra: new_as = new simgrid::kernel::routing::AsDijkstra(AS->id, 0); break; + case A_surfxml_AS_routing_DijkstraCache: new_as = new simgrid::kernel::routing::AsDijkstra(AS->id, 1); break; + case A_surfxml_AS_routing_Floyd: new_as = new simgrid::kernel::routing::AsFloyd(AS->id); break; + case A_surfxml_AS_routing_Full: new_as = new simgrid::kernel::routing::AsFull(AS->id); break; + case A_surfxml_AS_routing_None: new_as = new simgrid::kernel::routing::AsNone(AS->id); break; + case A_surfxml_AS_routing_Vivaldi: new_as = new simgrid::kernel::routing::AsVivaldi(AS->id); break; default: xbt_die("Not a valid model!"); break; } /* make a new routing component */ - simgrid::routing::NetCard *netcard = new simgrid::routing::NetCardImpl(new_as->name(), simgrid::routing::NetCard::Type::As, current_routing); + simgrid::kernel::routing::NetCard *netcard = new simgrid::kernel::routing::NetCardImpl(new_as->name(), simgrid::kernel::routing::NetCard::Type::As, current_routing); if (current_routing == nullptr && routing_platf->root_ == nullptr) { /* it is the first one */ routing_platf->root_ = new_as; @@ -854,8 +848,8 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) /* it is a part of the tree */ new_as->father_ = current_routing; /* set the father behavior */ - if (current_routing->hierarchy_ == simgrid::routing::AsImpl::RoutingMode::unset) - current_routing->hierarchy_ = simgrid::routing::AsImpl::RoutingMode::recursive; + if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset) + current_routing->hierarchy_ = simgrid::kernel::routing::AsImpl::RoutingMode::recursive; /* add to the sons dictionary */ xbt_dict_set(current_routing->children(), AS->id, (void *) new_as, nullptr); } else { @@ -869,7 +863,7 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) current_routing = new_as; current_routing->netcard_ = netcard; - simgrid::routing::asCreatedCallbacks(new_as); + simgrid::kernel::routing::asCreatedCallbacks(new_as); if (TRACE_is_enabled()) sg_instr_AS_begin(AS); @@ -886,7 +880,7 @@ void sg_platf_new_AS_seal() { xbt_assert(current_routing, "Cannot seal the current AS: none under construction"); current_routing->seal(); - current_routing = static_cast(current_routing->father()); + current_routing = static_cast(current_routing->father()); if (TRACE_is_enabled()) sg_instr_AS_end(); @@ -895,9 +889,9 @@ void sg_platf_new_AS_seal() /** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */ void sg_platf_new_hostlink(sg_platf_host_link_cbarg_t hostlink) { - simgrid::routing::NetCard *netcard = sg_host_by_name(hostlink->id)->pimpl_netcard; + simgrid::kernel::routing::NetCard *netcard = sg_host_by_name(hostlink->id)->pimpl_netcard; xbt_assert(netcard, "Host '%s' not found!", hostlink->id); - xbt_assert(dynamic_cast(current_routing), + xbt_assert(dynamic_cast(current_routing), "Only hosts from Cluster and Vivaldi ASes can get an host_link."); s_surf_parsing_link_up_down_t link_up_down; @@ -908,7 +902,7 @@ void sg_platf_new_hostlink(sg_platf_host_link_cbarg_t hostlink) xbt_assert(link_up_down.linkDown, "Link '%s' not found!",hostlink->link_down); // If dynar is is greater than netcard id and if the host_link is already defined - auto as_cluster = static_cast(current_routing); + auto as_cluster = static_cast(current_routing); if((int)xbt_dynar_length(as_cluster->privateLinks_) > netcard->id() && xbt_dynar_get_as(as_cluster->privateLinks_, netcard->id(), void*)) surf_parse_error("Host_link for '%s' is already defined!",hostlink->id);