X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f5ee9657db940ac6b97f594a7e8e55be3e8293f3..d02345869ec6569f2a9db56a877604e5a933d5f7:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index e8388de69d..3b270eb2b7 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -1,6 +1,12 @@ +/* Copyright (c) 2013-2015. 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 "surf_private.h" - +#include /*ceil*/ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage); static int storage_selective_update = 0; @@ -10,7 +16,7 @@ static xbt_swag_t storage_running_action_set_that_does_not_need_being_checked = * 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); @@ -18,188 +24,30 @@ static XBT_INLINE void routing_storage_type_free(void *r) free(stype->content); free(stype->content_type); xbt_dict_free(&(stype->properties)); - xbt_dict_free(&(stype->properties)); + xbt_dict_free(&(stype->model_properties)); free(stype); } -static XBT_INLINE void surf_storage_resource_free(void *r) +static inline void surf_storage_resource_free(void *r) { // specific to storage - StoragePtr storage = dynamic_cast(static_cast(r)); - xbt_dict_free(&storage->p_content); - xbt_dynar_free(&storage->p_writeActions); - free(storage->p_typeId); - free(storage->p_contentType); + 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_type_t) stype)->properties); - - surf_storage_model->createResource(storage->id, - ((storage_type_t) stype)->type_id, - storage->content, - storage->content_type, - storage->properties); -} - -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) -{ - 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; - - 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() +void storage_register_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); + 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); } /********* @@ -208,21 +56,22 @@ void storage_register_callbacks() { void surf_storage_model_init_default(void) { - surf_storage_model = new StorageN11Model(); - storage_define_callbacks(); - xbt_dynar_push(model_list, &surf_storage_model); + surf_storage_model = new simgrid::surf::StorageN11Model(); + xbt_dynar_push(all_existing_models, &surf_storage_model); } +namespace simgrid { +namespace surf { + StorageN11Model::StorageN11Model() : StorageModel() { - StorageN11ActionLmm action; + Action *action = NULL; 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); + xbt_swag_new(xbt_swag_offset(*action, stateHookup_)); + if (!maxminSystem_) { + maxminSystem_ = lmm_system_new(storage_selective_update); } } @@ -231,49 +80,54 @@ 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) +#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) { 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->properties, "Bread")); - double Bwrite = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->properties, "Bwrite")); - double Bconnection = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->properties, "Bconnection")); - - StoragePtr storage = new StorageN11Lmm(this, id, properties, p_maxminSystem, - Bread, Bwrite, Bconnection, - type_id, (char *)content_name, xbt_strdup(content_type), storage_type->size); + 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); - xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, static_cast(storage)); + Storage *storage = new StorageN11(this, id, properties, 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, - storage_type->properties, + properties, 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; } -double StorageN11Model::shareResources(double now) +double StorageN11Model::next_occuring_event(double /*now*/) { - XBT_DEBUG("storage_share_resources %f", now); + XBT_DEBUG("storage_share_resources"); unsigned int i, j; - StoragePtr storage; + Storage *storage; void *_write_action; - StorageActionLmmPtr write_action; + StorageAction *write_action; - double min_completion = shareResourcesMaxMin(p_runningActionSet, - p_maxminSystem, lmm_solve); + double min_completion = shareResourcesMaxMin(getRunningActionSet(), + maxminSystem_, lmm_solve); double rate; // Foreach disk @@ -283,8 +137,8 @@ double StorageN11Model::shareResources(double now) // Foreach write action on disk xbt_dynar_foreach(storage->p_writeActions, j, _write_action) { - write_action = dynamic_cast(static_cast(_write_action)); - rate += lmm_variable_getvalue(write_action->p_variable); + write_action = static_cast(_write_action); + rate += lmm_variable_getvalue(write_action->getVariable()); } if(rate > 0) min_completion = MIN(min_completion, (storage->m_size-storage->m_usedSize)/rate); @@ -295,55 +149,71 @@ double StorageN11Model::shareResources(double now) void StorageN11Model::updateActionsState(double /*now*/, double delta) { - void *_action, *_next_action; - StorageActionLmmPtr action = NULL; + StorageAction *action = NULL; + + ActionList *actionSet = getRunningActionSet(); + for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end()) + ; it != itend ; it=itNext) { + ++itNext; + action = static_cast(&*it); - xbt_swag_foreach_safe(_action, _next_action, p_runningActionSet) { - action = dynamic_cast(static_cast(_action)); if(action->m_type == WRITE) { // Update the disk usage - // Update the file size - // For each action of type write - double rate = lmm_variable_getvalue(action->p_variable); - /* Hack to avoid rounding differences between x86 and x86_64 - * (note that the next sizes are of type sg_size_t). */ - long incr = delta * rate + MAXMIN_PRECISION; - action->p_storage->m_usedSize += (incr - action->p_file->size); // disk usage - action->p_file->size = incr; // file size + // Update the file size + // For each action of type write + volatile 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); + + /* take care of rounding error accumulation */ + 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_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); } - double_update(&action->m_remains, - lmm_variable_getvalue(action->p_variable) * delta); + action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); - if (action->m_maxDuration != NO_MAX_DURATION) - double_update(&action->m_maxDuration, delta); + if (action->getMaxDuration() != NO_MAX_DURATION) + action->updateMaxDuration(delta); - if(action->m_remains > 0 && - lmm_get_variable_weight(action->p_variable) > 0 && + if(action->getRemainsNoUpdate() > 0 && + lmm_get_variable_weight(action->getVariable()) > 0 && action->p_storage->m_usedSize == action->p_storage->m_size) { - action->m_finish = surf_get_clock(); - action->setState(SURF_ACTION_FAILED); - } else if ((action->m_remains <= 0) && - (lmm_get_variable_weight(action->p_variable) > 0)) + action->finish(); + action->setState(Action::State::failed); + } else if ((action->getRemainsNoUpdate() <= 0) && + (lmm_get_variable_weight(action->getVariable()) > 0)) { - action->m_finish = surf_get_clock(); - action->setState(SURF_ACTION_DONE); - } else if ((action->m_maxDuration != NO_MAX_DURATION) && - (action->m_maxDuration <= 0)) + action->finish(); + action->setState(Action::State::done); + } else if ((action->getMaxDuration() != NO_MAX_DURATION) && + (action->getMaxDuration() <= 0)) { - action->m_finish = surf_get_clock(); - action->setState(SURF_ACTION_DONE); + action->finish(); + action->setState(Action::State::done); } } - return; } @@ -351,81 +221,26 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) * Resource * ************/ -StorageN11Lmm::StorageN11Lmm(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) - : Resource(model, name, properties), - StorageLmm(maxminSystem, bread, bwrite, bconnection, type_id, content_name, content_type, size) { +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) { XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size); - - p_stateCurrent = SURF_RESOURCE_ON; - m_usedSize = 0; - m_size = 0; - - p_content = parseContent(content_name); - p_contentType = content_type; - p_constraint = lmm_constraint_new(maxminSystem, this, bconnection); - p_constraintRead = lmm_constraint_new(maxminSystem, this, bread); - p_constraintWrite = lmm_constraint_new(maxminSystem, this, bwrite); - m_size = size; - p_typeId = xbt_strdup(type_id); } -StorageActionPtr StorageN11Lmm::ls(const char* path) -{ - StorageActionLmmPtr action = new StorageN11ActionLmm(p_model, 0, p_stateCurrent != SURF_RESOURCE_ON, this, LS); - - action->p_lsDict = NULL; - xbt_dict_t ls_dict = xbt_dict_new_homogeneous(xbt_free); - - char* key; - sg_size_t size = 0; - xbt_dict_cursor_t cursor = NULL; - - xbt_dynar_t dyn = NULL; - char* file = NULL; - - // for each file in the storage content - xbt_dict_foreach(p_content,cursor,key,size){ - // Search if file start with the prefix 'path' - if(xbt_str_start_with(key,path)){ - file = &key[strlen(path)]; - - // Split file with '/' - dyn = xbt_str_split(file,"/"); - file = xbt_dynar_get_as(dyn,0,char*); - - // file - if(xbt_dynar_length(dyn) == 1){ - sg_size_t *psize = xbt_new(sg_size_t, 1); - *psize=size; - xbt_dict_set(ls_dict, file, psize, NULL); - } - // Directory - else - { - // if directory does not exist yet in the dictionary - if(!xbt_dict_get_or_null(ls_dict,file)) - xbt_dict_set(ls_dict,file,NULL,NULL); - } - xbt_dynar_free(&dyn); - } - } - - action->p_lsDict = ls_dict; - return action; -} - -StorageActionPtr StorageN11Lmm::open(const char* mount, const char* path) +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); // if file does not exist create an empty file if(psize) size = *psize; else { - psize = xbt_new(sg_size_t,1); + psize = xbt_new(sg_size_t,1); size = 0; *psize = size; xbt_dict_set(p_content, path, psize, NULL); @@ -437,21 +252,22 @@ StorageActionPtr StorageN11Lmm::open(const char* mount, const char* path) file->mount = xbt_strdup(mount); file->current_position = 0; - StorageActionLmmPtr action = new StorageN11ActionLmm(p_model, 0, p_stateCurrent != SURF_RESOURCE_ON, this, OPEN); + StorageAction *action = new StorageN11Action(getModel(), 0, isOff(), this, OPEN); action->p_file = file; + return action; } -StorageActionPtr StorageN11Lmm::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; - StorageActionLmmPtr write_action; + StorageAction *write_action; unsigned int i; xbt_dynar_foreach(p_writeActions, i, _write_action) { - write_action = dynamic_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(); @@ -460,157 +276,128 @@ StorageActionPtr StorageN11Lmm::close(surf_file_t fd) free(fd->name); free(fd->mount); xbt_free(fd); - StorageActionLmmPtr action = new StorageN11ActionLmm(p_model, 0, p_stateCurrent != SURF_RESOURCE_ON, this, CLOSE); + StorageAction *action = new StorageN11Action(getModel(), 0, isOff(), this, CLOSE); return action; } -StorageActionPtr StorageN11Lmm::read(surf_file_t fd, sg_size_t size) +StorageAction *StorageN11::read(surf_file_t fd, sg_size_t size) { - if(size > fd->size){ - size = fd->size; + if(fd->current_position + size > fd->size){ + 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; + fd->current_position += size; - StorageActionLmmPtr action = new StorageN11ActionLmm(p_model, size, p_stateCurrent != SURF_RESOURCE_ON, this, READ); + StorageAction *action = new StorageN11Action(getModel(), size, isOff(), this, READ); return action; } -StorageActionPtr StorageN11Lmm::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); - StorageActionLmmPtr action = new StorageN11ActionLmm(p_model, size, p_stateCurrent != SURF_RESOURCE_ON, this, WRITE); + StorageAction *action = new StorageN11Action(getModel(), size, isOff(), this, WRITE); action->p_file = fd; - fd->current_position += size; - // If the storage is full + /* Substract the part of the file that might disappear from the used sized on + * the storage element */ + m_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); + action->setState(Action::State::failed); } return action; } -void StorageN11Lmm::rename(const char *src, const char *dest) -{ - sg_size_t *psize, *new_psize; - psize = (sg_size_t*) xbt_dict_get_or_null(p_content,src); - new_psize = xbt_new(sg_size_t, 1); - *new_psize = *psize; - if (psize){// src file exists - xbt_dict_remove(p_content, src); - xbt_dict_set(p_content, dest, new_psize,NULL); - XBT_DEBUG("Change file name from %s to %s, size '%llu'",src, dest, *psize); - } - else - XBT_DEBUG("File %s doesn't exist",src); -} - -xbt_dict_t StorageN11Lmm::getContent() -{ - /* For the moment this action has no cost, but in the future we could take in account access latency of the disk */ - /*surf_action_t action = storage_action_execute(storage,0, LS);*/ - - xbt_dict_t content_dict = xbt_dict_new_homogeneous(NULL); - xbt_dict_cursor_t cursor = NULL; - char *file; - sg_size_t *psize; - - xbt_dict_foreach(p_content, cursor, file, psize){ - xbt_dict_set(content_dict,file,psize,NULL); - } - return content_dict; -} - -sg_size_t StorageN11Lmm::getSize(){ - return m_size; -} - /********** * Action * **********/ -StorageN11ActionLmm::StorageN11ActionLmm(ModelPtr model, double cost, bool failed, StorageLmmPtr storage, e_surf_action_storage_type_t type) - : Action(model, cost, failed), - StorageActionLmm(storage, type) { - XBT_IN("(%s,%g", storage->m_name, cost); - p_variable = lmm_variable_new(p_model->p_maxminSystem, this, 1.0, -1.0 , 3); +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) { + XBT_IN("(%s,%g", storage->getName(), cost); // Must be less than the max bandwidth for all actions - lmm_expand(p_model->p_maxminSystem, storage->p_constraint, p_variable, 1.0); + lmm_expand(model->getMaxminSystem(), storage->getConstraint(), getVariable(), 1.0); switch(type) { case OPEN: case CLOSE: case STAT: - case LS: break; case READ: - lmm_expand(p_model->p_maxminSystem, storage->p_constraintRead, - p_variable, 1.0); + lmm_expand(model->getMaxminSystem(), storage->p_constraintRead, + getVariable(), 1.0); break; case WRITE: - lmm_expand(p_model->p_maxminSystem, storage->p_constraintWrite, - p_variable, 1.0); - ActionPtr action = this; - xbt_dynar_push(storage->p_writeActions, &action); - ref(); + lmm_expand(model->getMaxminSystem(), storage->p_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(); break; } XBT_OUT(); } -int StorageN11ActionLmm::unref() +int StorageN11Action::unref() { - m_refcount--; - if (!m_refcount) { - xbt_swag_remove(static_cast(this), p_stateSet); - if (p_variable) - lmm_variable_free(p_model->p_maxminSystem, p_variable); -#ifdef HAVE_TRACING - xbt_free(p_category); -#endif + 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()); delete this; return 1; } return 0; } -void StorageN11ActionLmm::cancel() +void StorageN11Action::cancel() { - setState(SURF_ACTION_FAILED); + setState(Action::State::failed); return; } -void StorageN11ActionLmm::suspend() +void StorageN11Action::suspend() { XBT_IN("(%p)", this); - if (m_suspended != 2) { - lmm_update_variable_weight(p_model->p_maxminSystem, - p_variable, - 0.0); - m_suspended = 1; + if (suspended_ != 2) { + lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0); + suspended_ = 1; } XBT_OUT(); } -void StorageN11ActionLmm::resume() +void StorageN11Action::resume() { THROW_UNIMPLEMENTED; } -bool StorageN11ActionLmm::isSuspended() +bool StorageN11Action::isSuspended() { - return m_suspended == 1; + return suspended_ == 1; } -void StorageN11ActionLmm::setMaxDuration(double /*duration*/) +void StorageN11Action::setMaxDuration(double /*duration*/) { THROW_UNIMPLEMENTED; } -void StorageN11ActionLmm::setPriority(double /*priority*/) +void StorageN11Action::setPriority(double /*priority*/) { THROW_UNIMPLEMENTED; } +} +}