X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3ae712a1b95294052b6e8136d0f0f2d4b30e6eb..db47f7bec9a8c821125bda2d6cb27626e12e7fa7:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index d0bc4080f0..42fef37138 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 @@ -31,7 +31,7 @@ static XBT_INLINE void routing_storage_type_free(void *r) static XBT_INLINE void surf_storage_resource_free(void *r) { // specific to storage - StoragePtr storage = static_cast(r); + Storage *storage = static_cast(r); // generic resource delete storage; } @@ -68,7 +68,7 @@ static void parse_storage_init(sg_platf_storage_cbarg_t storage) storage->content_type, storage->properties); - surf_storage_model->createResource(storage->id, + surf_storage_model->createStorage(storage->id, ((storage_type_t) stype)->type_id, storage->content, storage->content_type, @@ -195,7 +195,7 @@ static void storage_define_callbacks() void storage_register_callbacks() { - ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,xbt_free); + 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); @@ -218,7 +218,7 @@ void surf_storage_model_init_default(void) } StorageN11Model::StorageN11Model() : StorageModel() { - ActionPtr action = NULL; + Action *action = NULL; XBT_DEBUG("surf_storage_model_init_internal"); @@ -234,8 +234,9 @@ StorageN11Model::~StorageN11Model(){ storage_running_action_set_that_does_not_need_being_checked = NULL; } -StoragePtr StorageN11Model::createResource(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, xbt_dict_t properties, + const char* attach) { xbt_assert(!surf_storage_resource_priv(surf_storage_resource_by_name(id)), @@ -248,11 +249,11 @@ StoragePtr StorageN11Model::createResource(const char* id, const char* type_id, 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")); - StoragePtr storage = new StorageN11(this, id, properties, p_maxminSystem, - Bread, Bwrite, Bconnection, - type_id, (char *)content_name, xbt_strdup(content_type), storage_type->size, (char *) attach); + Storage *storage = new StorageN11(this, id, properties, p_maxminSystem, + Bread, Bwrite, Bconnection, type_id, (char *)content_name, + xbt_strdup(content_type), storage_type->size, (char *) attach); - xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, static_cast(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, @@ -261,7 +262,7 @@ StoragePtr StorageN11Model::createResource(const char* id, const char* type_id, Bread); if(!p_storageList) - p_storageList = xbt_dynar_new(sizeof(char *),NULL); + p_storageList = xbt_dynar_new(sizeof(char *),NULL); xbt_dynar_push(p_storageList, &storage); return storage; @@ -271,9 +272,9 @@ double StorageN11Model::shareResources(double now) { XBT_DEBUG("storage_share_resources %f", now); unsigned int i, j; - StoragePtr storage; + Storage *storage; void *_write_action; - StorageActionPtr write_action; + StorageAction *write_action; double min_completion = shareResourcesMaxMin(getRunningActionSet(), p_maxminSystem, lmm_solve); @@ -286,7 +287,7 @@ double StorageN11Model::shareResources(double now) // Foreach write action on disk xbt_dynar_foreach(storage->p_writeActions, j, _write_action) { - write_action = static_cast(_write_action); + write_action = static_cast(_write_action); rate += lmm_variable_getvalue(write_action->getVariable()); } if(rate > 0) @@ -298,20 +299,20 @@ double StorageN11Model::shareResources(double now) void StorageN11Model::updateActionsState(double /*now*/, double delta) { - StorageActionPtr action = NULL; + StorageAction *action = NULL; - ActionListPtr actionSet = getRunningActionSet(); + ActionList *actionSet = getRunningActionSet(); for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end()) ; it != itend ; it=itNext) { ++itNext; - action = static_cast(&*it); + action = static_cast(&*it); if(action->m_type == WRITE) { // Update the disk usage // Update the file size // For each action of type write - double current_progress = + volatile double current_progress = delta * lmm_variable_getvalue(action->getVariable()); long int incr = current_progress; @@ -322,7 +323,7 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) lrint(action->progress + current_progress), lrint(action->progress)+ incr); - /* Take care of rounding error accumulation */ + /* take care of rounding error accumulation */ if (lrint(action->progress + current_progress) > lrint(action->progress)+ incr) incr++; @@ -370,15 +371,16 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) * Resource * ************/ -StorageN11::StorageN11(StorageModelPtr 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) +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) { XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size); } -StorageActionPtr StorageN11::open(const char* mount, const char* path) +StorageAction *StorageN11::open(const char* mount, const char* path) { XBT_DEBUG("\tOpen file '%s'",path); @@ -400,22 +402,22 @@ StorageActionPtr StorageN11::open(const char* mount, const char* path) file->mount = xbt_strdup(mount); file->current_position = 0; - StorageActionPtr action = new StorageN11Action(getModel(), 0, getState() != SURF_RESOURCE_ON, this, OPEN); + StorageAction *action = new StorageN11Action(getModel(), 0, getState() != SURF_RESOURCE_ON, this, OPEN); action->p_file = file; return action; } -StorageActionPtr StorageN11::close(surf_file_t fd) +StorageAction *StorageN11::close(surf_file_t fd) { char *filename = fd->name; XBT_DEBUG("\tClose file '%s' size '%llu'", filename, fd->size); // unref write actions from storage void *_write_action; - StorageActionPtr write_action; + StorageAction *write_action; unsigned int i; xbt_dynar_foreach(p_writeActions, i, _write_action) { - write_action = static_cast(static_cast(_write_action)); + write_action = static_cast(_write_action); if ((write_action->p_file) == fd) { xbt_dynar_cursor_rm(p_writeActions, &i); write_action->unref(); @@ -424,29 +426,33 @@ StorageActionPtr StorageN11::close(surf_file_t fd) free(fd->name); free(fd->mount); xbt_free(fd); - StorageActionPtr action = new StorageN11Action(getModel(), 0, getState() != SURF_RESOURCE_ON, this, CLOSE); + StorageAction *action = new StorageN11Action(getModel(), 0, getState() != SURF_RESOURCE_ON, this, CLOSE); return action; } -StorageActionPtr StorageN11::read(surf_file_t fd, sg_size_t size) +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; - StorageActionPtr action = new StorageN11Action(getModel(), size, getState() != SURF_RESOURCE_ON, this, READ); + StorageAction *action = new StorageN11Action(getModel(), size, getState() != SURF_RESOURCE_ON, this, READ); return action; } -StorageActionPtr StorageN11::write(surf_file_t fd, sg_size_t size) +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); - StorageActionPtr action = new StorageN11Action(getModel(), size, getState() != SURF_RESOURCE_ON, this, WRITE); + StorageAction *action = new StorageN11Action(getModel(), size, getState() != SURF_RESOURCE_ON, this, WRITE); action->p_file = fd; /* Substract the part of the file that might disappear from the used sized on * the storage element */ @@ -462,7 +468,7 @@ StorageActionPtr StorageN11::write(surf_file_t fd, sg_size_t size) * Action * **********/ -StorageN11Action::StorageN11Action(ModelPtr model, double cost, bool failed, StoragePtr storage, e_surf_action_storage_type_t type) +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) { @@ -482,9 +488,11 @@ StorageN11Action::StorageN11Action(ModelPtr model, double cost, bool failed, Sto case WRITE: lmm_expand(model->getMaxminSystem(), storage->p_constraintWrite, getVariable(), 1.0); - ActionPtr 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; +// xbt_dynar_push(storage->p_writeActions, &action); +// ref(); break; } XBT_OUT(); @@ -494,13 +502,11 @@ int StorageN11Action::unref() { m_refcount--; if (!m_refcount) { - if (actionHook::is_linked()) + if (action_hook.is_linked()) p_stateSet->erase(p_stateSet->iterator_to(*this)); if (getVariable()) lmm_variable_free(getModel()->getMaxminSystem(), getVariable()); -#ifdef HAVE_TRACING xbt_free(getCategory()); -#endif delete this; return 1; }