X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fbfd34bce9d8db2ae29a6a6e62b1e712cbe60491..e8fc101ac38c951ced584160c9d411477f4c5818:/src/kernel/routing/NetZoneImpl.cpp diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index da4070ff64..4df1cefb6a 100644 --- a/src/kernel/routing/NetZoneImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -7,6 +7,7 @@ #include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" +#include "src/include/simgrid/sg_config.hpp" #include "src/kernel/EngineImpl.hpp" #include "src/kernel/resource/DiskImpl.hpp" #include "src/surf/HostImpl.hpp" @@ -21,11 +22,76 @@ namespace simgrid { namespace kernel { namespace routing { +/* Pick the right models for CPU, net and host, and call their model_init_preparse */ +static void surf_config_models_setup() +{ + std::string host_model_name = simgrid::config::get_value("host/model"); + std::string network_model_name = simgrid::config::get_value("network/model"); + std::string cpu_model_name = simgrid::config::get_value("cpu/model"); + std::string disk_model_name = simgrid::config::get_value("disk/model"); + + /* The compound host model is needed when using non-default net/cpu models */ + if ((not simgrid::config::is_default("network/model") || not simgrid::config::is_default("cpu/model")) && + simgrid::config::is_default("host/model")) { + host_model_name = "compound"; + simgrid::config::set_value("host/model", host_model_name); + } + + XBT_DEBUG("host model: %s", host_model_name.c_str()); + if (host_model_name == "compound") { + xbt_assert(not cpu_model_name.empty(), "Set a cpu model to use with the 'compound' host model"); + xbt_assert(not network_model_name.empty(), "Set a network model to use with the 'compound' host model"); + + int cpu_id = find_model_description(surf_cpu_model_description, cpu_model_name); + surf_cpu_model_description[cpu_id].model_init_preparse(); + + int network_id = find_model_description(surf_network_model_description, network_model_name); + surf_network_model_description[network_id].model_init_preparse(); + } + + XBT_DEBUG("Call host_model_init"); + int host_id = find_model_description(surf_host_model_description, host_model_name); + surf_host_model_description[host_id].model_init_preparse(); + + XBT_DEBUG("Call vm_model_init"); + /* ideally we should get back the pointer to CpuModel from model_init_preparse(), but this + * requires changing the declaration of surf_cpu_model_description. + * To be reviewed in the future */ + surf_vm_model_init_HL13( + simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->get_cpu_pm_model().get()); + + XBT_DEBUG("Call disk_model_init"); + int disk_id = find_model_description(surf_disk_model_description, disk_model_name); + surf_disk_model_description[disk_id].model_init_preparse(); +} + NetZoneImpl::NetZoneImpl(const std::string& name) : piface_(this), name_(name) { + /* workaroud: first netzoneImpl will be the root netzone. + * Without globals and with current surf_*_model_description init functions, we need + * the root netzone to exist when creating the models. + * This was usually done at sg_platf.cpp, during XML parsing */ + if (not s4u::Engine::get_instance()->get_netzone_root()) + s4u::Engine::get_instance()->set_netzone_root(&piface_); + + static bool surf_parse_models_setup_already_called = false; + if (not surf_parse_models_setup_already_called) { + simgrid::s4u::Engine::on_platform_creation(); + + /* Initialize the surf models. That must be done after we got all config, and before we need the models. + * That is, after the last tag, if any, and before the first of cluster|peer|zone|trace|trace_connect + * + * I'm not sure for and , there may be a bug here + * (FIXME: check it out by creating a file beginning with one of these tags) + * but cluster and peer come down to zone creations, so putting this verification here is correct. + */ + surf_parse_models_setup_already_called = true; + surf_config_models_setup(); + } + xbt_assert(nullptr == s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name()), "Refusing to create a second NetZone called '%s'.", get_cname()); - netpoint_ = new NetPoint(name_, NetPoint::Type::NetZone); + netpoint_ = new NetPoint(name_, NetPoint::Type::NetZone); XBT_DEBUG("NetZone '%s' created with the id '%u'", get_cname(), netpoint_->id()); } @@ -43,6 +109,8 @@ NetZoneImpl::~NetZoneImpl() void NetZoneImpl::add_child(NetZoneImpl* new_zone) { xbt_assert(not sealed_, "Cannot add a new child to the sealed zone %s", get_cname()); + /* set the father behavior */ + hierarchy_ = RoutingMode::recursive; children_.push_back(new_zone); } @@ -79,24 +147,17 @@ s4u::Disk* NetZoneImpl::create_disk(const std::string& name, double read_bandwid return l->get_iface(); } -s4u::Link* NetZoneImpl::create_link(const std::string& name, const std::vector& bandwidths, - s4u::Link::SharingPolicy policy) +s4u::Link* NetZoneImpl::create_link(const std::string& name, const std::vector& bandwidths) { - auto* l = network_model_->create_link(name, bandwidths, policy); - - return l->get_iface(); + return network_model_->create_link(name, bandwidths)->get_iface(); } -s4u::Host* NetZoneImpl::create_host(const std::string& name, const std::vector& speed_per_pstate, - int core_amount) +s4u::Host* NetZoneImpl::create_host(const std::string& name, const std::vector& speed_per_pstate) { - if (hierarchy_ == RoutingMode::unset) - hierarchy_ = RoutingMode::base; - - auto* res = new s4u::Host(name); + auto* res = (new surf::HostImpl(name))->get_iface(); res->set_netpoint((new NetPoint(name, NetPoint::Type::Host))->set_englobing_zone(this)); - cpu_model_pm_->create_cpu(res, speed_per_pstate)->set_core_count(core_amount)->seal(); + cpu_model_pm_->create_cpu(res, speed_per_pstate); return res; } @@ -108,7 +169,7 @@ int NetZoneImpl::add_component(NetPoint* elm) } void NetZoneImpl::add_route(NetPoint* /*src*/, NetPoint* /*dst*/, NetPoint* /*gw_src*/, NetPoint* /*gw_dst*/, - std::vector& /*link_list*/, bool /*symmetrical*/) + const std::vector& /*link_list*/, bool /*symmetrical*/) { xbt_die("NetZone '%s' does not accept new routes (wrong class).", get_cname()); } @@ -400,44 +461,65 @@ void NetZoneImpl::get_global_route(NetPoint* src, NetPoint* dst, void NetZoneImpl::seal() { + /* already sealed netzone */ + if (sealed_) + return; do_seal(); // derived class' specific sealing procedure + + /* seals sub-netzones and hosts */ + for (auto* host : get_all_hosts()) { + host->seal(); + } + for (auto* sub_net : *get_children()) { + sub_net->seal(); + } sealed_ = true; } void NetZoneImpl::set_parent(NetZoneImpl* parent) { - xbt_assert(sealed_ == false, "Impossible to set parent to an already sealed NetZone(%s)", this->get_cname()); + xbt_assert(not sealed_, "Impossible to set parent to an already sealed NetZone(%s)", this->get_cname()); parent_ = parent; netpoint_->set_englobing_zone(parent_); + if (parent) { + /* adding this class as child */ + parent->add_child(this); + /* copying models from parent host, to be reviewed when we allow multi-models */ + set_network_model(parent->get_network_model()); + set_cpu_pm_model(parent->get_cpu_pm_model()); + set_cpu_vm_model(parent->get_cpu_vm_model()); + set_disk_model(parent->get_disk_model()); + set_host_model(parent->get_host_model()); + } } void NetZoneImpl::set_network_model(std::shared_ptr netmodel) { - xbt_assert(sealed_ == false, "Impossible to set network model to an already sealed NetZone(%s)", this->get_cname()); + xbt_assert(not sealed_, "Impossible to set network model to an already sealed NetZone(%s)", this->get_cname()); network_model_ = std::move(netmodel); } void NetZoneImpl::set_cpu_vm_model(std::shared_ptr cpu_model) { - xbt_assert(sealed_ == false, "Impossible to set CPU model to an already sealed NetZone(%s)", this->get_cname()); + xbt_assert(not sealed_, "Impossible to set CPU model to an already sealed NetZone(%s)", this->get_cname()); cpu_model_vm_ = std::move(cpu_model); } void NetZoneImpl::set_cpu_pm_model(std::shared_ptr cpu_model) { - xbt_assert(sealed_ == false, "Impossible to set CPU model to an already sealed NetZone(%s)", this->get_cname()); + xbt_assert(not sealed_, "Impossible to set CPU model to an already sealed NetZone(%s)", this->get_cname()); cpu_model_pm_ = std::move(cpu_model); } void NetZoneImpl::set_disk_model(std::shared_ptr disk_model) { - xbt_assert(sealed_ == false, "Impossible to set disk model to an already sealed NetZone(%s)", this->get_cname()); + xbt_assert(not sealed_, "Impossible to set disk model to an already sealed NetZone(%s)", this->get_cname()); disk_model_ = std::move(disk_model); } void NetZoneImpl::set_host_model(std::shared_ptr host_model) { - xbt_assert(sealed_ == false, "Impossible to set host model to an already sealed NetZone(%s)", this->get_cname()); + xbt_assert(not sealed_, "Impossible to set host model to an already sealed NetZone(%s)", this->get_cname()); host_model_ = std::move(host_model); }