X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d1ce25d36729721b7d7eed0fa4425e401db8a092..1ec34be9aff33d4bb36758eb7a057b30c9d5539c:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 2e10ec0209..ad15673dde 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -4,6 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Storage.hpp" #include "src/kernel/EngineImpl.hpp" #include "src/simix/smx_private.h" @@ -47,7 +48,7 @@ extern std::map host_list; } static int surf_parse_models_setup_already_called = 0; -std::map storage_types; +std::map storage_types; /** The current AS in the parsing */ static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr; @@ -74,14 +75,11 @@ 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; - char* 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 = @@ -99,7 +97,6 @@ void sg_platf_new_host(sg_platf_host_cbarg_t args) host->pimpl_cpu->setPState(args->pstate); if (args->coord && strcmp(args->coord, "")) new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord); - } /** @brief Add a "router" to the network element list */ @@ -109,17 +106,16 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(const char* name, const 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()->netpointByNameOrNull(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::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()); + XBT_DEBUG("Router '%s' has the id %u", name, netpoint->id()); if (coords && strcmp(coords, "")) new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords); - sg_instr_new_router(name); return netpoint; } @@ -139,12 +135,9 @@ void sg_platf_new_link(LinkCreationArgs* link) 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; - char* 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) @@ -205,15 +198,11 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) s_sg_platf_host_cbarg_t host; memset(&host, 0, sizeof(host)); host.id = host_id; - if ((cluster->properties != nullptr) && (not xbt_dict_is_empty(cluster->properties))) { - xbt_dict_cursor_t cursor=nullptr; - char *key; - char* data; - host.properties = xbt_dict_new_homogeneous(free); - - xbt_dict_foreach(cluster->properties,cursor,key,data) { - xbt_dict_set(host.properties, key, xbt_strdup(data), nullptr); - } + if ((cluster->properties != nullptr) && (not cluster->properties->empty())) { + host.properties = new std::map; + + for (auto elm : *cluster->properties) + host.properties->insert({elm.first, elm.second}); } host.speed_per_pstate = cluster->speeds; @@ -235,18 +224,17 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) 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); + std::string tmp_link = std::string(link_id) + "_loopback"; + XBT_DEBUG("", tmp_link.c_str(), cluster->loopback_bw); LinkCreationArgs link; - link.id = tmp_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 = simgrid::surf::LinkImpl::byName(tmp_link); - linkDown = simgrid::surf::LinkImpl::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}}); @@ -256,18 +244,17 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) linkUp = nullptr; linkDown = nullptr; if(cluster->limiter_link > 0){ - char *tmp_link = bprintf("%s_limiter", link_id); - XBT_DEBUG("", tmp_link, cluster->limiter_link); + std::string tmp_link = std::string(link_id) + "_limiter"; + XBT_DEBUG("", tmp_link.c_str(), cluster->limiter_link); LinkCreationArgs link; - link.id = tmp_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); - linkDown = simgrid::surf::LinkImpl::byName(tmp_link); + linkDown = simgrid::surf::LinkImpl::byName(tmp_link.c_str()); linkUp = linkDown; - free(tmp_link); current_as->privateLinks_.insert( {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_, {linkUp, linkDown}}); } @@ -283,7 +270,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) xbt_free(host_id); rankId++; } - xbt_dict_free(&cluster->properties); + delete cluster->properties; // Add a router. XBT_DEBUG(" "); @@ -324,10 +311,10 @@ void routing_cluster_add_backbone(simgrid::surf::LinkImpl* bb) 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) @@ -351,81 +338,81 @@ void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) 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 = bprintf("link_%s_UP",hostname.c_str()); - host_link.link_down = bprintf("link_%s_DOWN",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); } delete cabinet->radicals; } -void sg_platf_new_storage(sg_platf_storage_cbarg_t storage) +void sg_platf_new_storage(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); + "Refusing to add a second storage named \"%s\"", storage->id.c_str()); - xbt_assert(storage_types.find(storage->type_id) != storage_types.end(), "No storage type '%s'", storage->type_id); - storage_type_t stype = storage_types.at(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()); known_storages.push_back(storage->id); // if storage content is not specified use the content of storage_type if any - if (not strcmp(storage->content, "") && strcmp(stype->content, "")) { - storage->content = stype->content; - XBT_DEBUG("For disk '%s' content is empty, inherit the content (of type %s)", storage->id, 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\tproperties '%p''\n", - storage->id, stype->model, stype->type_id, storage->content, storage->properties); + 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->type_id, storage->content, storage->attach); + 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; - char* 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) +void sg_platf_new_storage_type(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); + "Reading a storage type, processing unit \"%s\" already exists", storage_type->id.c_str()); - 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->type_id = xbt_strdup(storage_type->id); - stype->size = storage_type->size; - stype->model_properties = storage_type->model_properties; + 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 Create a storage type id '%s' with model '%s', content '%s'", stype->type_id, stype->model, - storage_type->content); + 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()); - storage_types.insert({std::string(stype->type_id), stype}); + storage_types[storage_type->id] = stype; } -void sg_platf_new_mount(sg_platf_mount_cbarg_t mount){ +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); + "Cannot mount non-existent disk \"%s\"", mount->storageId.c_str()); - XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->storageId, mount->name); + 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( - {std::string(mount->name), surf_storage_resource_priv(surf_storage_resource_by_name(mount->storageId))}); + mount_list.insert({mount->name, simgrid::surf::StorageImpl::byName(mount->storageId.c_str())}); } void sg_platf_new_route(sg_platf_route_cbarg_t route) @@ -440,6 +427,12 @@ void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute) void sg_platf_new_process(sg_platf_process_cbarg_t process) { + 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); if (not host) { // The requested host does not exist. Do a nice message to the user @@ -447,7 +440,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) "' does not exist\nExisting hosts: '"; for (auto kv : simgrid::s4u::host_list) { simgrid::s4u::Host* host = kv.second; - msg += host->name(); + msg += host->getName(); msg += "', '"; if (msg.length() > 1024) { msg.pop_back(); // remove trailing quote @@ -475,7 +468,7 @@ 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 = &props; host->extension()->boot_processes.push_back(arg); @@ -487,9 +480,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 = &props; - XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->cname(), start_time); + 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); @@ -500,10 +493,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->cname()); + XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->getCname()); smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(code), nullptr, host, - current_property_set, nullptr); + arg->properties, nullptr); /* The actor creation will fail if the host is currently dead, but that's fine */ if (actor != nullptr) { @@ -516,14 +509,14 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) 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_netpoint, peer->bw_in, peer->bw_out, peer->coord); @@ -647,23 +640,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 */ - current_routing->children()->push_back(static_cast(new_as)); + 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; } @@ -678,10 +670,8 @@ 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) */ @@ -701,9 +691,9 @@ void sg_platf_new_hostlink(sg_platf_host_link_cbarg_t hostlink) auto as_cluster = static_cast(current_routing); if (as_cluster->privateLinks_.find(netpoint->id()) != as_cluster->privateLinks_.end()) - surf_parse_error("Host_link for '%s' is already defined!",hostlink->id); + surf_parse_error(std::string("Host_link for '") + hostlink->id + "' is already defined!"); - XBT_DEBUG("Push Host_link for host '%s' to position %d", netpoint->cname(), netpoint->id()); + XBT_DEBUG("Push Host_link for host '%s' to position %u", netpoint->cname(), netpoint->id()); as_cluster->privateLinks_.insert({netpoint->id(), {linkUp, linkDown}}); } @@ -717,5 +707,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}); }