X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ec34be9aff33d4bb36758eb7a057b30c9d5539c..48028d9fbcca84960514fb0622b9b22a48162cc0:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index ad15673dde..e7374e59c4 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,32 +1,29 @@ -/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2018. 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 "simgrid/kernel/routing/ClusterZone.hpp" +#include "simgrid/kernel/routing/DijkstraZone.hpp" +#include "simgrid/kernel/routing/DragonflyZone.hpp" +#include "simgrid/kernel/routing/EmptyZone.hpp" +#include "simgrid/kernel/routing/FatTreeZone.hpp" +#include "simgrid/kernel/routing/FloydZone.hpp" +#include "simgrid/kernel/routing/FullZone.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" +#include "simgrid/kernel/routing/NetZoneImpl.hpp" +#include "simgrid/kernel/routing/TorusZone.hpp" +#include "simgrid/kernel/routing/VivaldiZone.hpp" #include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Storage.hpp" - +#include "src/include/simgrid/sg_config.hpp" #include "src/kernel/EngineImpl.hpp" -#include "src/simix/smx_private.h" - -#include "src/include/simgrid/sg_config.h" - +#include "src/simix/smx_host_private.hpp" +#include "src/simix/smx_private.hpp" #include "src/surf/HostImpl.hpp" -#include "src/surf/cpu_interface.hpp" -#include "src/surf/network_interface.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/NetPoint.hpp" -#include "src/kernel/routing/NetZoneImpl.hpp" -#include "src/kernel/routing/TorusZone.hpp" -#include "src/kernel/routing/VivaldiZone.hpp" +#include "src/surf/xml/platf_private.hpp" + #include + XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); XBT_PRIVATE std::map mount_list; @@ -35,15 +32,7 @@ XBT_PRIVATE std::vector known_storages; namespace simgrid { namespace surf { -simgrid::xbt::signal on_cluster; - -} -} - -// FIXME: The following duplicates the content of s4u::Host -namespace simgrid { -namespace s4u { -extern std::map host_list; +simgrid::xbt::signal on_cluster; } } @@ -59,13 +48,14 @@ static simgrid::kernel::routing::NetZoneImpl* routing_get_current() /** Module management function: creates all internal data structures */ void sg_platf_init() -{ /* Do nothing: just for symmetry of user code */ +{ + simgrid::s4u::on_platform_created.connect(check_disk_attachment); } /** Module management function: frees all internal data structures */ void sg_platf_exit() { - simgrid::surf::on_cluster.disconnect_all_slots(); - simgrid::s4u::onPlatformCreated.disconnect_all_slots(); + simgrid::surf::on_cluster.disconnectSlots(); + simgrid::s4u::on_platform_created.disconnectSlots(); /* make sure that we will reinit the models while loading the platf once reinited */ surf_parse_models_setup_already_called = 0; @@ -73,17 +63,17 @@ void sg_platf_exit() { } /** @brief Add an host to the current AS */ -void sg_platf_new_host(sg_platf_host_cbarg_t args) +void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args) { std::map props; if (args->properties) { - for (auto elm : *args->properties) + for (auto const& elm : *args->properties) props.insert({elm.first, elm.second}); delete args->properties; } simgrid::s4u::Host* host = - routing_get_current()->createHost(args->id, &args->speed_per_pstate, args->core_amount, &props); + routing_get_current()->create_host(args->id, &args->speed_per_pstate, args->core_amount, &props); host->pimpl_->storage_ = mount_list; mount_list.clear(); @@ -92,7 +82,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t args) if (args->state_trace) host->pimpl_cpu->setStateTrace(args->state_trace); if (args->speed_trace) - host->pimpl_cpu->setSpeedTrace(args->speed_trace); + host->pimpl_cpu->set_speed_trace(args->speed_trace); if (args->pstate != 0) host->pimpl_cpu->setPState(args->pstate); if (args->coord && strcmp(args->coord, "")) @@ -100,18 +90,18 @@ void sg_platf_new_host(sg_platf_host_cbarg_t args) } /** @brief Add a "router" to the network element list */ -simgrid::kernel::routing::NetPoint* sg_platf_new_router(const char* name, const char* coords) +simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string 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 == simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name), - "Refusing to create a router named '%s': this name already describes a node.", name); + xbt_assert(nullptr == simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(name), + "Refusing to create a router named '%s': this name already describes a node.", name.c_str()); 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 %u", name, netpoint->id()); + XBT_DEBUG("Router '%s' has the id %u", name.c_str(), netpoint->id()); if (coords && strcmp(coords, "")) new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords); @@ -120,24 +110,23 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(const char* name, const return netpoint; } -void sg_platf_new_link(LinkCreationArgs* link) +void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link) { std::vector names; - if (link->policy == SURF_LINK_FULLDUPLEX) { + if (link->policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) { names.push_back(link->id+ "_UP"); names.push_back(link->id+ "_DOWN"); } else { names.push_back(link->id); } - for (auto link_name : names) { - simgrid::surf::LinkImpl* l = - surf_network_model->createLink(link_name.c_str(), link->bandwidth, link->latency, link->policy); + for (auto const& link_name : names) { + simgrid::kernel::resource::LinkImpl* l = + surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy); if (link->properties) { - for (auto elm : *link->properties) + for (auto const& elm : *link->properties) l->setProperty(elm.first, elm.second); - delete link->properties; } if (link->latency_trace) @@ -147,9 +136,10 @@ void sg_platf_new_link(LinkCreationArgs* link) if (link->state_trace) l->setStateTrace(link->state_trace); } + delete link->properties; } -void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) +void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster) { using simgrid::kernel::routing::ClusterZone; using simgrid::kernel::routing::DragonflyZone; @@ -159,49 +149,48 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) int rankId=0; // What an inventive way of initializing the AS that I have as ancestor :-( - s_sg_platf_AS_cbarg_t AS; - AS.id = cluster->id; + simgrid::kernel::routing::ZoneCreationArgs zone; + zone.id = cluster->id; switch (cluster->topology) { - case SURF_CLUSTER_TORUS: - AS.routing = A_surfxml_AS_routing_ClusterTorus; - break; - case SURF_CLUSTER_DRAGONFLY: - AS.routing = A_surfxml_AS_routing_ClusterDragonfly; - break; - case SURF_CLUSTER_FAT_TREE: - AS.routing = A_surfxml_AS_routing_ClusterFatTree; - break; - default: - AS.routing = A_surfxml_AS_routing_Cluster; - break; + case simgrid::kernel::routing::ClusterTopology::TORUS: + zone.routing = A_surfxml_AS_routing_ClusterTorus; + break; + case simgrid::kernel::routing::ClusterTopology::DRAGONFLY: + zone.routing = A_surfxml_AS_routing_ClusterDragonfly; + break; + case simgrid::kernel::routing::ClusterTopology::FAT_TREE: + zone.routing = A_surfxml_AS_routing_ClusterFatTree; + break; + default: + zone.routing = A_surfxml_AS_routing_Cluster; + break; } - sg_platf_new_AS_begin(&AS); + sg_platf_new_Zone_begin(&zone); 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){ - current_as->linkCountPerNode_++; - current_as->hasLoopback_ = 1; + current_as->num_links_per_node_++; + current_as->has_loopback_ = true; } if(cluster->limiter_link > 0){ - current_as->linkCountPerNode_++; - current_as->hasLimiter_ = 1; + current_as->num_links_per_node_++; + current_as->has_limiter_ = true; } - for (int i : *cluster->radicals) { - char * host_id = bprintf("%s%d%s", cluster->prefix, i, cluster->suffix); - char * link_id = bprintf("%s_link_%d", cluster->id, i); + for (int const& i : *cluster->radicals) { + std::string host_id = std::string(cluster->prefix) + std::to_string(i) + cluster->suffix; + std::string link_id = std::string(cluster->id) + "_link_" + std::to_string(i); - XBT_DEBUG("", host_id, cluster->speeds.front()); + XBT_DEBUG("", host_id.c_str(), cluster->speeds.front()); - s_sg_platf_host_cbarg_t host; - memset(&host, 0, sizeof(host)); - host.id = host_id; + simgrid::kernel::routing::HostCreationArgs host; + host.id = host_id.c_str(); if ((cluster->properties != nullptr) && (not cluster->properties->empty())) { host.properties = new std::map; - for (auto elm : *cluster->properties) + for (auto const& elm : *cluster->properties) host.properties->insert({elm.first, elm.second}); } @@ -212,7 +201,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) sg_platf_new_host(&host); XBT_DEBUG(""); - XBT_DEBUG("", link_id, cluster->bw, cluster->lat); + XBT_DEBUG("", link_id.c_str(), cluster->bw, cluster->lat); // All links are saved in a matrix; // every row describes a single node; every node may have multiple links. @@ -221,23 +210,23 @@ 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 - simgrid::surf::LinkImpl* linkUp = nullptr; - simgrid::surf::LinkImpl* linkDown = nullptr; + simgrid::kernel::resource::LinkImpl* linkUp = nullptr; + simgrid::kernel::resource::LinkImpl* linkDown = nullptr; if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){ - std::string tmp_link = std::string(link_id) + "_loopback"; + std::string tmp_link = link_id + "_loopback"; XBT_DEBUG("", tmp_link.c_str(), cluster->loopback_bw); - LinkCreationArgs link; - link.id = tmp_link.c_str(); + simgrid::kernel::routing::LinkCreationArgs link; + link.id = tmp_link; link.bandwidth = cluster->loopback_bw; link.latency = cluster->loopback_lat; - link.policy = SURF_LINK_FATPIPE; + link.policy = simgrid::s4u::Link::SharingPolicy::FATPIPE; sg_platf_new_link(&link); - linkUp = simgrid::surf::LinkImpl::byName(tmp_link.c_str()); - linkDown = simgrid::surf::LinkImpl::byName(tmp_link.c_str()); + linkUp = simgrid::kernel::resource::LinkImpl::byName(tmp_link); + linkDown = simgrid::kernel::resource::LinkImpl::byName(tmp_link); - auto as_cluster = static_cast(current_as); - as_cluster->privateLinks_.insert({rankId * as_cluster->linkCountPerNode_, {linkUp, linkDown}}); + auto* as_cluster = static_cast(current_as); + as_cluster->private_links_.insert({as_cluster->node_pos(rankId), {linkUp, linkDown}}); } //add a limiter link (shared link to account for maximal bandwidth of the node) @@ -247,38 +236,33 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) std::string tmp_link = std::string(link_id) + "_limiter"; XBT_DEBUG("", tmp_link.c_str(), cluster->limiter_link); - LinkCreationArgs link; - link.id = tmp_link.c_str(); + simgrid::kernel::routing::LinkCreationArgs link; + link.id = tmp_link; link.bandwidth = cluster->limiter_link; link.latency = 0; - link.policy = SURF_LINK_SHARED; + link.policy = simgrid::s4u::Link::SharingPolicy::SHARED; sg_platf_new_link(&link); - linkDown = simgrid::surf::LinkImpl::byName(tmp_link.c_str()); + linkDown = simgrid::kernel::resource::LinkImpl::byName(tmp_link); linkUp = linkDown; - current_as->privateLinks_.insert( - {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_, {linkUp, linkDown}}); + current_as->private_links_.insert({current_as->node_pos_with_loopback(rankId), {linkUp, linkDown}}); } //call the cluster function that adds the others links - if (cluster->topology == SURF_CLUSTER_FAT_TREE) { - static_cast(current_as)->addProcessingNode(i); + if (cluster->topology == simgrid::kernel::routing::ClusterTopology::FAT_TREE) { + static_cast(current_as)->add_processing_node(i); } else { - current_as->create_links_for_node(cluster, i, rankId, - rankId*current_as->linkCountPerNode_ + current_as->hasLoopback_ + current_as->hasLimiter_ ); + current_as->create_links_for_node(cluster, i, rankId, current_as->node_pos_with_loopback_limiter(rankId)); } - xbt_free(link_id); - xbt_free(host_id); rankId++; } delete cluster->properties; // Add a router. XBT_DEBUG(" "); - XBT_DEBUG("", cluster->router_id); - if (not cluster->router_id || not strcmp(cluster->router_id, "")) { - char* newid = bprintf("%s%s_router%s", cluster->prefix, cluster->id, cluster->suffix); + XBT_DEBUG("", cluster->router_id.c_str()); + if (cluster->router_id.empty()) { + std::string newid = std::string(cluster->prefix) + cluster->id + "_router" + 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); } @@ -286,7 +270,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) //Make the backbone if ((cluster->bb_bw > 0) || (cluster->bb_lat > 0)) { - LinkCreationArgs link; + simgrid::kernel::routing::LinkCreationArgs link; link.id = std::string(cluster->id)+ "_backbone"; link.bandwidth = cluster->bb_bw; link.latency = cluster->bb_lat; @@ -295,60 +279,56 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) XBT_DEBUG("", link.id.c_str(), cluster->bb_bw, cluster->bb_lat); sg_platf_new_link(&link); - routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(link.id.c_str())); + routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl::byName(link.id)); } XBT_DEBUG(""); - sg_platf_new_AS_seal(); + sg_platf_new_Zone_seal(); simgrid::surf::on_cluster(cluster); delete cluster->radicals; } -void routing_cluster_add_backbone(simgrid::surf::LinkImpl* bb) +void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb) { 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->getCname()); + xbt_assert(nullptr == cluster->backbone_, "Cluster %s already has a backbone link!", cluster->get_cname()); cluster->backbone_ = bb; - XBT_DEBUG("Add a backbone to AS '%s'", current_routing->getCname()); + XBT_DEBUG("Add a backbone to AS '%s'", current_routing->get_cname()); } -void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) +void sg_platf_new_cabinet(simgrid::kernel::routing::CabinetCreationArgs* cabinet) { - for (int radical : *cabinet->radicals) { - std::string hostname = std::string(cabinet->prefix) + std::to_string(radical) + std::string(cabinet->suffix); - s_sg_platf_host_cbarg_t host; - memset(&host, 0, sizeof(host)); + for (int const& radical : *cabinet->radicals) { + std::string hostname = cabinet->prefix + std::to_string(radical) + cabinet->suffix; + simgrid::kernel::routing::HostCreationArgs host; host.pstate = 0; host.core_amount = 1; host.id = hostname.c_str(); host.speed_per_pstate.push_back(cabinet->speed); sg_platf_new_host(&host); - LinkCreationArgs link; - link.policy = SURF_LINK_FULLDUPLEX; + simgrid::kernel::routing::LinkCreationArgs link; + link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX; link.latency = cabinet->lat; link.bandwidth = cabinet->bw; link.id = "link_" + hostname; sg_platf_new_link(&link); - s_sg_platf_host_link_cbarg_t host_link; - memset(&host_link, 0, sizeof(host_link)); - std::string tmp_link_up = std::string("link_") + hostname + "_UP"; - std::string tmp_link_down = std::string("link_") + hostname + "_DOWN"; - host_link.id = hostname.c_str(); - host_link.link_up = tmp_link_up.c_str(); - host_link.link_down = tmp_link_down.c_str(); + simgrid::kernel::routing::HostLinkCreationArgs host_link; + host_link.id = hostname; + host_link.link_up = std::string("link_") + hostname + "_UP"; + host_link.link_down = std::string("link_") + hostname + "_DOWN"; sg_platf_new_hostlink(&host_link); } delete cabinet->radicals; } -void sg_platf_new_storage(StorageCreationArgs* storage) +void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage) { xbt_assert(std::find(known_storages.begin(), known_storages.end(), storage->id) == known_storages.end(), "Refusing to add a second storage named \"%s\"", storage->id.c_str()); @@ -382,13 +362,13 @@ void sg_platf_new_storage(StorageCreationArgs* storage) auto s = surf_storage_model->createStorage(storage->id, stype->id, storage->content, storage->attach); if (storage->properties) { - for (auto elm : *storage->properties) + for (auto const& elm : *storage->properties) s->setProperty(elm.first, elm.second); delete storage->properties; } } -void sg_platf_new_storage_type(StorageTypeCreationArgs* storage_type) +void sg_platf_new_storage_type(simgrid::kernel::routing::StorageTypeCreationArgs* storage_type) { xbt_assert(storage_types.find(storage_type->id) == storage_types.end(), "Reading a storage type, processing unit \"%s\" already exists", storage_type->id.c_str()); @@ -403,7 +383,7 @@ void sg_platf_new_storage_type(StorageTypeCreationArgs* storage_type) storage_types[storage_type->id] = stype; } -void sg_platf_new_mount(MountCreationArgs* mount) +void sg_platf_new_mount(simgrid::kernel::routing::MountCreationArgs* mount) { xbt_assert(std::find(known_storages.begin(), known_storages.end(), mount->storageId) != known_storages.end(), "Cannot mount non-existent disk \"%s\"", mount->storageId.c_str()); @@ -412,35 +392,33 @@ void sg_platf_new_mount(MountCreationArgs* mount) if (mount_list.empty()) XBT_DEBUG("Create a Mount list for %s", A_surfxml_host_id); - mount_list.insert({mount->name, simgrid::surf::StorageImpl::byName(mount->storageId.c_str())}); + mount_list.insert({mount->name, simgrid::s4u::Engine::get_instance()->storage_by_name(mount->storageId)->getImpl()}); } -void sg_platf_new_route(sg_platf_route_cbarg_t route) +void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route) { - routing_get_current()->addRoute(route); + routing_get_current()->add_route(route->src, route->dst, route->gw_src, route->gw_dst, route->link_list, + route->symmetrical); } -void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute) +void sg_platf_new_bypassRoute(simgrid::kernel::routing::RouteCreationArgs* bypassRoute) { - routing_get_current()->addBypassRoute(bypassRoute); + routing_get_current()->add_bypass_route(bypassRoute->src, bypassRoute->dst, bypassRoute->gw_src, bypassRoute->gw_dst, + bypassRoute->link_list, bypassRoute->symmetrical); } -void sg_platf_new_process(sg_platf_process_cbarg_t process) +void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) { - std::map props; - if (process->properties) { - for (auto elm : *process->properties) - props.insert({elm.first, elm.second}); - delete process->properties; - } - sg_host_t host = sg_host_by_name(process->host); + sg_host_t host = sg_host_by_name(actor->host); if (not host) { // The requested host does not exist. Do a nice message to the user - std::string msg = std::string("Cannot create process '") + process->function + "': host '" + process->host + + std::string msg = std::string("Cannot create actor '") + actor->function + "': host '" + actor->host + "' does not exist\nExisting hosts: '"; - for (auto kv : simgrid::s4u::host_list) { - simgrid::s4u::Host* host = kv.second; - msg += host->getName(); + + std::vector list = simgrid::s4u::Engine::get_instance()->get_all_hosts(); + + for (auto const& host : list) { + msg += host->get_name(); msg += "', '"; if (msg.length() > 1024) { msg.pop_back(); // remove trailing quote @@ -450,42 +428,30 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) } xbt_die("%s", msg.c_str()); } - simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(process->function); - xbt_assert(factory, "Function '%s' unknown", process->function); + simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(actor->function); + xbt_assert(factory, "Function '%s' unknown", actor->function); - double start_time = process->start_time; - double kill_time = process->kill_time; - int auto_restart = process->on_failure == SURF_ACTOR_ON_FAILURE_DIE ? 0 : 1; + double start_time = actor->start_time; + double kill_time = actor->kill_time; + bool auto_restart = actor->on_failure != simgrid::kernel::routing::ActorOnFailure::DIE; - std::vector args(process->argv, process->argv + process->argc); - std::function code = factory(std::move(args)); + std::string actor_name = actor->args[0]; + std::function code = factory(std::move(actor->args)); + std::shared_ptr> properties(actor->properties); - smx_process_arg_t arg = nullptr; - - arg = new simgrid::simix::ProcessArg(); - arg->name = std::string(process->argv[0]); - arg->code = code; - arg->data = nullptr; - arg->host = host; - arg->kill_time = kill_time; - arg->properties = &props; + simgrid::kernel::actor::ProcessArg* arg = + new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart); host->extension()->boot_processes.push_back(arg); if (start_time > SIMIX_get_clock()) { - arg = new simgrid::simix::ProcessArg(); - arg->name = std::string(process->argv[0]); - arg->code = std::move(code); - arg->data = nullptr; - arg->host = host; - arg->kill_time = kill_time; - arg->properties = &props; + arg = new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart); - XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->getCname(), start_time); + XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->get_cname(), start_time); SIMIX_timer_set(start_time, [arg, auto_restart]() { smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(arg->code), arg->data, - arg->host, arg->properties, nullptr); + arg->host, arg->properties.get(), nullptr); if (arg->kill_time >= 0) simcall_process_set_kill_time(actor, arg->kill_time); if (auto_restart) @@ -493,10 +459,10 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) delete arg; }); } else { // start_time <= SIMIX_get_clock() - XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->getCname()); + XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->get_cname()); smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(code), nullptr, host, - arg->properties, nullptr); + arg->properties.get(), nullptr); /* The actor creation will fail if the host is currently dead, but that's fine */ if (actor != nullptr) { @@ -506,17 +472,16 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) SIMIX_process_auto_restart_set(actor, auto_restart); } } - current_property_set = nullptr; } -void sg_platf_new_peer(PeerCreationArgs* peer) +void sg_platf_new_peer(simgrid::kernel::routing::PeerCreationArgs* peer) { 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.c_str(), &speedPerPstate, 1, nullptr); + simgrid::s4u::Host* host = as->create_host(peer->id.c_str(), &speedPerPstate, 1, nullptr); as->setPeerLink(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord); @@ -524,34 +489,28 @@ void sg_platf_new_peer(PeerCreationArgs* peer) if (peer->state_trace) host->pimpl_cpu->setStateTrace(peer->state_trace); if (peer->speed_trace) - host->pimpl_cpu->setSpeedTrace(peer->speed_trace); -} - -void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ } - -void sg_platf_end() { - simgrid::s4u::onPlatformCreated(); + host->pimpl_cpu->set_speed_trace(peer->speed_trace); } /* Pick the right models for CPU, net and host, and call their model_init_preparse */ static void surf_config_models_setup() { - const char* host_model_name = xbt_cfg_get_string("host/model"); - const char* network_model_name = xbt_cfg_get_string("network/model"); - const char* cpu_model_name = xbt_cfg_get_string("cpu/model"); - const char* storage_model_name = xbt_cfg_get_string("storage/model"); + 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 storage_model_name = simgrid::config::get_value("storage/model"); /* The compound host model is needed when using non-default net/cpu models */ - if ((not xbt_cfg_is_default_value("network/model") || not xbt_cfg_is_default_value("cpu/model")) && - xbt_cfg_is_default_value("host/model")) { + 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"; - xbt_cfg_set_string("host/model", host_model_name); + simgrid::config::set_value("host/model", host_model_name); } - XBT_DEBUG("host model: %s", host_model_name); - if (not strcmp(host_model_name, "compound")) { - xbt_assert(cpu_model_name, "Set a cpu model to use with the 'compound' host model"); - xbt_assert(network_model_name, "Set a network model to use with the 'compound' host model"); + 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(); @@ -573,20 +532,20 @@ static void surf_config_models_setup() } /** - * \brief Add an AS to the platform + * \brief Add a Zone to the platform * - * Add a new autonomous system to the platform. Any elements (such as host, - * router or sub-AS) added after this call and before the corresponding call - * to sg_platf_new_AS_seal() will be added to this AS. + * Add a new autonomous system to the platform. Any elements (such as host, router or sub-Zone) added after this call + * and before the corresponding call to sg_platf_new_Zone_seal() will be added to this Zone. * - * Once this function was called, the configuration concerning the used - * models cannot be changed anymore. + * Once this function was called, the configuration concerning the used models cannot be changed anymore. * - * @param AS the parameters defining the AS to build. + * @param zone the parameters defining the Zone to build. */ -simgrid::s4u::NetZone* sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) +simgrid::s4u::NetZone* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCreationArgs* zone) { if (not surf_parse_models_setup_already_called) { + simgrid::s4u::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|AS|trace|trace_connect * @@ -602,37 +561,37 @@ simgrid::s4u::NetZone* sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) * any further config now that we created some real content */ /* search the routing model */ - simgrid::kernel::routing::NetZoneImpl* new_as = nullptr; - switch(AS->routing){ + simgrid::kernel::routing::NetZoneImpl* new_zone = nullptr; + switch (zone->routing) { case A_surfxml_AS_routing_Cluster: - new_as = new simgrid::kernel::routing::ClusterZone(current_routing, AS->id); + new_zone = new simgrid::kernel::routing::ClusterZone(current_routing, zone->id); break; case A_surfxml_AS_routing_ClusterDragonfly: - new_as = new simgrid::kernel::routing::DragonflyZone(current_routing, AS->id); + new_zone = new simgrid::kernel::routing::DragonflyZone(current_routing, zone->id); break; case A_surfxml_AS_routing_ClusterTorus: - new_as = new simgrid::kernel::routing::TorusZone(current_routing, AS->id); + new_zone = new simgrid::kernel::routing::TorusZone(current_routing, zone->id); break; case A_surfxml_AS_routing_ClusterFatTree: - new_as = new simgrid::kernel::routing::FatTreeZone(current_routing, AS->id); + new_zone = new simgrid::kernel::routing::FatTreeZone(current_routing, zone->id); break; case A_surfxml_AS_routing_Dijkstra: - new_as = new simgrid::kernel::routing::DijkstraZone(current_routing, AS->id, 0); + new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, false); break; case A_surfxml_AS_routing_DijkstraCache: - new_as = new simgrid::kernel::routing::DijkstraZone(current_routing, AS->id, 1); + new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, true); break; case A_surfxml_AS_routing_Floyd: - new_as = new simgrid::kernel::routing::FloydZone(current_routing, AS->id); + new_zone = new simgrid::kernel::routing::FloydZone(current_routing, zone->id); break; case A_surfxml_AS_routing_Full: - new_as = new simgrid::kernel::routing::FullZone(current_routing, AS->id); + new_zone = new simgrid::kernel::routing::FullZone(current_routing, zone->id); break; case A_surfxml_AS_routing_None: - new_as = new simgrid::kernel::routing::EmptyZone(current_routing, AS->id); + new_zone = new simgrid::kernel::routing::EmptyZone(current_routing, zone->id); break; case A_surfxml_AS_routing_Vivaldi: - new_as = new simgrid::kernel::routing::VivaldiZone(current_routing, AS->id); + new_zone = new simgrid::kernel::routing::VivaldiZone(current_routing, zone->id); break; default: xbt_die("Not a valid model!"); @@ -640,24 +599,20 @@ simgrid::s4u::NetZone* 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::getInstance()->pimpl->netRoot_ == nullptr, - "All defined components must belong to a networking zone."); - simgrid::s4u::Engine::getInstance()->pimpl->netRoot_ = new_as; - + simgrid::s4u::Engine::get_instance()->set_netzone_root(new_zone); } else { /* set the father behavior */ if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset) current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::recursive; /* add to the sons dictionary */ - current_routing->getChildren()->push_back(static_cast(new_as)); + current_routing->getChildren()->push_back(static_cast(new_zone)); } /* set the new current component of the tree */ - current_routing = new_as; - - simgrid::s4u::NetZone::onCreation(*new_as); // notify the signal + current_routing = new_zone; + simgrid::s4u::NetZone::onCreation(*new_zone); // notify the signal - return new_as; + return new_zone; } /** @@ -666,7 +621,7 @@ simgrid::s4u::NetZone* sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) * Once you've declared all the content of your AS, you have to seal * it with this call. Your AS is not usable until you call this function. */ -void sg_platf_new_AS_seal() +void sg_platf_new_Zone_seal() { xbt_assert(current_routing, "Cannot seal the current AS: none under construction"); current_routing->seal(); @@ -675,36 +630,36 @@ 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) +void sg_platf_new_hostlink(simgrid::kernel::routing::HostLinkCreationArgs* hostlink) { - simgrid::kernel::routing::NetPoint* netpoint = sg_host_by_name(hostlink->id)->pimpl_netpoint; - xbt_assert(netpoint, "Host '%s' not found!", hostlink->id); + simgrid::kernel::routing::NetPoint* netpoint = sg_host_by_name(hostlink->id.c_str())->pimpl_netpoint; + xbt_assert(netpoint, "Host '%s' not found!", hostlink->id.c_str()); xbt_assert(dynamic_cast(current_routing), "Only hosts from Cluster and Vivaldi ASes can get an host_link."); - simgrid::surf::LinkImpl* linkUp = simgrid::surf::LinkImpl::byName(hostlink->link_up); - simgrid::surf::LinkImpl* linkDown = simgrid::surf::LinkImpl::byName(hostlink->link_down); + simgrid::kernel::resource::LinkImpl* linkUp = simgrid::kernel::resource::LinkImpl::byName(hostlink->link_up); + simgrid::kernel::resource::LinkImpl* linkDown = simgrid::kernel::resource::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); + xbt_assert(linkUp, "Link '%s' not found!", hostlink->link_up.c_str()); + xbt_assert(linkDown, "Link '%s' not found!", hostlink->link_down.c_str()); - auto as_cluster = static_cast(current_routing); + auto* as_cluster = static_cast(current_routing); - if (as_cluster->privateLinks_.find(netpoint->id()) != as_cluster->privateLinks_.end()) - surf_parse_error(std::string("Host_link for '") + hostlink->id + "' is already defined!"); + if (as_cluster->private_links_.find(netpoint->id()) != as_cluster->private_links_.end()) + surf_parse_error(std::string("Host_link for '") + hostlink->id.c_str() + "' is already defined!"); - XBT_DEBUG("Push Host_link for host '%s' to position %u", netpoint->cname(), netpoint->id()); - as_cluster->privateLinks_.insert({netpoint->id(), {linkUp, linkDown}}); + XBT_DEBUG("Push Host_link for host '%s' to position %u", netpoint->get_cname(), netpoint->id()); + as_cluster->private_links_.insert({netpoint->id(), {linkUp, linkDown}}); } -void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) +void sg_platf_new_trace(simgrid::kernel::routing::TraceCreationArgs* trace) { tmgr_trace_t tmgr_trace; - if (trace->file && strcmp(trace->file, "") != 0) { + if (not trace->file.empty()) { 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); + xbt_assert(not trace->pc_data.empty(), "Trace '%s' must have either a content, or point to a file on disk.", + trace->id.c_str()); tmgr_trace = tmgr_trace_new_from_string(trace->id, trace->pc_data, trace->periodicity); } traces_set_list.insert({trace->id, tmgr_trace});