X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/773715423764e9f35aacb24b982b6b43598bd40e..a511865336e83ac3654632265ed00b8f0bf0eccc:/src/surf/storage_interface.cpp diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp index b51503c796..c674ff92bc 100644 --- a/src/surf/storage_interface.cpp +++ b/src/surf/storage_interface.cpp @@ -1,35 +1,50 @@ +/* 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_interface.hpp" #include "surf_private.h" +#include "xbt/file.h" /* xbt_getline */ -#define __STDC_FORMAT_MACROS - -extern "C" { XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf, "Logging specific to the SURF storage module"); -} +xbt_lib_t file_lib; xbt_lib_t storage_lib; int ROUTING_STORAGE_LEVEL; //Routing for storagelevel int ROUTING_STORAGE_HOST_LEVEL; int SURF_STORAGE_LEVEL; xbt_lib_t storage_type_lib; int ROUTING_STORAGE_TYPE_LEVEL; //Routing for storage_type level +simgrid::surf::StorageModel *surf_storage_model = NULL; -xbt_dynar_t mount_list = NULL; -StorageModelPtr surf_storage_model = NULL; +namespace simgrid { +namespace surf { + +/************* + * Callbacks * + *************/ + +simgrid::xbt::signal storageCreatedCallbacks; +simgrid::xbt::signal storageDestructedCallbacks; +simgrid::xbt::signal storageStateChangedCallbacks; // signature: wasOn, isOn +simgrid::xbt::signal storageActionStateChangedCallbacks; /********* * Model * *********/ -StorageModel::StorageModel() : Model("Storage") { +StorageModel::StorageModel() + : Model() +{ + p_storageList = NULL; } StorageModel::~StorageModel(){ - lmm_system_free(p_maxminSystem); - + lmm_system_free(maxminSystem_); surf_storage_model = NULL; - xbt_dynar_free(&p_storageList); } @@ -37,32 +52,58 @@ StorageModel::~StorageModel(){ * Resource * ************/ -Storage::Storage(const char* type_id, char *content_name, char *content_type, sg_size_t size) -: p_content(parseContent(content_name)), p_contentType(content_type), - m_size(size), m_usedSize(0), p_typeId(xbt_strdup(type_id)), p_writeActions(xbt_dynar_new(sizeof(ActionPtr),NULL)) +Storage::Storage(Model *model, const char *name, xbt_dict_t props, + const char* type_id, const char *content_name, const char *content_type, + sg_size_t size) + : Resource(model, name) + , PropertyHolder(props) + , p_contentType(xbt_strdup(content_type)) + , m_size(size), m_usedSize(0) + , p_typeId(xbt_strdup(type_id)) + , p_writeActions(xbt_dynar_new(sizeof(Action*),NULL)) +{ + p_content = parseContent(content_name); + turnOn(); +} + +Storage::Storage(Model *model, const char *name, xbt_dict_t props, + lmm_system_t maxminSystem, double bread, double bwrite, + double bconnection, const char* type_id, const char *content_name, + const char *content_type, sg_size_t size, const char *attach) + : Resource(model, name, lmm_constraint_new(maxminSystem, this, bconnection)) + , PropertyHolder(props) + , p_contentType(xbt_strdup(content_type)) + , m_size(size), m_usedSize(0) + , p_typeId(xbt_strdup(type_id)) + , p_writeActions(xbt_dynar_new(sizeof(Action*),NULL)) { - p_stateCurrent = SURF_RESOURCE_ON; + p_content = parseContent(content_name); + p_attach = xbt_strdup(attach); + turnOn(); + XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size); + p_constraintRead = lmm_constraint_new(maxminSystem, this, bread); + p_constraintWrite = lmm_constraint_new(maxminSystem, this, bwrite); } Storage::~Storage(){ + storageDestructedCallbacks(this); xbt_dict_free(&p_content); xbt_dynar_free(&p_writeActions); free(p_typeId); free(p_contentType); + free(p_attach); } -xbt_dict_t Storage::parseContent(char *filename) +xbt_dict_t Storage::parseContent(const char *filename) { m_usedSize = 0; if ((!filename) || (strcmp(filename, "") == 0)) return NULL; - xbt_dict_t parse_content = xbt_dict_new_homogeneous(xbt_free); - FILE *file = NULL; + xbt_dict_t parse_content = xbt_dict_new_homogeneous(xbt_free_f); - file = surf_fopen(filename, "r"); - xbt_assert(file != NULL, "Cannot open file '%s' (path=%s)", filename, - xbt_str_join(surf_path, ":")); + FILE *file = surf_fopen(filename, "r"); + xbt_assert(file, "Cannot open file '%s' (path=%s)", filename, xbt_str_join(surf_path, ":")); char *line = NULL; size_t len = 0; @@ -70,17 +111,14 @@ xbt_dict_t Storage::parseContent(char *filename) char path[1024]; sg_size_t size; - while ((read = xbt_getline(&line, &len, file)) != -1) { if (read){ - if(sscanf(line,"%s %llu", path, &size) == 2) { - m_usedSize += size; - sg_size_t *psize = xbt_new(sg_size_t, 1); - *psize = size; - xbt_dict_set(parse_content,path,psize,NULL); - } else { - xbt_die("Be sure of passing a good format for content file.\n"); - } + xbt_assert(sscanf(line,"%s %llu", path, &size) == 2, "Parse error in %s: %s",filename,line); + + m_usedSize += size; + sg_size_t *psize = xbt_new(sg_size_t, 1); + *psize = size; + xbt_dict_set(parse_content,path,psize,NULL); } } free(line); @@ -94,15 +132,27 @@ bool Storage::isUsed() return false; } -void Storage::updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, double /*date*/) +void Storage::apply_event(tmgr_trace_iterator_t /*event*/, double /*value*/) { THROW_UNIMPLEMENTED; } +void Storage::turnOn() { + if (isOff()) { + Resource::turnOn(); + storageStateChangedCallbacks(this, 0, 1); + } +} +void Storage::turnOff() { + if (isOn()) { + Resource::turnOff(); + storageStateChangedCallbacks(this, 1, 0); + } +} + xbt_dict_t Storage::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; @@ -119,25 +169,36 @@ sg_size_t Storage::getSize(){ return m_size; } -StorageLmm::StorageLmm(lmm_system_t maxminSystem, double bread, double bwrite, double bconnection, - const char* type_id, char *content_name, char *content_type, sg_size_t size) - : ResourceLmm(), Storage(type_id, content_name, content_type, size) { - XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size); +sg_size_t Storage::getFreeSize(){ + return m_size - m_usedSize; +} - p_constraint = lmm_constraint_new(maxminSystem, this, bconnection); - p_constraintRead = lmm_constraint_new(maxminSystem, this, bread); - p_constraintWrite = lmm_constraint_new(maxminSystem, this, bwrite); +sg_size_t Storage::getUsedSize(){ + return m_usedSize; } /********** * Action * **********/ -StorageAction::StorageAction(StoragePtr storage, e_surf_action_storage_type_t type) -: m_type(type), p_storage(storage), p_file(NULL), p_lsDict(NULL) -{ +StorageAction::StorageAction(Model *model, double cost, bool failed, + Storage *storage, e_surf_action_storage_type_t type) +: Action(model, cost, failed) +, m_type(type), p_storage(storage), p_file(NULL){ + progress = 0; }; -StorageActionLmm::StorageActionLmm(StorageLmmPtr storage, e_surf_action_storage_type_t type) - : StorageAction(storage, type) { +StorageAction::StorageAction(Model *model, double cost, bool failed, lmm_variable_t var, + Storage *storage, e_surf_action_storage_type_t type) + : Action(model, cost, failed, var) + , m_type(type), p_storage(storage), p_file(NULL){ + progress = 0; } +void StorageAction::setState(Action::State state){ + Action::State old = getState(); + Action::setState(state); + storageActionStateChangedCallbacks(this, old, state); +} + +} +}