X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0eead244337fde8f0508629f8f8473f946c19f88..0a95c78251f3ecbf1dfcb3ebe7904e44acf1beef:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index af64bdeccb..94fb072984 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,25 +1,13 @@ -/* Copyright (c) 2006-2014. 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 "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" @@ -32,7 +20,7 @@ #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/NetPoint.hpp" #include "src/kernel/routing/NetZoneImpl.hpp" #include "src/kernel/routing/TorusZone.hpp" #include "src/kernel/routing/VivaldiZone.hpp" @@ -44,9 +32,7 @@ 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; } } @@ -66,9 +52,8 @@ 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(); + simgrid::s4u::onPlatformCreated.disconnect_all_slots(); /* make sure that we will reinit the models while loading the platf once reinited */ surf_parse_models_setup_already_called = 0; @@ -78,20 +63,22 @@ void sg_platf_exit() { /** @brief Add an host to the current AS */ void sg_platf_new_host(sg_platf_host_cbarg_t args) { - simgrid::s4u::Host* host = routing_get_current()->createHost(args->id, &args->speed_per_pstate, args->core_amount); - - new simgrid::surf::HostImpl(host, mount_list); - xbt_lib_set(storage_lib, args->id, ROUTING_STORAGE_HOST_LEVEL, static_cast(mount_list)); - mount_list = nullptr; - + std::unordered_map props; if (args->properties) { xbt_dict_cursor_t cursor=nullptr; char *key,*data; xbt_dict_foreach (args->properties, cursor, key, data) - host->setProperty(key, data); + props[key] = data; xbt_dict_free(&args->properties); } + simgrid::s4u::Host* host = + routing_get_current()->createHost(args->id, &args->speed_per_pstate, args->core_amount, &props); + + host->pimpl_->storage_ = mount_list; + xbt_lib_set(storage_lib, args->id, ROUTING_STORAGE_HOST_LEVEL, static_cast(mount_list)); + mount_list = nullptr; + /* Change from the defaults */ if (args->state_trace) host->pimpl_cpu->setStateTrace(args->state_trace); @@ -100,38 +87,32 @@ void sg_platf_new_host(sg_platf_host_cbarg_t args) if (args->pstate != 0) host->pimpl_cpu->setPState(args->pstate); if (args->coord && strcmp(args->coord, "")) - new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netcard, args->coord); - - simgrid::s4u::Host::onCreation(*host); + new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord); if (TRACE_is_enabled() && TRACE_needs_platform()) sg_instr_new_host(*host); } /** @brief Add a "router" to the network element list */ -void sg_platf_new_router(sg_platf_router_cbarg_t router) +simgrid::kernel::routing::NetPoint* sg_platf_new_router(const char* name, const char* coords) { simgrid::kernel::routing::NetZoneImpl* current_routing = routing_get_current(); if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset) current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::base; - xbt_assert(nullptr == xbt_dict_get_or_null(netcards_dict, router->id), - "Refusing to create a router named '%s': this name already describes a node.", router->id); + xbt_assert(nullptr == simgrid::s4u::Engine::instance()->netpointByNameOrNull(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_dict_set(netcards_dict, router->id, netcard, nullptr); - XBT_DEBUG("Router '%s' has the id %d", router->id, netcard->id()); + simgrid::kernel::routing::NetPoint* netpoint = + new simgrid::kernel::routing::NetPoint(name, simgrid::kernel::routing::NetPoint::Type::Router, current_routing); + XBT_DEBUG("Router '%s' has the id %d", name, netpoint->id()); - if (router->coord && strcmp(router->coord, "")) - new simgrid::kernel::routing::vivaldi::Coords(netcard, router->coord); + if (coords && strcmp(coords, "")) + new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords); - auto cluster = dynamic_cast(current_routing); - if(cluster != nullptr) - cluster->router_ = static_cast(xbt_dict_get_or_null(netcards_dict, router->id)); + sg_instr_new_router(name); - if (TRACE_is_enabled() && TRACE_needs_platform()) - sg_instr_new_router(router); + return netpoint; } void sg_platf_new_link(sg_platf_link_cbarg_t link){ @@ -144,7 +125,8 @@ void sg_platf_new_link(sg_platf_link_cbarg_t link){ names.push_back(xbt_strdup(link->id)); } for (auto link_name : names) { - Link* l = surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy); + simgrid::surf::LinkImpl* l = + surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy); if (link->properties) { xbt_dict_cursor_t cursor = nullptr; @@ -163,8 +145,6 @@ 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) @@ -244,8 +224,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; + simgrid::surf::LinkImpl* linkUp = nullptr; + simgrid::surf::LinkImpl* 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,8 +236,8 @@ 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); - linkUp = Link::byName(tmp_link); - linkDown = Link::byName(tmp_link); + linkUp = simgrid::surf::LinkImpl::byName(tmp_link); + linkDown = simgrid::surf::LinkImpl::byName(tmp_link); free(tmp_link); auto as_cluster = static_cast(current_as); @@ -277,7 +257,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) link.latency = 0; link.policy = SURF_LINK_SHARED; sg_platf_new_link(&link); - linkUp = linkDown = Link::byName(tmp_link); + linkUp = linkDown = simgrid::surf::LinkImpl::byName(tmp_link); free(tmp_link); current_as->privateLinks_.insert( {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_, {linkUp, linkDown}}); @@ -296,19 +276,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_dict_get_or_null(netcards_dict, router.id); - 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)) { @@ -322,7 +299,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) XBT_DEBUG("", link.id, cluster->bb_bw, cluster->bb_lat); sg_platf_new_link(&link); - routing_cluster_add_backbone(Link::byName(link.id)); + routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(link.id)); free((char*)link.id); } @@ -332,7 +309,8 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) simgrid::surf::on_cluster(cluster); delete cluster->radicals; } -void routing_cluster_add_backbone(simgrid::surf::Link* bb) { +void routing_cluster_add_backbone(simgrid::surf::LinkImpl* bb) +{ simgrid::kernel::routing::ClusterZone* cluster = dynamic_cast(current_routing); @@ -529,7 +507,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) arg->kill_time = kill_time; arg->properties = current_property_set; - sg_host_simix(host)->boot_processes.push_back(arg); + host->extension()->boot_processes.push_back(arg); if (start_time > SIMIX_get_clock()) { @@ -542,30 +520,25 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) arg->properties = current_property_set; 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(), - std::move(arg->code), - arg->data, - arg->host, - arg->kill_time, - arg->properties, - arg->auto_restart, - nullptr); + SIMIX_timer_set(start_time, [arg]() { + smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(arg->code), arg->data, + arg->host, arg->properties, arg->auto_restart, nullptr); + if (arg->kill_time >= 0) + simcall_process_set_kill_time(actor, arg->kill_time); delete arg; }); } else { // start_time <= SIMIX_get_clock() XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->cname()); - process_created = simix_global->create_process_function( - arg->name.c_str(), std::move(code), nullptr, - host, kill_time, - current_property_set, auto_restart, nullptr); + process_created = simix_global->create_process_function(arg->name.c_str(), std::move(code), nullptr, host, + 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) { + if (!process_created) return; - } + + if (arg->kill_time >= 0) + simcall_process_set_kill_time(process_created, arg->kill_time); } current_property_set = nullptr; } @@ -573,14 +546,13 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) { simgrid::kernel::routing::VivaldiZone* as = dynamic_cast(current_routing); - xbt_assert(as, " tag can only be used in Vivaldi ASes"); + 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); + simgrid::s4u::Host* host = as->createHost(peer->id, &speedPerPstate, 1, nullptr); - as->setPeerLink(host->pimpl_netcard, peer->bw_in, peer->bw_out, peer->lat, peer->coord); - simgrid::s4u::Host::onCreation(*host); + as->setPeerLink(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord); /* Change from the defaults */ if (peer->state_trace) @@ -592,7 +564,7 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ } void sg_platf_end() { - simgrid::surf::on_postparse(); + simgrid::s4u::onPlatformCreated(); } /* Pick the right models for CPU, net and host, and call their model_init_preparse */ @@ -743,24 +715,24 @@ 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::kernel::routing::NetCard *netcard = sg_host_by_name(hostlink->id)->pimpl_netcard; - xbt_assert(netcard, "Host '%s' not found!", hostlink->id); + simgrid::kernel::routing::NetPoint* netpoint = sg_host_by_name(hostlink->id)->pimpl_netpoint; + xbt_assert(netpoint, "Host '%s' not found!", hostlink->id); xbt_assert(dynamic_cast(current_routing), "Only hosts from Cluster and Vivaldi ASes can get an host_link."); - simgrid::surf::Link* linkUp = Link::byName(hostlink->link_up); - simgrid::surf::Link* linkDown = Link::byName(hostlink->link_down); + simgrid::surf::LinkImpl* linkUp = simgrid::surf::LinkImpl::byName(hostlink->link_up); + simgrid::surf::LinkImpl* linkDown = simgrid::surf::LinkImpl::byName(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); - if (as_cluster->privateLinks_.find(netcard->id()) != as_cluster->privateLinks_.end()) + if (as_cluster->privateLinks_.find(netpoint->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->cname(), netcard->id()); - as_cluster->privateLinks_.insert({netcard->id(), {linkUp, linkDown}}); + XBT_DEBUG("Push Host_link for host '%s' to position %d", netpoint->cname(), netpoint->id()); + as_cluster->privateLinks_.insert({netpoint->id(), {linkUp, linkDown}}); } void sg_platf_new_trace(sg_platf_trace_cbarg_t trace)