X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/df0464c2ffa61d7fab01a54732b01368886013aa..445e892abe9e2f84dc82d712f9d5f97081530d59:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index c33ed89a18..fa37309f1d 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -4,38 +4,27 @@ /* 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 "xbt/misc.h" -#include "xbt/log.h" -#include "xbt/str.h" -#include "xbt/dict.h" -#include "xbt/RngStream.h" -#include -#include -#include "src/surf/HostImpl.hpp" -#include "surf/surf.h" - #include "simgrid/s4u/engine.hpp" #include "src/kernel/EngineImpl.hpp" #include "src/simix/smx_private.h" #include "src/include/simgrid/sg_config.h" -#include "src/surf/xml/platf_private.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" -#include "src/kernel/routing/AsCluster.hpp" -#include "src/kernel/routing/AsClusterDragonfly.hpp" -#include "src/kernel/routing/AsClusterFatTree.hpp" -#include "src/kernel/routing/AsClusterTorus.hpp" -#include "src/kernel/routing/AsDijkstra.hpp" -#include "src/kernel/routing/AsFloyd.hpp" -#include "src/kernel/routing/AsFull.hpp" -#include "src/kernel/routing/AsImpl.hpp" -#include "src/kernel/routing/AsNone.hpp" -#include "src/kernel/routing/AsVivaldi.hpp" +#include "src/kernel/routing/ClusterZone.hpp" +#include "src/kernel/routing/DijkstraZone.hpp" +#include "src/kernel/routing/DragonflyZone.hpp" +#include "src/kernel/routing/EmptyZone.hpp" +#include "src/kernel/routing/FatTreeZone.hpp" +#include "src/kernel/routing/FloydZone.hpp" +#include "src/kernel/routing/FullZone.hpp" #include "src/kernel/routing/NetCard.hpp" +#include "src/kernel/routing/NetZoneImpl.hpp" +#include "src/kernel/routing/TorusZone.hpp" +#include "src/kernel/routing/VivaldiZone.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); @@ -44,7 +33,6 @@ XBT_PRIVATE xbt_dynar_t mount_list = nullptr; namespace simgrid { namespace surf { -simgrid::xbt::signal on_link; simgrid::xbt::signal on_cluster; simgrid::xbt::signal on_postparse; @@ -54,8 +42,8 @@ simgrid::xbt::signal on_postparse; static int surf_parse_models_setup_already_called = 0; /** The current AS in the parsing */ -static simgrid::kernel::routing::AsImpl *current_routing = nullptr; -static simgrid::kernel::routing::AsImpl *routing_get_current() +static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr; +static simgrid::kernel::routing::NetZoneImpl* routing_get_current() { return current_routing; } @@ -66,7 +54,6 @@ void sg_platf_init() { /** Module management function: frees all internal data structures */ 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(); @@ -109,29 +96,26 @@ void sg_platf_new_host(sg_platf_host_cbarg_t args) } /** @brief Add a "router" to the network element list */ -void sg_platf_new_router(sg_platf_router_cbarg_t router) +simgrid::kernel::routing::NetCard* sg_platf_new_router(const char* name, const char* coords) { - simgrid::kernel::routing::AsImpl* current_routing = routing_get_current(); + simgrid::kernel::routing::NetZoneImpl* current_routing = routing_get_current(); - 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); + if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset) + current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::base; + xbt_assert(nullptr == simgrid::s4u::Engine::instance()->netcardByNameOrNull(name), + "Refusing to create a router named '%s': this name already describes a node.", name); simgrid::kernel::routing::NetCard* netcard = - new simgrid::kernel::routing::NetCard(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()); + new simgrid::kernel::routing::NetCard(name, simgrid::kernel::routing::NetCard::Type::Router, current_routing); + XBT_DEBUG("Router '%s' has the id %d", name, netcard->id()); - if (router->coord && strcmp(router->coord, "")) - new simgrid::kernel::routing::vivaldi::Coords(netcard, router->coord); - - 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)); + if (coords && strcmp(coords, "")) + new simgrid::kernel::routing::vivaldi::Coords(netcard, coords); if (TRACE_is_enabled() && TRACE_needs_platform()) - sg_instr_new_router(router); + sg_instr_new_router(name, coords); + + return netcard; } void sg_platf_new_link(sg_platf_link_cbarg_t link){ @@ -163,16 +147,14 @@ void sg_platf_new_link(sg_platf_link_cbarg_t link){ xbt_free(link_name); } - - simgrid::surf::on_link(link); } void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) { - using simgrid::kernel::routing::AsCluster; - using simgrid::kernel::routing::AsClusterDragonfly; - using simgrid::kernel::routing::AsClusterFatTree; - using simgrid::kernel::routing::AsClusterTorus; + using simgrid::kernel::routing::ClusterZone; + using simgrid::kernel::routing::DragonflyZone; + using simgrid::kernel::routing::FatTreeZone; + using simgrid::kernel::routing::TorusZone; int rankId=0; @@ -196,7 +178,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) break; } sg_platf_new_AS_begin(&AS); - simgrid::kernel::routing::AsCluster *current_as = static_cast(routing_get_current()); + simgrid::kernel::routing::ClusterZone* current_as = static_cast(routing_get_current()); current_as->parse_specific_arguments(cluster); if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){ @@ -237,8 +219,6 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) XBT_DEBUG("", link_id, cluster->bw, cluster->lat); - s_surf_parsing_link_up_down_t info_lim; - s_surf_parsing_link_up_down_t info_loop; // All links are saved in a matrix; // every row describes a single node; every node may have multiple links. // the first column may store a link from x to x if p_has_loopback is set @@ -246,6 +226,8 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) // other columns are to store one or more link for the node //add a loopback link + Link* linkUp = nullptr; + Link* linkDown = nullptr; if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){ char *tmp_link = bprintf("%s_loopback", link_id); XBT_DEBUG("", tmp_link, cluster->loopback_bw); @@ -256,15 +238,17 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) link.latency = cluster->loopback_lat; link.policy = SURF_LINK_FATPIPE; sg_platf_new_link(&link); - info_loop.linkUp = Link::byName(tmp_link); - info_loop.linkDown = Link::byName(tmp_link); + linkUp = Link::byName(tmp_link); + linkDown = Link::byName(tmp_link); free(tmp_link); - auto as_cluster = static_cast(current_as); - as_cluster->privateLinks_.insert({rankId*as_cluster->linkCountPerNode_, info_loop}); + auto as_cluster = static_cast(current_as); + as_cluster->privateLinks_.insert({rankId * as_cluster->linkCountPerNode_, {linkUp, linkDown}}); } //add a limiter link (shared link to account for maximal bandwidth of the node) + linkUp = nullptr; + linkDown = nullptr; if(cluster->limiter_link!=0){ char *tmp_link = bprintf("%s_limiter", link_id); XBT_DEBUG("", tmp_link, cluster->limiter_link); @@ -275,15 +259,15 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) link.latency = 0; link.policy = SURF_LINK_SHARED; sg_platf_new_link(&link); - info_lim.linkUp = info_lim.linkDown = Link::byName(tmp_link); + linkUp = linkDown = Link::byName(tmp_link); free(tmp_link); current_as->privateLinks_.insert( - {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_ , info_lim}); + {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_, {linkUp, linkDown}}); } //call the cluster function that adds the others links if (cluster->topology == SURF_CLUSTER_FAT_TREE) { - static_cast(current_as)->addProcessingNode(i); + static_cast(current_as)->addProcessingNode(i); } else { current_as->create_links_for_node(cluster, i, rankId, @@ -294,19 +278,16 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) rankId++; } - // Add a router. It is magically used thanks to the way in which surf_routing_cluster is written, - // and it's very useful to connect clusters together + // Add a router. XBT_DEBUG(" "); XBT_DEBUG("", cluster->router_id); - char *newid = nullptr; - s_sg_platf_router_cbarg_t router; - memset(&router, 0, sizeof(router)); - router.id = cluster->router_id; - 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::kernel::routing::NetCard*) xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL); - free(newid); + if (!cluster->router_id || !strcmp(cluster->router_id, "")) { + char* newid = bprintf("%s%s_router%s", cluster->prefix, cluster->id, cluster->suffix); + current_as->router_ = sg_platf_new_router(newid, NULL); + free(newid); + } else { + current_as->router_ = sg_platf_new_router(cluster->router_id, NULL); + } //Make the backbone if ((cluster->bb_bw != 0) || (cluster->bb_lat != 0)) { @@ -331,7 +312,8 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) delete cluster->radicals; } void routing_cluster_add_backbone(simgrid::surf::Link* bb) { - simgrid::kernel::routing::AsCluster *cluster = dynamic_cast(current_routing); + simgrid::kernel::routing::ClusterZone* 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()); @@ -492,7 +474,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) simgrid::s4u::Host* host; unsigned int cursor; xbt_dynar_foreach(all_hosts,cursor, host) { - xbt_strbuff_append(msg,host->name().c_str()); + xbt_strbuff_append(msg, host->cname()); xbt_strbuff_append(msg,"', '"); if (msg->used > 1024) { msg->data[msg->used-3]='\0'; @@ -538,8 +520,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) arg->kill_time = kill_time; arg->properties = current_property_set; - XBT_DEBUG("Process %s@%s will be started at time %f", - arg->name.c_str(), arg->host->name().c_str(), start_time); + XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->cname(), start_time); SIMIX_timer_set(start_time, [=]() { simix_global->create_process_function( arg->name.c_str(), @@ -570,22 +551,21 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) { - using simgrid::kernel::routing::AsVivaldi; - - AsVivaldi* as = dynamic_cast(current_routing); - xbt_assert(as, " tag can only be used in Vivaldi ASes"); + simgrid::kernel::routing::VivaldiZone* as = dynamic_cast(current_routing); + xbt_assert(as, " tag can only be used in Vivaldi netzones."); std::vector speedPerPstate; speedPerPstate.push_back(peer->speed); simgrid::s4u::Host* host = as->createHost(peer->id, &speedPerPstate, 1); - as->setPeerLink(host->pimpl_netcard, peer->bw_in, peer->bw_out, peer->lat, peer->coord); + + as->setPeerLink(host->pimpl_netcard, peer->bw_in, peer->bw_out, peer->coord); simgrid::s4u::Host::onCreation(*host); /* Change from the defaults */ if (peer->state_trace) host->pimpl_cpu->setStateTrace(peer->state_trace); - if (peer->availability_trace) - host->pimpl_cpu->setSpeedTrace(peer->availability_trace); + if (peer->speed_trace) + host->pimpl_cpu->setSpeedTrace(peer->speed_trace); } void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ } @@ -645,7 +625,7 @@ static void surf_config_models_setup() * * @param AS the parameters defining the AS to build. */ -simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) +simgrid::s4u::NetZone* sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) { if (!surf_parse_models_setup_already_called) { /* Initialize the surf models. That must be done after we got all config, and before we need the models. @@ -664,37 +644,37 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) /* search the routing model */ - simgrid::kernel::routing::AsImpl *new_as = nullptr; + simgrid::kernel::routing::NetZoneImpl* new_as = nullptr; switch(AS->routing){ case A_surfxml_AS_routing_Cluster: - new_as = new simgrid::kernel::routing::AsCluster(current_routing, AS->id); + new_as = new simgrid::kernel::routing::ClusterZone(current_routing, AS->id); break; case A_surfxml_AS_routing_ClusterDragonfly: - new_as = new simgrid::kernel::routing::AsClusterDragonfly(current_routing, AS->id); + new_as = new simgrid::kernel::routing::DragonflyZone(current_routing, AS->id); break; case A_surfxml_AS_routing_ClusterTorus: - new_as = new simgrid::kernel::routing::AsClusterTorus(current_routing, AS->id); + new_as = new simgrid::kernel::routing::TorusZone(current_routing, AS->id); break; case A_surfxml_AS_routing_ClusterFatTree: - new_as = new simgrid::kernel::routing::AsClusterFatTree(current_routing, AS->id); + new_as = new simgrid::kernel::routing::FatTreeZone(current_routing, AS->id); break; case A_surfxml_AS_routing_Dijkstra: - new_as = new simgrid::kernel::routing::AsDijkstra(current_routing, AS->id, 0); + new_as = new simgrid::kernel::routing::DijkstraZone(current_routing, AS->id, 0); break; case A_surfxml_AS_routing_DijkstraCache: - new_as = new simgrid::kernel::routing::AsDijkstra(current_routing, AS->id, 1); + new_as = new simgrid::kernel::routing::DijkstraZone(current_routing, AS->id, 1); break; case A_surfxml_AS_routing_Floyd: - new_as = new simgrid::kernel::routing::AsFloyd(current_routing, AS->id); + new_as = new simgrid::kernel::routing::FloydZone(current_routing, AS->id); break; case A_surfxml_AS_routing_Full: - new_as = new simgrid::kernel::routing::AsFull(current_routing, AS->id); + new_as = new simgrid::kernel::routing::FullZone(current_routing, AS->id); break; case A_surfxml_AS_routing_None: - new_as = new simgrid::kernel::routing::AsNone(current_routing, AS->id); + new_as = new simgrid::kernel::routing::EmptyZone(current_routing, AS->id); break; case A_surfxml_AS_routing_Vivaldi: - new_as = new simgrid::kernel::routing::AsVivaldi(current_routing, AS->id); + new_as = new simgrid::kernel::routing::VivaldiZone(current_routing, AS->id); break; default: xbt_die("Not a valid model!"); @@ -702,14 +682,14 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) } if (current_routing == nullptr) { /* it is the first one */ - xbt_assert(simgrid::s4u::Engine::instance()->pimpl->rootAs_ == nullptr, + xbt_assert(simgrid::s4u::Engine::instance()->pimpl->netRoot_ == nullptr, "All defined components must belong to a AS"); - simgrid::s4u::Engine::instance()->pimpl->rootAs_ = new_as; + simgrid::s4u::Engine::instance()->pimpl->netRoot_ = new_as; } else { /* set the father behavior */ - if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset) - current_routing->hierarchy_ = simgrid::kernel::routing::AsImpl::RoutingMode::recursive; + if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset) + current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::recursive; /* add to the sons dictionary */ xbt_dict_set(current_routing->children(), AS->id, (void *) new_as, nullptr); } @@ -717,7 +697,6 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) /* set the new current component of the tree */ current_routing = new_as; - simgrid::kernel::routing::asCreatedCallbacks(new_as); if (TRACE_is_enabled()) sg_instr_AS_begin(AS); @@ -734,7 +713,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(); @@ -745,21 +724,33 @@ void sg_platf_new_hostlink(sg_platf_host_link_cbarg_t hostlink) { 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), - "Only hosts from Cluster and Vivaldi ASes can get an host_link."); + 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; - link_up_down.linkUp = Link::byName(hostlink->link_up); - link_up_down.linkDown = Link::byName(hostlink->link_down); + simgrid::surf::Link* linkUp = Link::byName(hostlink->link_up); + simgrid::surf::Link* linkDown = Link::byName(hostlink->link_down); - xbt_assert(link_up_down.linkUp, "Link '%s' not found!",hostlink->link_up); - xbt_assert(link_up_down.linkDown, "Link '%s' not found!",hostlink->link_down); + xbt_assert(linkUp, "Link '%s' not found!", hostlink->link_up); + xbt_assert(linkDown, "Link '%s' not found!", hostlink->link_down); - auto as_cluster = static_cast(current_routing); + auto as_cluster = static_cast(current_routing); if (as_cluster->privateLinks_.find(netcard->id()) != as_cluster->privateLinks_.end()) surf_parse_error("Host_link for '%s' is already defined!",hostlink->id); - XBT_DEBUG("Push Host_link for host '%s' to position %d", netcard->name().c_str(), netcard->id()); - as_cluster->privateLinks_.insert({netcard->id(), link_up_down}); + XBT_DEBUG("Push Host_link for host '%s' to position %d", netcard->cname(), netcard->id()); + as_cluster->privateLinks_.insert({netcard->id(), {linkUp, linkDown}}); +} + +void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) +{ + tmgr_trace_t tmgr_trace; + if (trace->file && strcmp(trace->file, "") != 0) { + tmgr_trace = tmgr_trace_new_from_file(trace->file); + } else { + xbt_assert(strcmp(trace->pc_data, ""), + "Trace '%s' must have either a content, or point to a file on disk.",trace->id); + tmgr_trace = tmgr_trace_new_from_string(trace->id, trace->pc_data, trace->periodicity); + } + xbt_dict_set(traces_set_list, trace->id, static_cast(tmgr_trace), nullptr); }