X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc5903068a99bfc50a9f7a479cc3305326f774e9..f2df13795e01302813a6aef10825ec7e922ce530:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index 5173ed84d5..289e657470 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2013-2014. 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" @@ -18,7 +24,7 @@ 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); } @@ -54,19 +60,20 @@ static void parse_storage_init(sg_platf_storage_cbarg_t storage) 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", + "\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); + storage->properties); surf_storage_model->createResource(storage->id, ((storage_type_t) stype)->type_id, storage->content, storage->content_type, - storage->properties); + storage->properties, + storage->attach); } static void parse_mstorage_init(sg_platf_mstorage_cbarg_t /*mstorage*/) @@ -118,6 +125,7 @@ static void storage_parse_storage_type(sg_platf_storage_type_cbarg_t storage_typ 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'", @@ -227,7 +235,7 @@ StorageN11Model::~StorageN11Model(){ } StoragePtr StorageN11Model::createResource(const char* id, const char* type_id, - const char* content_name, const char* content_type, xbt_dict_t properties) + 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)), @@ -236,20 +244,20 @@ StoragePtr StorageN11Model::createResource(const char* id, const char* type_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")); + 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")); StoragePtr storage = new StorageN11(this, id, properties, p_maxminSystem, Bread, Bwrite, Bconnection, - type_id, (char *)content_name, xbt_strdup(content_type), storage_type->size); + 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_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) @@ -306,12 +314,11 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) /* 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 + action->p_storage->m_usedSize += incr; // disk usage + action->p_file->size += incr; // file size 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); } @@ -321,13 +328,13 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) if (action->getMaxDuration() != NO_MAX_DURATION) action->updateMaxDuration(delta); - if(action->getRemains() > 0 && + 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->getRemains() <= 0) && + } else if ((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) { action->finish(); @@ -339,7 +346,6 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) action->setState(SURF_ACTION_DONE); } } - return; } @@ -349,9 +355,9 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) 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) + 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) { + 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); } @@ -400,9 +406,10 @@ StorageActionPtr StorageN11::ls(const char* path) return action; } -StorageActionPtr StorageN11::open(const char* mount, const char* path) +StorageActionPtr StorageN11::open(char* mount, 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 @@ -423,6 +430,9 @@ StorageActionPtr StorageN11::open(const char* mount, const char* path) StorageActionPtr action = new StorageN11Action(getModel(), 0, getState() != SURF_RESOURCE_ON, this, OPEN); action->p_file = file; + free(path); + free(mount); + return action; } @@ -491,26 +501,6 @@ void StorageN11::rename(const char *src, const char *dest) XBT_DEBUG("File %s doesn't exist",src); } -xbt_dict_t StorageN11::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 StorageN11::getSize(){ - return m_size; -} - /********** * Action * **********/