X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8a2f0e341903330158b58400086dde589e2178e9..bc0e9c9ecdf8b93f139978e522433f0a9fdcdedd:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 3ce4e724f5..4b239744c4 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,3 +1,4 @@ +/* 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. */ @@ -27,7 +28,7 @@ #include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); -XBT_PRIVATE xbt_dynar_t mount_list = nullptr; +XBT_PRIVATE std::vector mount_list; namespace simgrid { namespace surf { @@ -66,7 +67,8 @@ void sg_platf_new_host(sg_platf_host_cbarg_t args) std::unordered_map props; if (args->properties) { xbt_dict_cursor_t cursor=nullptr; - char *key,*data; + char *key; + char* data; xbt_dict_foreach (args->properties, cursor, key, data) props[key] = data; xbt_dict_free(&args->properties); @@ -76,8 +78,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t args) 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) @@ -131,7 +132,8 @@ void sg_platf_new_link(LinkCreationArgs* link) if (link->properties) { xbt_dict_cursor_t cursor = nullptr; - char *key, *data; + char* key; + char* data; xbt_dict_foreach (link->properties, cursor, key, data) l->setProperty(key, data); xbt_dict_free(&link->properties); @@ -177,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; } @@ -198,12 +200,14 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) host.id = host_id; if ((cluster->properties != nullptr) && (!xbt_dict_is_empty(cluster->properties))) { xbt_dict_cursor_t cursor=nullptr; - char *key,*data; + 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); } + xbt_dict_free(&cluster->properties); } host.speed_per_pstate = cluster->speeds; @@ -224,7 +228,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) //add a loopback link simgrid::surf::LinkImpl* linkUp = nullptr; simgrid::surf::LinkImpl* linkDown = nullptr; - if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){ + if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){ char *tmp_link = bprintf("%s_loopback", link_id); XBT_DEBUG("", tmp_link, cluster->loopback_bw); @@ -245,7 +249,7 @@ 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){ + if(cluster->limiter_link > 0){ char *tmp_link = bprintf("%s_limiter", link_id); XBT_DEBUG("", tmp_link, cluster->limiter_link); @@ -286,7 +290,7 @@ 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)) { LinkCreationArgs link; link.id = std::string(cluster->id)+ "_backbone"; @@ -389,7 +393,8 @@ void sg_platf_new_storage(sg_platf_storage_cbarg_t storage) if (storage->properties) { xbt_dict_cursor_t cursor = nullptr; - char *key, *data; + char *key; + char* data; xbt_dict_foreach (storage->properties, cursor, key, data) s->setProperty(key, data); xbt_dict_free(&storage->properties); @@ -422,12 +427,6 @@ void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type){ (void *) stype); } -static void mount_free(void *p) -{ - mount_t mnt = (mount_t) p; - xbt_free(mnt->name); -} - 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); @@ -438,11 +437,9 @@ void sg_platf_new_mount(sg_platf_mount_cbarg_t mount){ mnt.storage = surf_storage_resource_priv(surf_storage_resource_by_name(mount->storageId)); mnt.name = xbt_strdup(mount->name); - 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); + if (mount_list.empty()) + XBT_DEBUG("Create a Mount list for %s", A_surfxml_host_id); + mount_list.push_back(mnt); } void sg_platf_new_route(sg_platf_route_cbarg_t route) @@ -680,7 +677,7 @@ simgrid::s4u::NetZone* sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) 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->children()->push_back(static_cast(new_as)); } /* set the new current component of the tree */