A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[mc] Use mc_snapshot_read in mc_diff (compatibility with per-page snapshots)
[simgrid.git]
/
src
/
surf
/
storage_interface.cpp
diff --git
a/src/surf/storage_interface.cpp
b/src/surf/storage_interface.cpp
index d1c824d2fbd17108dba7196fc59d78642e5de3bc..28de019eb46fe90cc39b962e15054d4e29a3ddde 100644
(file)
--- 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 */
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;
xbt_dict_t content_dict = xbt_dict_new_homogeneous(NULL);
xbt_dict_cursor_t cursor = NULL;
@@
-163,20
+162,29
@@
sg_size_t Storage::getSize(){
return m_size;
}
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,
/**********
* Action *
**********/
StorageAction::StorageAction(ModelPtr model, double cost, bool failed,
-
StoragePtr storage, e_surf_action_storage_type_t type)
+ StoragePtr storage, e_surf_action_storage_type_t type)
: Action(model, cost, failed)
: 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,
};
StorageAction::StorageAction(ModelPtr model, double cost, bool failed, lmm_variable_t var,
-
StoragePtr storage, e_surf_action_storage_type_t type)
+ StoragePtr storage, e_surf_action_storage_type_t type)
: Action(model, cost, failed, var)
: 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;
}
void StorageAction::setState(e_surf_action_state_t state){
}
void StorageAction::setState(e_surf_action_state_t state){