X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4c26ba57441232984df834fb6056d511478e02ff..d704d9763e2489a37daecffc1ca86ed75e4f5c45:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index b89e1956ee..688d59aae8 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -1,13 +1,11 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-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 "storage_n11.hpp" -#include "simgrid/s4u/engine.hpp" +#include "simgrid/s4u/Engine.hpp" #include "src/kernel/routing/NetPoint.hpp" -#include "surf_private.h" #include /*ceil*/ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage); @@ -15,18 +13,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage); /************* * CallBacks * *************/ - -static inline void routing_storage_type_free(void *r) -{ - storage_type_t stype = (storage_type_t) r; - free(stype->model); - free(stype->type_id); - free(stype->content); - free(stype->content_type); - xbt_dict_free(&(stype->properties)); - xbt_dict_free(&(stype->model_properties)); - free(stype); -} +extern std::map storage_types; static void check_disk_attachment() { @@ -38,7 +25,7 @@ static void check_disk_attachment() simgrid::surf::Storage* storage = static_cast(xbt_lib_get_or_null(storage_lib, key, SURF_STORAGE_LEVEL)); simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(storage->attach_); - if (!host_elm) + if (not host_elm) surf_parse_error("Unable to attach storage %s: host %s does not exist.", storage->cname(), storage->attach_); } } @@ -49,8 +36,6 @@ void storage_register_callbacks() simgrid::s4u::onPlatformCreated.connect(check_disk_attachment); instr_routing_define_callbacks(); - ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, xbt_free_f); - ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib, routing_storage_type_free); SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, [](void *self) { delete static_cast(self); }); @@ -70,25 +55,19 @@ namespace simgrid { namespace surf { Storage* StorageN11Model::createStorage(const char* id, const char* type_id, const char* content_name, - const char* content_type, const char* attach) + const char* attach) { + storage_type_t storage_type = storage_types.at(type_id); - xbt_assert(!surf_storage_resource_priv(surf_storage_resource_by_name(id)), - "Storage '%s' declared several times in the platform file", id); - - storage_type_t storage_type = (storage_type_t) xbt_lib_get_or_null(storage_type_lib, type_id,ROUTING_STORAGE_TYPE_LEVEL); + double Bread = + surf_parse_get_bandwidth(storage_type->model_properties->at("Bread").c_str(), "property Bread, storage", type_id); + double Bwrite = surf_parse_get_bandwidth(storage_type->model_properties->at("Bwrite").c_str(), + "property Bwrite, storage", type_id); - double Bread = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bread"), - "property Bread, storage",type_id); - double Bwrite = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bwrite"), - "property Bwrite, storage",type_id); - double Bconnection = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bconnection"), - "property Bconnection, storage",type_id); - - Storage* storage = new StorageN11(this, id, maxminSystem_, Bread, Bwrite, Bconnection, type_id, (char*)content_name, - content_type, storage_type->size, (char*)attach); - storageCreatedCallbacks(storage); + Storage* storage = new StorageN11(this, id, maxminSystem_, Bread, Bwrite, type_id, (char*)content_name, + storage_type->size, (char*)attach); xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, storage); + storageCreatedCallbacks(storage); XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tBread '%f'\n", id, type_id, Bread); @@ -146,10 +125,12 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) // which becomes the new file size action->file_->size = action->file_->current_position; - sg_size_t *psize = xbt_new(sg_size_t,1); - *psize = action->file_->size; - xbt_dict_t content_dict = action->storage_->content_; - xbt_dict_set(content_dict, action->file_->name, psize, nullptr); + sg_size_t* psize = new sg_size_t; + *psize = action->file_->size; + std::map* content_dict = action->storage_->content_; + auto entry = content_dict->find(action->file_->name); + delete entry->second; + entry->second = psize; } action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); @@ -174,11 +155,10 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) ************/ StorageN11::StorageN11(StorageModel* model, const char* name, lmm_system_t maxminSystem, double bread, double bwrite, - double bconnection, const char* type_id, char* content_name, const char* content_type, - sg_size_t size, char* attach) - : Storage(model, name, maxminSystem, bread, bwrite, bconnection, type_id, content_name, content_type, size, attach) + const char* type_id, char* content_name, sg_size_t size, char* attach) + : Storage(model, name, maxminSystem, bread, bwrite, type_id, content_name, size, attach) { - XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size); + XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size); } StorageAction *StorageN11::open(const char* mount, const char* path) @@ -186,15 +166,15 @@ StorageAction *StorageN11::open(const char* mount, const char* path) XBT_DEBUG("\tOpen file '%s'",path); sg_size_t size; - sg_size_t* psize = (sg_size_t*)xbt_dict_get_or_null(content_, path); + sg_size_t* psize = nullptr; // if file does not exist create an empty file - if(psize) - size = *psize; + if (content_->find(path) != content_->end()) + size = *(content_->at(path)); else { - psize = xbt_new(sg_size_t,1); - size = 0; + psize = new sg_size_t; + size = 0; *psize = size; - xbt_dict_set(content_, path, psize, nullptr); + content_->insert({path, psize}); XBT_DEBUG("File '%s' was not found, file created.",path); } surf_file_t file = xbt_new0(s_surf_file_t,1); @@ -299,7 +279,7 @@ StorageN11Action::StorageN11Action(Model *model, double cost, bool failed, Stora int StorageN11Action::unref() { refcount_--; - if (!refcount_) { + if (not refcount_) { if (action_hook.is_linked()) stateSet_->erase(stateSet_->iterator_to(*this)); if (getVariable())