X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/745de4b9b7e938a60ebc8a57286f795bd7ca112d..10db9e667c6afabcfb29f81ede4da2a4773ec1d3:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 3271fc0be0..30aeb1ccba 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,10 +1,11 @@ -/* Copyright (c) 2006-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2006-2017. 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/s4u/engine.hpp" +#include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Storage.hpp" + #include "src/kernel/EngineImpl.hpp" #include "src/simix/smx_private.h" @@ -21,25 +22,33 @@ #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" - +#include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); -XBT_PRIVATE xbt_dynar_t mount_list = nullptr; +XBT_PRIVATE std::map mount_list; +XBT_PRIVATE std::vector known_storages; namespace simgrid { namespace surf { simgrid::xbt::signal on_cluster; -simgrid::xbt::signal on_postparse; } } +// FIXME: The following duplicates the content of s4u::Host +namespace simgrid { +namespace s4u { +extern std::map host_list; +} +} + static int surf_parse_models_setup_already_called = 0; +std::map storage_types; /** The current AS in the parsing */ static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr; @@ -49,13 +58,14 @@ static simgrid::kernel::routing::NetZoneImpl* routing_get_current() } /** Module management function: creates all internal data structures */ -void sg_platf_init() { +void sg_platf_init() +{ /* Do nothing: just for symmetry of user code */ } /** Module management function: frees all internal data structures */ void sg_platf_exit() { 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; @@ -65,21 +75,18 @@ void sg_platf_exit() { /** @brief Add an host to the current AS */ void sg_platf_new_host(sg_platf_host_cbarg_t args) { - std::unordered_map props; + std::map props; if (args->properties) { - xbt_dict_cursor_t cursor=nullptr; - char *key,*data; - xbt_dict_foreach (args->properties, cursor, key, data) - props[key] = data; - xbt_dict_free(&args->properties); + for (auto 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); host->pimpl_->storage_ = mount_list; - xbt_lib_set(storage_lib, args->id, ROUTING_STORAGE_HOST_LEVEL, static_cast(mount_list)); - mount_list = nullptr; + mount_list.clear(); /* Change from the defaults */ if (args->state_trace) @@ -89,52 +96,48 @@ 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); - - if (TRACE_is_enabled() && TRACE_needs_platform()) - sg_instr_new_host(*host); + new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord); } /** @brief Add a "router" to the network element list */ -simgrid::kernel::routing::NetCard* sg_platf_new_router(const char* name, const char* coords) +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 == simgrid::s4u::Engine::instance()->netcardByNameOrNull(name), + xbt_assert(nullptr == simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(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(name, simgrid::kernel::routing::NetCard::Type::Router, current_routing); - XBT_DEBUG("Router '%s' has the id %d", name, 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 %u", name, netpoint->id()); if (coords && strcmp(coords, "")) - new simgrid::kernel::routing::vivaldi::Coords(netcard, coords); + new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords); - sg_instr_new_router(name); - return netcard; + return netpoint; } -void sg_platf_new_link(sg_platf_link_cbarg_t link){ - std::vector names; +void sg_platf_new_link(LinkCreationArgs* link) +{ + std::vector names; if (link->policy == SURF_LINK_FULLDUPLEX) { - names.push_back(bprintf("%s_UP", link->id)); - names.push_back(bprintf("%s_DOWN", link->id)); + names.push_back(link->id+ "_UP"); + names.push_back(link->id+ "_DOWN"); } else { - names.push_back(xbt_strdup(link->id)); + names.push_back(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.c_str(), link->bandwidth, link->latency, link->policy); if (link->properties) { - xbt_dict_cursor_t cursor = nullptr; - char *key, *data; - xbt_dict_foreach (link->properties, cursor, key, data) - l->setProperty(key, data); - xbt_dict_free(&link->properties); + for (auto elm : *link->properties) + l->setProperty(elm.first, elm.second); + delete link->properties; } if (link->latency_trace) @@ -143,8 +146,6 @@ void sg_platf_new_link(sg_platf_link_cbarg_t link){ l->setBandwidthTrace(link->bandwidth_trace); if (link->state_trace) l->setStateTrace(link->state_trace); - - xbt_free(link_name); } } @@ -157,8 +158,6 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) int rankId=0; - s_sg_platf_link_cbarg_t link; - // What an inventive way of initializing the AS that I have as ancestor :-( s_sg_platf_AS_cbarg_t AS; AS.id = cluster->id; @@ -180,12 +179,12 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) 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){ + if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){ current_as->linkCountPerNode_++; current_as->hasLoopback_ = 1; } - if(cluster->limiter_link!=0){ + if(cluster->limiter_link > 0){ current_as->linkCountPerNode_++; current_as->hasLimiter_ = 1; } @@ -194,22 +193,19 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) char * host_id = bprintf("%s%d%s", cluster->prefix, i, cluster->suffix); char * link_id = bprintf("%s_link_%d", cluster->id, i); - XBT_DEBUG("", host_id, cluster->speed); + XBT_DEBUG("", host_id, cluster->speeds.front()); s_sg_platf_host_cbarg_t host; memset(&host, 0, sizeof(host)); host.id = host_id; - if ((cluster->properties != nullptr) && (!xbt_dict_is_empty(cluster->properties))) { - xbt_dict_cursor_t cursor=nullptr; - char *key,*data; - host.properties = xbt_dict_new_homogeneous(free); + if ((cluster->properties != nullptr) && (not cluster->properties->empty())) { + host.properties = new std::map; - xbt_dict_foreach(cluster->properties,cursor,key,data) { - xbt_dict_set(host.properties, key, xbt_strdup(data), nullptr); - } + for (auto elm : *cluster->properties) + host.properties->insert({elm.first, elm.second}); } - host.speed_per_pstate.push_back(cluster->speed); + host.speed_per_pstate = cluster->speeds; host.pstate = 0; host.core_amount = cluster->core_amount; host.coord = ""; @@ -225,21 +221,20 @@ 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); - - memset(&link, 0, sizeof(link)); - link.id = tmp_link; + simgrid::surf::LinkImpl* linkUp = nullptr; + simgrid::surf::LinkImpl* linkDown = nullptr; + if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){ + std::string tmp_link = std::string(link_id) + "_loopback"; + XBT_DEBUG("", tmp_link.c_str(), cluster->loopback_bw); + + LinkCreationArgs link; + link.id = tmp_link.c_str(); link.bandwidth = cluster->loopback_bw; 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); - free(tmp_link); + linkUp = simgrid::surf::LinkImpl::byName(tmp_link.c_str()); + linkDown = simgrid::surf::LinkImpl::byName(tmp_link.c_str()); auto as_cluster = static_cast(current_as); as_cluster->privateLinks_.insert({rankId * as_cluster->linkCountPerNode_, {linkUp, linkDown}}); @@ -248,18 +243,18 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) //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); + if(cluster->limiter_link > 0){ + std::string tmp_link = std::string(link_id) + "_limiter"; + XBT_DEBUG("", tmp_link.c_str(), cluster->limiter_link); - memset(&link, 0, sizeof(link)); - link.id = tmp_link; + LinkCreationArgs link; + link.id = tmp_link.c_str(); link.bandwidth = cluster->limiter_link; link.latency = 0; link.policy = SURF_LINK_SHARED; sg_platf_new_link(&link); - linkUp = linkDown = Link::byName(tmp_link); - free(tmp_link); + linkDown = simgrid::surf::LinkImpl::byName(tmp_link.c_str()); + linkUp = linkDown; current_as->privateLinks_.insert( {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_, {linkUp, linkDown}}); } @@ -267,8 +262,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) //call the cluster function that adds the others links if (cluster->topology == SURF_CLUSTER_FAT_TREE) { static_cast(current_as)->addProcessingNode(i); - } - else { + } else { current_as->create_links_for_node(cluster, i, rankId, rankId*current_as->linkCountPerNode_ + current_as->hasLoopback_ + current_as->hasLimiter_ ); } @@ -276,11 +270,12 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) xbt_free(host_id); rankId++; } + delete cluster->properties; // Add a router. XBT_DEBUG(" "); XBT_DEBUG("", cluster->router_id); - if (!cluster->router_id || !strcmp(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); current_as->router_ = sg_platf_new_router(newid, NULL); free(newid); @@ -289,19 +284,18 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) } //Make the backbone - if ((cluster->bb_bw != 0) || (cluster->bb_lat != 0)) { + if ((cluster->bb_bw > 0) || (cluster->bb_lat > 0)) { - memset(&link, 0, sizeof(link)); - link.id = bprintf("%s_backbone", cluster->id); + LinkCreationArgs link; + link.id = std::string(cluster->id)+ "_backbone"; link.bandwidth = cluster->bb_bw; link.latency = cluster->bb_lat; link.policy = cluster->bb_sharing_policy; - XBT_DEBUG("", link.id, cluster->bb_bw, cluster->bb_lat); + XBT_DEBUG("", link.id.c_str(), cluster->bb_bw, cluster->bb_lat); sg_platf_new_link(&link); - routing_cluster_add_backbone(Link::byName(link.id)); - free((char*)link.id); + routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(link.id.c_str())); } XBT_DEBUG(""); @@ -310,145 +304,115 @@ 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); 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()); + xbt_assert(nullptr == cluster->backbone_, "Cluster %s already has a backbone link!", cluster->getCname()); cluster->backbone_ = bb; - XBT_DEBUG("Add a backbone to AS '%s'", current_routing->name()); + XBT_DEBUG("Add a backbone to AS '%s'", current_routing->getCname()); } void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) { for (int radical : *cabinet->radicals) { - char *hostname = bprintf("%s%d%s", cabinet->prefix, radical, cabinet->suffix); + 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)); host.pstate = 0; host.core_amount = 1; - host.id = hostname; + host.id = hostname.c_str(); host.speed_per_pstate.push_back(cabinet->speed); sg_platf_new_host(&host); - s_sg_platf_link_cbarg_t link; - memset(&link, 0, sizeof(link)); + LinkCreationArgs link; link.policy = SURF_LINK_FULLDUPLEX; link.latency = cabinet->lat; link.bandwidth = cabinet->bw; - link.id = bprintf("link_%s",hostname); + link.id = "link_" + hostname; sg_platf_new_link(&link); - free((char*)link.id); s_sg_platf_host_link_cbarg_t host_link; memset(&host_link, 0, sizeof(host_link)); - host_link.id = hostname; - host_link.link_up = bprintf("link_%s_UP",hostname); - host_link.link_down = bprintf("link_%s_DOWN",hostname); + 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(); sg_platf_new_hostlink(&host_link); - free((char*)host_link.link_up); - free((char*)host_link.link_down); - - free(hostname); } delete cabinet->radicals; } -void sg_platf_new_storage(sg_platf_storage_cbarg_t storage) +void sg_platf_new_storage(StorageCreationArgs* storage) { - xbt_assert(!xbt_lib_get_or_null(storage_lib, storage->id,ROUTING_STORAGE_LEVEL), - "Refusing to add a second storage named \"%s\"", storage->id); + 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()); - void* stype = xbt_lib_get_or_null(storage_type_lib, storage->type_id,ROUTING_STORAGE_TYPE_LEVEL); - xbt_assert(stype,"No storage type '%s'", storage->type_id); + simgrid::surf::StorageType* stype; + auto st = storage_types.find(storage->type_id); + if (st != storage_types.end()) { + stype = st->second; + } else { + xbt_die("No storage type '%s'", storage->type_id.c_str()); + } - XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s' and content '%s'", - storage->id, - storage->type_id, - storage->content); + XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s' and content '%s'", storage->id.c_str(), + storage->type_id.c_str(), storage->content.c_str()); - xbt_lib_set(storage_lib, storage->id, ROUTING_STORAGE_LEVEL, (void *) xbt_strdup(storage->type_id)); + known_storages.push_back(storage->id); // if storage content is not specified use the content of storage_type if any - if(!strcmp(storage->content,"") && strcmp(((storage_type_t) stype)->content,"")){ - storage->content = ((storage_type_t) stype)->content; - storage->content_type = ((storage_type_t) stype)->content_type; - XBT_DEBUG("For disk '%s' content is empty, inherit the content (of type %s) from storage type '%s' ", - storage->id,((storage_type_t) stype)->content_type, - ((storage_type_t) stype)->type_id); + if (storage->content.empty() && not stype->content.empty()) { + storage->content = stype->content; + XBT_DEBUG("For disk '%s' content is empty, inherit the content (of type %s)", storage->id.c_str(), + stype->id.c_str()); } XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' " - "\n\t\tmodel '%s' \n\t\tcontent '%s'\n\t\tcontent_type '%s' " - "\n\t\tproperties '%p''\n", - storage->id, - ((storage_type_t) stype)->model, - ((storage_type_t) stype)->type_id, - storage->content, - storage->content_type, - storage->properties); - - auto s = surf_storage_model->createStorage(storage->id, ((storage_type_t)stype)->type_id, storage->content, - storage->content_type, storage->attach); + "\n\t\tmodel '%s' \n\t\tcontent '%s' " + "\n\t\tproperties '%p''\n", + storage->id.c_str(), stype->model.c_str(), stype->id.c_str(), storage->content.c_str(), + storage->properties); + + auto s = surf_storage_model->createStorage(storage->id, stype->id, storage->content, storage->attach); if (storage->properties) { - xbt_dict_cursor_t cursor = nullptr; - char *key, *data; - xbt_dict_foreach (storage->properties, cursor, key, data) - s->setProperty(key, data); - xbt_dict_free(&storage->properties); + for (auto elm : *storage->properties) + s->setProperty(elm.first, elm.second); + delete storage->properties; } } -void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type){ - - xbt_assert(!xbt_lib_get_or_null(storage_type_lib, storage_type->id,ROUTING_STORAGE_TYPE_LEVEL), - "Reading a storage type, processing unit \"%s\" already exists", storage_type->id); - - storage_type_t stype = xbt_new0(s_storage_type_t, 1); - stype->model = xbt_strdup(storage_type->model); - stype->properties = storage_type->properties; - stype->content = xbt_strdup(storage_type->content); - stype->content_type = xbt_strdup(storage_type->content_type); - stype->type_id = xbt_strdup(storage_type->id); - stype->size = storage_type->size; - stype->model_properties = storage_type->model_properties; - - XBT_DEBUG("ROUTING Create a storage type id '%s' with model '%s', " - "content '%s', and content_type '%s'", - stype->type_id, - stype->model, - storage_type->content, - storage_type->content_type); - - xbt_lib_set(storage_type_lib, - stype->type_id, - ROUTING_STORAGE_TYPE_LEVEL, - (void *) stype); -} -static void mount_free(void *p) +void sg_platf_new_storage_type(StorageTypeCreationArgs* storage_type) { - mount_t mnt = (mount_t) p; - xbt_free(mnt->name); -} + 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()); -void sg_platf_new_mount(sg_platf_mount_cbarg_t mount){ - xbt_assert(xbt_lib_get_or_null(storage_lib, mount->storageId, ROUTING_STORAGE_LEVEL), - "Cannot mount non-existent disk \"%s\"", mount->storageId); + simgrid::surf::StorageType* stype = + new simgrid::surf::StorageType(storage_type->id, storage_type->model, storage_type->content, + storage_type->properties, storage_type->model_properties, storage_type->size); - XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->storageId, mount->name); + XBT_DEBUG("Create a storage type id '%s' with model '%s', content '%s'", storage_type->id.c_str(), + storage_type->model.c_str(), storage_type->content.c_str()); - s_mount_t mnt; - mnt.storage = surf_storage_resource_priv(surf_storage_resource_by_name(mount->storageId)); - mnt.name = xbt_strdup(mount->name); + storage_types[storage_type->id] = stype; +} - if(!mount_list){ - XBT_DEBUG("Create a Mount list for %s",A_surfxml_host_id); - mount_list = xbt_dynar_new(sizeof(s_mount_t), mount_free); - } - xbt_dynar_push(mount_list, &mnt); +void sg_platf_new_mount(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()); + + XBT_DEBUG("Mount '%s' on '%s'", mount->storageId.c_str(), mount->name.c_str()); + + 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())}); } void sg_platf_new_route(sg_platf_route_cbarg_t route) @@ -464,40 +428,33 @@ void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute) void sg_platf_new_process(sg_platf_process_cbarg_t process) { sg_host_t host = sg_host_by_name(process->host); - if (!host) { + if (not host) { // The requested host does not exist. Do a nice message to the user - char *tmp = bprintf("Cannot create process '%s': host '%s' does not exist\nExisting hosts: '",process->function, process->host); - xbt_strbuff_t msg = xbt_strbuff_new_from(tmp); - free(tmp); - xbt_dynar_t all_hosts = xbt_dynar_sort_strings(sg_hosts_as_dynar()); - simgrid::s4u::Host* host; - unsigned int cursor; - xbt_dynar_foreach(all_hosts,cursor, host) { - xbt_strbuff_append(msg, host->cname()); - xbt_strbuff_append(msg,"', '"); - if (msg->used > 1024) { - msg->data[msg->used-3]='\0'; - msg->used -= 3; - - xbt_strbuff_append(msg," ...(list truncated)......");// That will be shortened by 3 chars when existing the loop + std::string msg = std::string("Cannot create process '") + process->function + "': host '" + process->host + + "' does not exist\nExisting hosts: '"; + for (auto kv : simgrid::s4u::host_list) { + simgrid::s4u::Host* host = kv.second; + msg += host->getName(); + msg += "', '"; + if (msg.length() > 1024) { + msg.pop_back(); // remove trailing quote + msg += "...(list truncated)......"; break; } } - msg->data[msg->used-3]='\0'; - xbt_die("%s", msg->data); + 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); 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; + int auto_restart = process->on_failure == SURF_ACTOR_ON_FAILURE_DIE ? 0 : 1; std::vector args(process->argv, process->argv + process->argc); std::function code = factory(std::move(args)); smx_process_arg_t arg = nullptr; - smx_actor_t process_created = nullptr; arg = new simgrid::simix::ProcessArg(); arg->name = std::string(process->argv[0]); @@ -505,9 +462,9 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) arg->data = nullptr; arg->host = host; arg->kill_time = kill_time; - arg->properties = current_property_set; + arg->properties = process->properties; - sg_host_simix(host)->boot_processes.push_back(arg); + host->extension()->boot_processes.push_back(arg); if (start_time > SIMIX_get_clock()) { @@ -517,47 +474,45 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) arg->data = nullptr; 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->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); + arg->properties = process->properties; + + XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->getCname(), 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); + if (arg->kill_time >= 0) + simcall_process_set_kill_time(actor, arg->kill_time); + if (auto_restart) + SIMIX_process_auto_restart_set(actor, auto_restart); delete arg; }); } else { // start_time <= SIMIX_get_clock() - XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->cname()); + XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->getCname()); - process_created = simix_global->create_process_function( - arg->name.c_str(), std::move(code), nullptr, - host, kill_time, - current_property_set, auto_restart, nullptr); + smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(code), nullptr, host, + arg->properties, 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) { - return; + /* The actor creation will fail if the host is currently dead, but that's fine */ + if (actor != nullptr) { + if (arg->kill_time >= 0) + simcall_process_set_kill_time(actor, arg->kill_time); + if (auto_restart) + SIMIX_process_auto_restart_set(actor, auto_restart); } } current_property_set = nullptr; } -void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) +void sg_platf_new_peer(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, &speedPerPstate, 1, nullptr); + simgrid::s4u::Host* host = as->createHost(peer->id.c_str(), &speedPerPstate, 1, nullptr); - as->setPeerLink(host->pimpl_netcard, peer->bw_in, peer->bw_out, peer->coord); + as->setPeerLink(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord); /* Change from the defaults */ if (peer->state_trace) @@ -569,7 +524,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 */ @@ -581,14 +536,14 @@ static void surf_config_models_setup() const char* storage_model_name = xbt_cfg_get_string("storage/model"); /* The compound host model is needed when using non-default net/cpu models */ - if ((!xbt_cfg_is_default_value("network/model") || !xbt_cfg_is_default_value("cpu/model")) && + if ((not xbt_cfg_is_default_value("network/model") || not xbt_cfg_is_default_value("cpu/model")) && xbt_cfg_is_default_value("host/model")) { host_model_name = "compound"; xbt_cfg_set_string("host/model", host_model_name); } XBT_DEBUG("host model: %s", host_model_name); - if (!strcmp(host_model_name, "compound")) { + 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"); @@ -625,7 +580,7 @@ static void surf_config_models_setup() */ simgrid::s4u::NetZone* sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) { - if (!surf_parse_models_setup_already_called) { + if (not 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. * That is, after the last tag, if any, and before the first of cluster|peer|AS|trace|trace_connect * @@ -640,7 +595,6 @@ simgrid::s4u::NetZone* sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) _sg_cfg_init_status = 2; /* HACK: direct access to the global controlling the level of configuration to prevent * any further config now that we created some real content */ - /* search the routing model */ simgrid::kernel::routing::NetZoneImpl* new_as = nullptr; switch(AS->routing){ @@ -680,23 +634,22 @@ 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::instance()->pimpl->netRoot_ == nullptr, - "All defined components must belong to a AS"); - simgrid::s4u::Engine::instance()->pimpl->netRoot_ = new_as; + 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; } 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 */ - xbt_dict_set(current_routing->children(), AS->id, (void *) new_as, nullptr); + current_routing->getChildren()->push_back(static_cast(new_as)); } /* set the new current component of the tree */ current_routing = new_as; - if (TRACE_is_enabled()) - sg_instr_AS_begin(AS); + simgrid::s4u::NetZone::onCreation(*new_as); // notify the signal return new_as; } @@ -711,33 +664,31 @@ 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()); - - if (TRACE_is_enabled()) - sg_instr_AS_end(); + simgrid::s4u::NetZone::onSeal(*current_routing); + current_routing = static_cast(current_routing->getFather()); } /** @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()) - surf_parse_error("Host_link for '%s' is already defined!",hostlink->id); + if (as_cluster->privateLinks_.find(netpoint->id()) != as_cluster->privateLinks_.end()) + surf_parse_error(std::string("Host_link for '") + hostlink->id + "' is already defined!"); - 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 %u", netpoint->cname(), netpoint->id()); + as_cluster->privateLinks_.insert({netpoint->id(), {linkUp, linkDown}}); } void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) @@ -750,5 +701,5 @@ void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) "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); + traces_set_list.insert({trace->id, tmgr_trace}); }