X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3ae712a1b95294052b6e8136d0f0f2d4b30e6eb..b35d70d6818026204833410d2e3917252fa35127:/src/surf/storage_interface.cpp diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp index 28de019eb4..c9c3698365 100644 --- a/src/surf/storage_interface.cpp +++ b/src/surf/storage_interface.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 @@ -6,6 +6,7 @@ #include "storage_interface.hpp" #include "surf_private.h" +#include "xbt/file.h" /* xbt_getline */ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf, "Logging specific to the SURF storage module"); @@ -18,22 +19,27 @@ int SURF_STORAGE_LEVEL; xbt_lib_t storage_type_lib; int ROUTING_STORAGE_TYPE_LEVEL; //Routing for storage_type level xbt_dynar_t mount_list = NULL; -StorageModelPtr surf_storage_model = NULL; +simgrid::surf::StorageModel *surf_storage_model = NULL; + +namespace simgrid { +namespace surf { /************* * Callbacks * *************/ -surf_callback(void, StoragePtr) storageCreatedCallbacks; -surf_callback(void, StoragePtr) storageDestructedCallbacks; -surf_callback(void, StoragePtr, e_surf_resource_state_t, e_surf_resource_state_t) storageStateChangedCallbacks; -surf_callback(void, StorageActionPtr, e_surf_action_state_t, e_surf_action_state_t) storageActionStateChangedCallbacks; +simgrid::surf::signal storageCreatedCallbacks; +simgrid::surf::signal storageDestructedCallbacks; +simgrid::surf::signal storageStateChangedCallbacks; +simgrid::surf::signal storageActionStateChangedCallbacks; /********* * Model * *********/ -StorageModel::StorageModel() : Model("Storage") { +StorageModel::StorageModel() + : Model() +{ p_storageList = NULL; } @@ -49,28 +55,31 @@ StorageModel::~StorageModel(){ * Resource * ************/ -Storage::Storage(ModelPtr model, const char *name, xbt_dict_t props, - const char* type_id, char *content_name, char *content_type, sg_size_t size) - : Resource(model, name, props) - , p_contentType(content_type) +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(ActionPtr),NULL)) + , p_writeActions(xbt_dynar_new(sizeof(Action*),NULL)) { - surf_callback_emit(storageCreatedCallbacks, this); p_content = parseContent(content_name); setState(SURF_RESOURCE_ON); } -Storage::Storage(ModelPtr model, const char *name, xbt_dict_t props, - 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) - : Resource(model, name, props, lmm_constraint_new(maxminSystem, this, bconnection)) - , p_contentType(content_type) +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(ActionPtr),NULL)) { - surf_callback_emit(storageCreatedCallbacks, this); + , p_writeActions(xbt_dynar_new(sizeof(Action*),NULL)) +{ p_content = parseContent(content_name); p_attach = xbt_strdup(attach); setState(SURF_RESOURCE_ON); @@ -80,7 +89,7 @@ Storage::Storage(ModelPtr model, const char *name, xbt_dict_t props, } Storage::~Storage(){ - surf_callback_emit(storageDestructedCallbacks, this); + storageDestructedCallbacks(this); xbt_dict_free(&p_content); xbt_dynar_free(&p_writeActions); free(p_typeId); @@ -88,13 +97,13 @@ Storage::~Storage(){ 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); + xbt_dict_t parse_content = xbt_dict_new_homogeneous(xbt_free_f); FILE *file = NULL; file = surf_fopen(filename, "r"); @@ -140,7 +149,7 @@ void Storage::setState(e_surf_resource_state_t state) { e_surf_resource_state_t old = Resource::getState(); Resource::setState(state); - surf_callback_emit(storageStateChangedCallbacks, this, old, state); + storageStateChangedCallbacks(this, old, state); } xbt_dict_t Storage::getContent() @@ -173,15 +182,15 @@ sg_size_t Storage::getUsedSize(){ /********** * Action * **********/ -StorageAction::StorageAction(ModelPtr model, double cost, bool failed, - StoragePtr storage, e_surf_action_storage_type_t type) +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; }; -StorageAction::StorageAction(ModelPtr model, double cost, bool failed, lmm_variable_t var, - StoragePtr storage, e_surf_action_storage_type_t 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; @@ -190,5 +199,8 @@ StorageAction::StorageAction(ModelPtr model, double cost, bool failed, lmm_varia void StorageAction::setState(e_surf_action_state_t state){ e_surf_action_state_t old = getState(); Action::setState(state); - surf_callback_emit(storageActionStateChangedCallbacks, this, old, state); + storageActionStateChangedCallbacks(this, old, state); +} + +} }