X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5ae4444e56c58d6a957263114cff7d81ff48f6a8..42a5c2c5fa27026391c465eb71f8c6486b6af403:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 036b9ca4a7..e1971f0ad1 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/surf/AsImpl.hpp" -#include "src/surf/AsCluster.hpp" -#include "src/surf/AsClusterTorus.hpp" -#include "src/surf/AsClusterFatTree.hpp" -#include "src/surf/AsClusterDragonfly.hpp" -#include "src/surf/AsDijkstra.hpp" -#include "src/surf/AsFloyd.hpp" -#include "src/surf/AsFull.hpp" -#include "src/surf/AsNone.hpp" -#include "src/surf/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,15 +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) { - 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()); @@ -205,6 +206,10 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router) xbt_lib_set(as_router_lib, router->id, COORD_ASR_LEVEL, (void *) ctn); } + 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 (TRACE_is_enabled() && TRACE_needs_platform()) sg_instr_new_router(router); } @@ -236,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; @@ -263,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){ @@ -296,18 +301,17 @@ 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); - s_surf_parsing_link_up_down_t info_lim, info_loop; + 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 @@ -325,10 +329,12 @@ 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 = info_loop.linkDown = Link::byName(tmp_link); + info_loop.linkUp = Link::byName(tmp_link); + info_loop.linkDown = Link::byName(tmp_link); free(tmp_link); + auto as_cluster = static_cast(current_as); - xbt_dynar_set(as_cluster->privateLinks_, rankId*as_cluster->linkCountPerNode_, &info_loop); + as_cluster->privateLinks_.insert({rankId*as_cluster->linkCountPerNode_, info_loop}); } //add a limiter link (shared link to account for maximal bandwidth of the node) @@ -344,12 +350,13 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) sg_platf_new_link(&link); info_lim.linkUp = info_lim.linkDown = Link::byName(tmp_link); free(tmp_link); - xbt_dynar_set(current_as->privateLinks_, rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_ , &info_lim); + current_as->privateLinks_.insert( + {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_ , info_lim}); } //call the cluster function that adds the others links if (cluster->topology == SURF_CLUSTER_FAT_TREE) { - ((AsClusterFatTree*) current_as)->addProcessingNode(i); + static_cast(current_as)->addProcessingNode(i); } else { current_as->create_links_for_node(cluster, i, rankId, @@ -372,7 +379,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 @@ -397,7 +404,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()); @@ -417,10 +424,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)); @@ -570,29 +575,28 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) msg->data[msg->used-3]='\0'; xbt_die("%s", msg->data); } - xbt_main_func_t parse_code = SIMIX_get_registered_function(process->function); - xbt_assert(parse_code, "Function '%s' unknown", process->function); + simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(process->function); + xbt_assert(factory, "Function '%s' unknown", process->function); double start_time = process->start_time; double kill_time = process->kill_time; int auto_restart = process->on_failure == SURF_PROCESS_ON_FAILURE_DIE ? 0 : 1; - std::function code = simgrid::xbt::wrapMain(parse_code, process->argc, process->argv); + std::vector args(process->argv, process->argv + process->argc); + std::function code = factory(std::move(args)); smx_process_arg_t arg = nullptr; - smx_process_t process_created = nullptr; + smx_actor_t process_created = nullptr; arg = new simgrid::simix::ProcessArg(); arg->name = std::string(process->argv[0]); arg->code = code; arg->data = nullptr; - arg->hostname = sg_host_get_name(host); + arg->host = host; arg->kill_time = kill_time; arg->properties = current_property_set; - if (!sg_host_simix(host)->boot_processes) - sg_host_simix(host)->boot_processes = xbt_dynar_new(sizeof(smx_process_arg_t), _SIMIX_host_free_process_arg); - xbt_dynar_push_as(sg_host_simix(host)->boot_processes,smx_process_arg_t,arg); + sg_host_simix(host)->boot_processes.push_back(arg); if (start_time > SIMIX_get_clock()) { @@ -600,18 +604,18 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) arg->name = std::string(process->argv[0]); arg->code = std::move(code); arg->data = nullptr; - arg->hostname = sg_host_get_name(host); + arg->host = host; 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->hostname, start_time); + XBT_DEBUG("Process %s@%s will be started at time %f", + arg->name.c_str(), arg->host->name().c_str(), start_time); SIMIX_timer_set(start_time, [=]() { simix_global->create_process_function( arg->name.c_str(), std::move(arg->code), arg->data, - arg->hostname, + arg->host, arg->kill_time, arg->properties, arg->auto_restart, @@ -622,15 +626,10 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), sg_host_get_name(host)); - if (simix_global->create_process_function) - process_created = simix_global->create_process_function( - arg->name.c_str(), std::move(code), nullptr, - sg_host_get_name(host), kill_time, - current_property_set, auto_restart, nullptr); - else - process_created = simcall_process_create( - arg->name.c_str(), std::move(code), nullptr, sg_host_get_name(host), kill_time, - current_property_set,auto_restart); + process_created = simix_global->create_process_function( + arg->name.c_str(), std::move(code), nullptr, + host, kill_time, + current_property_set, auto_restart, nullptr); /* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */ if (!process_created) { @@ -642,8 +641,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); @@ -661,14 +660,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)); @@ -703,7 +700,6 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) router.id = router_id; router.coord = peer->coord; sg_platf_new_router(&router); - static_cast(current_routing)->router_ = static_cast(xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL)); XBT_DEBUG(""); sg_platf_new_AS_seal(); @@ -822,23 +818,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; @@ -849,8 +845,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 { @@ -864,7 +860,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); @@ -881,7 +877,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(); @@ -890,9 +886,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; @@ -902,12 +898,11 @@ void sg_platf_new_hostlink(sg_platf_host_link_cbarg_t hostlink) 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); - // If dynar is is greater than netcard id and if the host_link is already defined - 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); + 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(), netcard->id()); - xbt_dynar_set_as(as_cluster->privateLinks_, netcard->id(), s_surf_parsing_link_up_down_t, link_up_down); + as_cluster->privateLinks_.insert({netcard->id(), link_up_down}); }