X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b6fc7c2d23e70b645eef83f2b138cc00dcd892d0..30aca4d4af004d1ec899d12f0a9fe3997e9be15e:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index d19d438645..79c7bc579c 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -5,13 +5,11 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "storage_n11.hpp" +#include "src/kernel/routing/NetCard.hpp" #include "surf_private.h" #include /*ceil*/ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage); -static int storage_selective_update = 0; -static xbt_swag_t storage_running_action_set_that_does_not_need_being_checked = nullptr; - /************* * CallBacks * *************/ @@ -42,8 +40,28 @@ static inline void routing_storage_host_free(void *r) xbt_dynar_free(&dyn); } +static void check_disk_attachment() +{ + xbt_lib_cursor_t cursor; + char* key; + void** data; + xbt_lib_foreach(storage_lib, cursor, key, data) + { + if (xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) { + simgrid::surf::Storage* storage = + static_cast(xbt_lib_get_or_null(storage_lib, key, SURF_STORAGE_LEVEL)); + simgrid::kernel::routing::NetCard* host_elm = sg_netcard_by_name_or_null(storage->attach_); + if (!host_elm) + surf_parse_error("Unable to attach storage %s: host %s doesn't exist.", storage->getName(), storage->attach_); + } + } +} + void storage_register_callbacks() { + simgrid::surf::on_postparse.connect(check_disk_attachment); + instr_routing_define_callbacks(); + ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, xbt_free_f); ROUTING_STORAGE_HOST_LEVEL = xbt_lib_add_level(storage_lib, routing_storage_host_free); ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib, routing_storage_type_free); @@ -63,25 +81,9 @@ void surf_storage_model_init_default() namespace simgrid { namespace surf { -StorageN11Model::StorageN11Model() : StorageModel() { - Action *action = nullptr; - - XBT_DEBUG("surf_storage_model_init_internal"); - - storage_running_action_set_that_does_not_need_being_checked = xbt_swag_new(xbt_swag_offset(*action, stateHookup_)); - if (!maxminSystem_) { - maxminSystem_ = lmm_system_new(storage_selective_update); - } -} - -StorageN11Model::~StorageN11Model(){ - xbt_swag_free(storage_running_action_set_that_does_not_need_being_checked); - storage_running_action_set_that_does_not_need_being_checked = nullptr; -} - #include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area -Storage *StorageN11Model::createStorage(const char* id, const char* type_id, - const char* content_name, const char* content_type, xbt_dict_t properties, const char* attach) +Storage* StorageN11Model::createStorage(const char* id, const char* type_id, const char* content_name, + const char* content_type, const char* attach) { xbt_assert(!surf_storage_resource_priv(surf_storage_resource_by_name(id)), @@ -96,23 +98,21 @@ Storage *StorageN11Model::createStorage(const char* id, const char* 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, properties, maxminSystem_, - Bread, Bwrite, Bconnection, type_id, (char *)content_name, - content_type, storage_type->size, (char *) attach); + Storage* storage = new StorageN11(this, id, maxminSystem_, Bread, Bwrite, Bconnection, type_id, (char*)content_name, + content_type, storage_type->size, (char*)attach); storageCreatedCallbacks(storage); xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, storage); - XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tproperties '%p'\n\t\tBread '%f'\n", - id, type_id, properties, Bread); + XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tBread '%f'\n", id, type_id, Bread); p_storageList.push_back(storage); return storage; } -double StorageN11Model::next_occuring_event(double now) +double StorageN11Model::nextOccuringEvent(double now) { - double min_completion = StorageModel::next_occuring_event_full(now); + double min_completion = StorageModel::nextOccuringEventFull(now); for(auto storage: p_storageList) { double rate = 0; @@ -137,7 +137,7 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) StorageAction *action = static_cast(&*it); - if(action->m_type == WRITE){ + if (action->type_ == WRITE) { // Update the disk usage // Update the file size // For each action of type write @@ -145,26 +145,24 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) long int incr = current_progress; XBT_DEBUG("%s:\n\t progress = %.2f, current_progress = %.2f, incr = %ld, lrint(1) = %ld, lrint(2) = %ld", - action->p_file->name, - action->progress, current_progress, incr, - lrint(action->progress + current_progress), - lrint(action->progress)+ incr); + action->file_->name, action->progress_, current_progress, incr, + lrint(action->progress_ + current_progress), lrint(action->progress_) + incr); /* take care of rounding error accumulation */ - if (lrint(action->progress + current_progress) > lrint(action->progress)+ incr) + if (lrint(action->progress_ + current_progress) > lrint(action->progress_) + incr) incr++; - action->progress +=current_progress; + action->progress_ += current_progress; - action->p_storage->usedSize_ += incr; // disk usage - action->p_file->current_position+= incr; // current_position + action->storage_->usedSize_ += incr; // disk usage + action->file_->current_position += incr; // current_position // which becomes the new file size - action->p_file->size = action->p_file->current_position ; + action->file_->size = action->file_->current_position; sg_size_t *psize = xbt_new(sg_size_t,1); - *psize = action->p_file->size; - xbt_dict_t content_dict = action->p_storage->content_; - xbt_dict_set(content_dict, action->p_file->name, psize, nullptr); + *psize = action->file_->size; + xbt_dict_t content_dict = action->storage_->content_; + xbt_dict_set(content_dict, action->file_->name, psize, nullptr); } action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); @@ -172,8 +170,8 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) if (action->getMaxDuration() > NO_MAX_DURATION) action->updateMaxDuration(delta); - if(action->getRemainsNoUpdate() > 0 && lmm_get_variable_weight(action->getVariable()) > 0 && - action->p_storage->usedSize_ == action->p_storage->size_) { + if (action->getRemainsNoUpdate() > 0 && lmm_get_variable_weight(action->getVariable()) > 0 && + action->storage_->usedSize_ == action->storage_->size_) { action->finish(); action->setState(Action::State::failed); } else if (((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) || @@ -188,12 +186,11 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) * Resource * ************/ -StorageN11::StorageN11(StorageModel *model, const char* name, - xbt_dict_t properties, 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, properties, - maxminSystem, bread, bwrite, bconnection, type_id, content_name, content_type, size, attach) { +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) +{ XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size); } @@ -220,7 +217,7 @@ StorageAction *StorageN11::open(const char* mount, const char* path) file->current_position = 0; StorageAction *action = new StorageN11Action(getModel(), 0, isOff(), this, OPEN); - action->p_file = file; + action->file_ = file; return action; } @@ -231,7 +228,7 @@ StorageAction *StorageN11::close(surf_file_t fd) // unref write actions from storage for (std::vector::iterator it = writeActions_.begin(); it != writeActions_.end();) { StorageAction *write_action = *it; - if ((write_action->p_file) == fd) { + if ((write_action->file_) == fd) { write_action->unref(); it = writeActions_.erase(it); } else { @@ -268,7 +265,7 @@ StorageAction *StorageN11::write(surf_file_t fd, sg_size_t size) XBT_DEBUG("\tWrite file '%s' size '%llu/%llu'",filename,size,fd->size); StorageAction *action = new StorageN11Action(getModel(), size, isOff(), this, WRITE); - action->p_file = fd; + action->file_ = fd; /* Substract the part of the file that might disappear from the used sized on the storage element */ usedSize_ -= (fd->size - fd->current_position); // If the storage is full before even starting to write