X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a9df68430653de724aa5089095ed6c9e3055a779..6e33b99518ce60a7e8112f749325972a5734eec7:/src/surf/storage_interface.cpp diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp index bbe461698d..28de019eb4 100644 --- a/src/surf/storage_interface.cpp +++ b/src/surf/storage_interface.cpp @@ -146,7 +146,6 @@ void Storage::setState(e_surf_resource_state_t state) 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; @@ -163,20 +162,28 @@ sg_size_t Storage::getSize(){ return m_size; } +sg_size_t Storage::getFreeSize(){ + return m_size - m_usedSize; +} + +sg_size_t Storage::getUsedSize(){ + return m_usedSize; +} + /********** * Action * **********/ StorageAction::StorageAction(ModelPtr model, double cost, bool failed, StoragePtr storage, e_surf_action_storage_type_t type) : Action(model, cost, failed) -, m_type(type), p_storage(storage), p_file(NULL), p_lsDict(NULL){ +, 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) : Action(model, cost, failed, var) - , m_type(type), p_storage(storage), p_file(NULL), p_lsDict(NULL) { + , m_type(type), p_storage(storage), p_file(NULL){ progress = 0; }