X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8fea398a5a9ca83c4e6009daf964d59869388e6c..ac0bf6a9396efa37d528695f248e568ab5a2eb98:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index 579ea96a7c..e25812ce16 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -6,24 +6,24 @@ #include "storage_n11.hpp" #include "simgrid/s4u/Engine.hpp" #include "src/kernel/routing/NetPoint.hpp" -#include /*ceil*/ +#include /*ceil*/ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage); /************* * CallBacks * *************/ -extern std::map storage_types; +extern std::map storage_types; static void check_disk_attachment() { - for (auto s : *simgrid::surf::StorageImpl::storagesMap()) { - simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s.second->attach_.c_str()); + for (auto const& s : *simgrid::surf::StorageImpl::storagesMap()) { + simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s.second->getHost().c_str()); if (not host_elm) - surf_parse_error("Unable to attach storage %s: host %s does not exist.", s.second->cname(), - s.second->attach_.c_str()); + surf_parse_error(std::string("Unable to attach storage ") + s.second->getCname() + ": host " + + s.second->getHost() + " does not exist."); else - s.second->piface_.attached_to_ = sg_host_by_name(s.second->attach_.c_str()); + s.second->piface_.attached_to_ = sg_host_by_name(s.second->getHost().c_str()); } } @@ -46,21 +46,22 @@ void surf_storage_model_init_default() namespace simgrid { namespace surf { -StorageImpl* StorageN11Model::createStorage(const char* id, const char* type_id, const char* content_name, - const char* attach) +StorageImpl* StorageN11Model::createStorage(std::string id, std::string type_id, std::string content_name, + std::string attach) { - storage_type_t storage_type = storage_types.at(type_id); + StorageType* storage_type = storage_types.at(type_id); - double Bread = - surf_parse_get_bandwidth(storage_type->model_properties->at("Bread").c_str(), "property Bread, storage", type_id); + double Bread = surf_parse_get_bandwidth(storage_type->model_properties->at("Bread").c_str(), + "property Bread, storage", type_id.c_str()); double Bwrite = surf_parse_get_bandwidth(storage_type->model_properties->at("Bwrite").c_str(), - "property Bwrite, storage", type_id); + "property Bwrite, storage", type_id.c_str()); - StorageImpl* storage = new StorageN11(this, id, maxminSystem_, Bread, Bwrite, type_id, (char*)content_name, - storage_type->size, (char*)attach); + StorageImpl* storage = + new StorageN11(this, id, maxminSystem_, Bread, Bwrite, type_id, content_name, storage_type->size, attach); 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); + XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tBread '%f'\n", id.c_str(), type_id.c_str(), + Bread); p_storageList.push_back(storage); @@ -69,70 +70,38 @@ StorageImpl* StorageN11Model::createStorage(const char* id, const char* type_id, double StorageN11Model::nextOccuringEvent(double now) { - double min_completion = StorageModel::nextOccuringEventFull(now); - - for(auto storage: p_storageList) { - double rate = 0; - // Foreach write action on that disk - for (auto write_action: storage->writeActions_) { - rate += lmm_variable_getvalue(write_action->getVariable()); - } - if(rate > 0) - min_completion = MIN(min_completion, (storage->size_-storage->usedSize_)/rate); - } - - return min_completion; + return StorageModel::nextOccuringEventFull(now); } void StorageN11Model::updateActionsState(double /*now*/, double delta) { - ActionList *actionSet = getRunningActionSet(); - for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end()) - ; it != itend ; it=itNext) { + for (ActionList::iterator it(actionSet->begin()), itNext = it, itend(actionSet->end()); it != itend; it = itNext) { ++itNext; StorageAction *action = static_cast(&*it); - if (action->type_ == WRITE) { - // Update the disk usage - // Update the file size - // For each action of type write - double current_progress = delta * lmm_variable_getvalue(action->getVariable()); - long int incr = current_progress; - - XBT_DEBUG("%s:\n\t progress = %.2f, current_progress = %.2f, incr = %ld, lrint(1) = %ld, lrint(2) = %ld", - action->file_->cname(), action->progress_, current_progress, incr, - lrint(action->progress_ + current_progress), lrint(action->progress_) + incr); + double current_progress = lrint(lmm_variable_getvalue(action->getVariable()) * delta); - /* take care of rounding error accumulation */ - if (lrint(action->progress_ + current_progress) > lrint(action->progress_) + incr) - incr++; - - action->progress_ += current_progress; - - action->storage_->usedSize_ += incr; // disk usage - action->file_->incrPosition(incr); // current_position - // which becomes the new file size + action->updateRemains(current_progress); + if (action->type_ == WRITE) { + action->storage_->usedSize_ += current_progress; + action->file_->incrPosition(current_progress); action->file_->setSize(action->file_->tell()); - action->storage_->content_->erase(action->file_->cname()); - action->storage_->content_->insert({action->file_->cname(), action->file_->size()}); + action->storage_->getContent()->erase(action->file_->getCname()); + action->storage_->getContent()->insert({action->file_->getCname(), action->file_->size()}); } - action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); - if (action->getMaxDuration() > NO_MAX_DURATION) action->updateMaxDuration(delta); if (action->getRemainsNoUpdate() > 0 && lmm_get_variable_weight(action->getVariable()) > 0 && - action->storage_->usedSize_ == action->storage_->size_) { - action->finish(); - action->setState(Action::State::failed); + action->storage_->usedSize_ == action->storage_->getSize()) { + action->finish(Action::State::failed); } else if (((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) || ((action->getMaxDuration() > NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) { - action->finish(); - action->setState(Action::State::done); + action->finish(Action::State::done); } } } @@ -141,83 +110,22 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) * Resource * ************/ -StorageN11::StorageN11(StorageModel* model, const char* name, lmm_system_t maxminSystem, double bread, double bwrite, - const char* type_id, char* content_name, sg_size_t size, char* attach) +StorageN11::StorageN11(StorageModel* model, std::string name, lmm_system_t maxminSystem, double bread, double bwrite, + std::string type_id, std::string content_name, sg_size_t size, std::string attach) : StorageImpl(model, name, maxminSystem, bread, bwrite, type_id, content_name, size, attach) { XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size); simgrid::s4u::Storage::onCreation(this->piface_); } -StorageAction *StorageN11::open(const char* mount, const char* path) -{ - XBT_DEBUG("\tOpen file '%s'",path); - - sg_size_t size; - // if file does not exist create an empty file - if (content_->find(path) != content_->end()) - size = content_->at(path); - else { - size = 0; - content_->insert({path, size}); - XBT_DEBUG("File '%s' was not found, file created.",path); - } - FileImpl* file = new FileImpl(path, mount, size); - - StorageAction* action = new StorageN11Action(model(), 0, isOff(), this, OPEN); - action->file_ = file; - - return action; -} - -StorageAction *StorageN11::close(surf_file_t fd) -{ - XBT_DEBUG("\tClose file '%s' size '%llu'", fd->cname(), fd->size()); - // unref write actions from storage - for (std::vector::iterator it = writeActions_.begin(); it != writeActions_.end();) { - StorageAction *write_action = *it; - if ((write_action->file_) == fd) { - write_action->unref(); - it = writeActions_.erase(it); - } else { - ++it; - } - } - delete fd; - StorageAction* action = new StorageN11Action(model(), 0, isOff(), this, CLOSE); - return action; -} - -StorageAction *StorageN11::read(surf_file_t fd, sg_size_t size) +StorageAction* StorageN11::read(sg_size_t size) { - if (fd->tell() + size > fd->size()) { - if (fd->tell() > fd->size()) { - size = 0; - } else { - size = fd->size() - fd->tell(); - } - fd->setPosition(fd->size()); - } - else - fd->incrPosition(size); - - StorageAction* action = new StorageN11Action(model(), size, isOff(), this, READ); - return action; + return new StorageN11Action(model(), size, isOff(), this, READ); } -StorageAction *StorageN11::write(surf_file_t fd, sg_size_t size) +StorageAction* StorageN11::write(sg_size_t size) { - XBT_DEBUG("\tWrite file '%s' size '%llu/%llu'", fd->cname(), size, fd->size()); - - StorageAction* action = new StorageN11Action(model(), size, isOff(), this, WRITE); - action->file_ = fd; - /* Substract the part of the file that might disappear from the used sized on the storage element */ - usedSize_ -= (fd->size() - fd->tell()); - // If the storage is full before even starting to write - if(usedSize_==size_) { - action->setState(Action::State::failed); - } - return action; + return new StorageN11Action(model(), size, isOff(), this, WRITE); } /********** @@ -228,25 +136,16 @@ StorageN11Action::StorageN11Action(Model* model, double cost, bool failed, Stora e_surf_action_storage_type_t type) : StorageAction(model, cost, failed, lmm_variable_new(model->getMaxminSystem(), this, 1.0, -1.0, 3), storage, type) { - XBT_IN("(%s,%g", storage->cname(), cost); + XBT_IN("(%s,%g", storage->getCname(), cost); // Must be less than the max bandwidth for all actions lmm_expand(model->getMaxminSystem(), storage->constraint(), getVariable(), 1.0); switch(type) { - case OPEN: - case CLOSE: - case STAT: - break; case READ: lmm_expand(model->getMaxminSystem(), storage->constraintRead_, getVariable(), 1.0); break; case WRITE: lmm_expand(model->getMaxminSystem(), storage->constraintWrite_, getVariable(), 1.0); - - //TODO there is something annoying with what's below. Have to sort it out... - // Action *action = this; - // storage->p_writeActions->push_back(action); - // ref(); break; default: THROW_UNIMPLEMENTED; @@ -299,7 +198,7 @@ void StorageN11Action::setMaxDuration(double /*duration*/) THROW_UNIMPLEMENTED; } -void StorageN11Action::setPriority(double /*priority*/) +void StorageN11Action::setSharingWeight(double /*priority*/) { THROW_UNIMPLEMENTED; }