X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/242fde5e8077f8193db4df5f262a9672085c8d8a..bfdba6424c0645e31cc60ee166e388cf8f283c3b:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index 3b914b9b55..8161a1b1a7 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2014. The SimGrid Team. +/* Copyright (c) 2013-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -9,14 +9,11 @@ #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 = NULL; - /************* * CallBacks * *************/ -static XBT_INLINE void routing_storage_type_free(void *r) +static inline void routing_storage_type_free(void *r) { storage_type_t stype = (storage_type_t) r; free(stype->model); @@ -28,270 +25,92 @@ static XBT_INLINE void routing_storage_type_free(void *r) free(stype); } -static XBT_INLINE void surf_storage_resource_free(void *r) +static inline void surf_storage_resource_free(void *r) { // specific to storage - Storage *storage = static_cast(r); + simgrid::surf::Storage *storage = static_cast(r); // generic resource delete storage; } -static XBT_INLINE void routing_storage_host_free(void *r) +static inline void routing_storage_host_free(void *r) { xbt_dynar_t dyn = (xbt_dynar_t) r; xbt_dynar_free(&dyn); } -static void parse_storage_init(sg_platf_storage_cbarg_t storage) -{ - void* stype = xbt_lib_get_or_null(storage_type_lib, - storage->type_id, - ROUTING_STORAGE_TYPE_LEVEL); - if(!stype) xbt_die("No storage type '%s'",storage->type_id); - - // if storage content is not specified use the content of storage_type if exist - if(!strcmp(storage->content,"") && strcmp(((storage_type_t) stype)->content,"")){ - storage->content = ((storage_type_t) stype)->content; - storage->content_type = ((storage_type_t) stype)->content_type; - XBT_DEBUG("For disk '%s' content is empty, inherit the content (of type %s) from storage type '%s' ", - storage->id,((storage_type_t) stype)->content_type, - ((storage_type_t) stype)->type_id); - } - - XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' " - "\n\t\tmodel '%s' \n\t\tcontent '%s'\n\t\tcontent_type '%s' " - "\n\t\tproperties '%p''\n", - storage->id, - ((storage_type_t) stype)->model, - ((storage_type_t) stype)->type_id, - storage->content, - storage->content_type, - storage->properties); - - surf_storage_model->createStorage(storage->id, - ((storage_type_t) stype)->type_id, - storage->content, - storage->content_type, - storage->properties, - storage->attach); -} - -static void parse_mstorage_init(sg_platf_mstorage_cbarg_t /*mstorage*/) -{ - XBT_DEBUG("parse_mstorage_init"); -} - -static void parse_storage_type_init(sg_platf_storage_type_cbarg_t /*storagetype_*/) -{ - XBT_DEBUG("parse_storage_type_init"); -} - -static void parse_mount_init(sg_platf_mount_cbarg_t /*mount*/) -{ - XBT_DEBUG("parse_mount_init"); -} - -static void storage_parse_storage(sg_platf_storage_cbarg_t storage) +void storage_register_callbacks() { - xbt_assert(!xbt_lib_get_or_null(storage_lib, storage->id,ROUTING_STORAGE_LEVEL), - "Reading a storage, processing unit \"%s\" already exists", storage->id); - - // Verification of an existing type_id -#ifndef NDEBUG - void* storage_type = xbt_lib_get_or_null(storage_type_lib, storage->type_id,ROUTING_STORAGE_TYPE_LEVEL); -#endif - xbt_assert(storage_type,"Reading a storage, type id \"%s\" does not exists", storage->type_id); - - XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s' and content '%s'", - storage->id, - storage->type_id, - storage->content); - - xbt_lib_set(storage_lib, - storage->id, - ROUTING_STORAGE_LEVEL, - (void *) xbt_strdup(storage->type_id)); -} - -static void storage_parse_storage_type(sg_platf_storage_type_cbarg_t storage_type) -{ - xbt_assert(!xbt_lib_get_or_null(storage_type_lib, storage_type->id,ROUTING_STORAGE_TYPE_LEVEL), - "Reading a storage type, processing unit \"%s\" already exists", storage_type->id); - - 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->content_type = xbt_strdup(storage_type->content_type); - stype->type_id = xbt_strdup(storage_type->id); - stype->size = storage_type->size; - stype->model_properties = storage_type->model_properties; - - XBT_DEBUG("ROUTING Create a storage type id '%s' with model '%s', " - "content '%s', and content_type '%s'", - stype->type_id, - stype->model, - storage_type->content, - storage_type->content_type); - - xbt_lib_set(storage_type_lib, - stype->type_id, - ROUTING_STORAGE_TYPE_LEVEL, - (void *) stype); -} - -static void storage_parse_mstorage(sg_platf_mstorage_cbarg_t /*mstorage*/) -{ - THROW_UNIMPLEMENTED; -// mount_t mnt = xbt_new0(s_mount_t, 1); -// mnt->id = xbt_strdup(mstorage->type_id); -// mnt->name = xbt_strdup(mstorage->name); -// -// if(!mount_list){ -// XBT_DEBUG("Creata a Mount list for %s",A_surfxml_host_id); -// mount_list = xbt_dynar_new(sizeof(char *), NULL); -// } -// xbt_dynar_push(mount_list,(void *) mnt); -// free(mnt->id); -// free(mnt->name); -// xbt_free(mnt); -// XBT_DEBUG("ROUTING Mount a storage name '%s' with type_id '%s'",mstorage->name, mstorage->id); -} - -static void mount_free(void *p) -{ - mount_t mnt = (mount_t) p; - xbt_free(mnt->name); -} - -static void storage_parse_mount(sg_platf_mount_cbarg_t mount) -{ - // Verification of an existing storage -#ifndef NDEBUG - void* storage = xbt_lib_get_or_null(storage_lib, mount->storageId, ROUTING_STORAGE_LEVEL); -#endif - xbt_assert(storage,"Disk id \"%s\" does not exists", mount->storageId); - - XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->storageId, mount->name); - - s_mount_t mnt; - 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); -} - -static void storage_define_callbacks() -{ - sg_platf_storage_add_cb(parse_storage_init); - sg_platf_storage_type_add_cb(parse_storage_type_init); - sg_platf_mstorage_add_cb(parse_mstorage_init); - sg_platf_mount_add_cb(parse_mount_init); -} - -void storage_register_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); SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, surf_storage_resource_free); - - sg_platf_storage_add_cb(storage_parse_storage); - sg_platf_mstorage_add_cb(storage_parse_mstorage); - sg_platf_storage_type_add_cb(storage_parse_storage_type); - sg_platf_mount_add_cb(storage_parse_mount); } /********* * Model * *********/ -void surf_storage_model_init_default(void) +void surf_storage_model_init_default() { - surf_storage_model = new StorageN11Model(); - storage_define_callbacks(); - xbt_dynar_push(model_list, &surf_storage_model); + surf_storage_model = new simgrid::surf::StorageN11Model(); + all_existing_models->push_back(surf_storage_model); } -StorageN11Model::StorageN11Model() : StorageModel() { - Action *action = NULL; +namespace simgrid { +namespace surf { +StorageN11Model::StorageN11Model() : StorageModel() { XBT_DEBUG("surf_storage_model_init_internal"); - - storage_running_action_set_that_does_not_need_being_checked = - xbt_swag_new(xbt_swag_offset(*action, p_stateHookup)); - if (!p_maxminSystem) { - p_maxminSystem = lmm_system_new(storage_selective_update); - } + maxminSystem_ = lmm_system_new(false /*lazy?*/); } 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 = NULL; } +#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) + const char* content_name, const char* content_type, xbt_dict_t properties, const char* attach) { xbt_assert(!surf_storage_resource_priv(surf_storage_resource_by_name(id)), - "Storage '%s' declared several times in the platform file", - 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((char*)xbt_dict_get(storage_type->model_properties, "Bread")); - double Bwrite = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bwrite")); - double Bconnection = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bconnection")); + 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, properties, p_maxminSystem, + Storage *storage = new StorageN11(this, id, properties, maxminSystem_, Bread, Bwrite, Bconnection, type_id, (char *)content_name, - xbt_strdup(content_type), storage_type->size, (char *) attach); - + 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); + id, type_id, properties, Bread); - if(!p_storageList) - p_storageList = xbt_dynar_new(sizeof(char *),NULL); - xbt_dynar_push(p_storageList, &storage); + p_storageList.push_back(storage); return storage; } -double StorageN11Model::shareResources(double now) +double StorageN11Model::nextOccuringEvent(double now) { - XBT_DEBUG("storage_share_resources %f", now); - unsigned int i, j; - Storage *storage; - void *_write_action; - StorageAction *write_action; - - double min_completion = shareResourcesMaxMin(getRunningActionSet(), - p_maxminSystem, lmm_solve); - - double rate; - // Foreach disk - xbt_dynar_foreach(p_storageList,i,storage) - { - rate = 0; - // Foreach write action on disk - xbt_dynar_foreach(storage->p_writeActions, j, _write_action) - { - write_action = static_cast(_write_action); + 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->m_size-storage->m_usedSize)/rate); + min_completion = MIN(min_completion, (storage->size_-storage->usedSize_)/rate); } return min_completion; @@ -299,72 +118,59 @@ double StorageN11Model::shareResources(double now) void StorageN11Model::updateActionsState(double /*now*/, double delta) { - StorageAction *action = NULL; ActionList *actionSet = getRunningActionSet(); for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end()) - ; it != itend ; it=itNext) { + ; it != itend ; it=itNext) { ++itNext; - action = static_cast(&*it); - if(action->m_type == WRITE) - { + StorageAction *action = static_cast(&*it); + + if(action->m_type == WRITE){ // Update the disk usage // Update the file size // For each action of type write - volatile double current_progress = - delta * lmm_variable_getvalue(action->getVariable()); + 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->p_file->name, - action->progress, current_progress, incr, - lrint(action->progress + current_progress), - lrint(action->progress)+ incr); + 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); /* 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->p_storage->m_usedSize += incr; // disk usage + action->p_storage->usedSize_ += incr; // disk usage action->p_file->current_position+= incr; // current_position // which becomes the new file size action->p_file->size = action->p_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->p_content; - xbt_dict_set(content_dict, action->p_file->name, psize, NULL); + xbt_dict_t content_dict = action->p_storage->content_; + xbt_dict_set(content_dict, action->p_file->name, psize, nullptr); } action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); - if (action->getMaxDuration() != NO_MAX_DURATION) + if (action->getMaxDuration() > NO_MAX_DURATION) action->updateMaxDuration(delta); - if(action->getRemainsNoUpdate() > 0 && - lmm_get_variable_weight(action->getVariable()) > 0 && - action->p_storage->m_usedSize == action->p_storage->m_size) - { - action->finish(); - action->setState(SURF_ACTION_FAILED); - } else if ((action->getRemainsNoUpdate() <= 0) && - (lmm_get_variable_weight(action->getVariable()) > 0)) - { + if(action->getRemainsNoUpdate() > 0 && lmm_get_variable_weight(action->getVariable()) > 0 && + action->p_storage->usedSize_ == action->p_storage->size_) { action->finish(); - action->setState(SURF_ACTION_DONE); - } else if ((action->getMaxDuration() != NO_MAX_DURATION) && - (action->getMaxDuration() <= 0)) - { + action->setState(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(SURF_ACTION_DONE); + action->setState(Action::State::done); } } - return; } /************ @@ -374,9 +180,9 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) 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, - 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) { + 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) { XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size); } @@ -385,7 +191,7 @@ StorageAction *StorageN11::open(const char* mount, const char* path) XBT_DEBUG("\tOpen file '%s'",path); sg_size_t size, *psize; - psize = (sg_size_t*) xbt_dict_get_or_null(p_content, path); + psize = (sg_size_t*) xbt_dict_get_or_null(content_, path); // if file does not exist create an empty file if(psize) size = *psize; @@ -393,7 +199,7 @@ StorageAction *StorageN11::open(const char* mount, const char* path) psize = xbt_new(sg_size_t,1); size = 0; *psize = size; - xbt_dict_set(p_content, path, psize, NULL); + xbt_dict_set(content_, path, psize, nullptr); XBT_DEBUG("File '%s' was not found, file created.",path); } surf_file_t file = xbt_new0(s_surf_file_t,1); @@ -402,7 +208,7 @@ StorageAction *StorageN11::open(const char* mount, const char* path) file->mount = xbt_strdup(mount); file->current_position = 0; - StorageAction *action = new StorageN11Action(getModel(), 0, getState() != SURF_RESOURCE_ON, this, OPEN); + StorageAction *action = new StorageN11Action(getModel(), 0, isOff(), this, OPEN); action->p_file = file; return action; @@ -410,36 +216,38 @@ StorageAction *StorageN11::open(const char* mount, const char* path) StorageAction *StorageN11::close(surf_file_t fd) { - char *filename = fd->name; - XBT_DEBUG("\tClose file '%s' size '%llu'", filename, fd->size); + XBT_DEBUG("\tClose file '%s' size '%llu'", fd->name, fd->size); // unref write actions from storage - void *_write_action; - StorageAction *write_action; - unsigned int i; - xbt_dynar_foreach(p_writeActions, i, _write_action) { - write_action = static_cast(_write_action); + for (std::vector::iterator it = writeActions_.begin(); it != writeActions_.end();) { + StorageAction *write_action = *it; if ((write_action->p_file) == fd) { - xbt_dynar_cursor_rm(p_writeActions, &i); write_action->unref(); + it = writeActions_.erase(it); + } else { + ++it; } } free(fd->name); free(fd->mount); xbt_free(fd); - StorageAction *action = new StorageN11Action(getModel(), 0, getState() != SURF_RESOURCE_ON, this, CLOSE); + StorageAction *action = new StorageN11Action(getModel(), 0, isOff(), this, CLOSE); return action; } StorageAction *StorageN11::read(surf_file_t fd, sg_size_t size) { if(fd->current_position + size > fd->size){ - size = fd->size - fd->current_position; + if (fd->current_position > fd->size){ + size = 0; + } else { + size = fd->size - fd->current_position; + } fd->current_position = fd->size; } else fd->current_position += size; - StorageAction *action = new StorageN11Action(getModel(), size, getState() != SURF_RESOURCE_ON, this, READ); + StorageAction *action = new StorageN11Action(getModel(), size, isOff(), this, READ); return action; } @@ -448,14 +256,13 @@ StorageAction *StorageN11::write(surf_file_t fd, sg_size_t size) char *filename = fd->name; XBT_DEBUG("\tWrite file '%s' size '%llu/%llu'",filename,size,fd->size); - StorageAction *action = new StorageN11Action(getModel(), size, getState() != SURF_RESOURCE_ON, this, WRITE); + StorageAction *action = new StorageN11Action(getModel(), size, isOff(), this, WRITE); action->p_file = fd; - /* Substract the part of the file that might disappear from the used sized on - * the storage element */ - m_usedSize -= (fd->size - fd->current_position); + /* 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 - if(m_usedSize==m_size) { - action->setState(SURF_ACTION_FAILED); + if(usedSize_==size_) { + action->setState(Action::State::failed); } return action; } @@ -465,9 +272,9 @@ StorageAction *StorageN11::write(surf_file_t fd, sg_size_t size) **********/ StorageN11Action::StorageN11Action(Model *model, double cost, bool failed, Storage *storage, e_surf_action_storage_type_t type) - : StorageAction(model, cost, failed, - lmm_variable_new(model->getMaxminSystem(), this, 1.0, -1.0 , 3), - storage, type) { +: StorageAction(model, cost, failed, + lmm_variable_new(model->getMaxminSystem(), this, 1.0, -1.0 , 3), + storage, type) { XBT_IN("(%s,%g", storage->getName(), cost); // Must be less than the max bandwidth for all actions @@ -478,17 +285,15 @@ StorageN11Action::StorageN11Action(Model *model, double cost, bool failed, Stora case STAT: break; case READ: - lmm_expand(model->getMaxminSystem(), storage->p_constraintRead, - getVariable(), 1.0); + lmm_expand(model->getMaxminSystem(), storage->constraintRead_, getVariable(), 1.0); break; case WRITE: - lmm_expand(model->getMaxminSystem(), storage->p_constraintWrite, - getVariable(), 1.0); + 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; -// xbt_dynar_push(storage->p_writeActions, &action); -// ref(); + //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; } XBT_OUT(); @@ -496,10 +301,10 @@ StorageN11Action::StorageN11Action(Model *model, double cost, bool failed, Stora int StorageN11Action::unref() { - m_refcount--; - if (!m_refcount) { - if (actionHook::is_linked()) - p_stateSet->erase(p_stateSet->iterator_to(*this)); + refcount_--; + if (!refcount_) { + if (action_hook.is_linked()) + stateSet_->erase(stateSet_->iterator_to(*this)); if (getVariable()) lmm_variable_free(getModel()->getMaxminSystem(), getVariable()); xbt_free(getCategory()); @@ -511,18 +316,15 @@ int StorageN11Action::unref() void StorageN11Action::cancel() { - setState(SURF_ACTION_FAILED); - return; + setState(Action::State::failed); } void StorageN11Action::suspend() { XBT_IN("(%p)", this); - if (m_suspended != 2) { - lmm_update_variable_weight(getModel()->getMaxminSystem(), - getVariable(), - 0.0); - m_suspended = 1; + if (suspended_ != 2) { + lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0); + suspended_ = 1; } XBT_OUT(); } @@ -534,7 +336,7 @@ void StorageN11Action::resume() bool StorageN11Action::isSuspended() { - return m_suspended == 1; + return suspended_ == 1; } void StorageN11Action::setMaxDuration(double /*duration*/) @@ -547,3 +349,5 @@ void StorageN11Action::setPriority(double /*priority*/) THROW_UNIMPLEMENTED; } +} +}