surf_callback(void, StoragePtr) storageCreatedCallbacks;
surf_callback(void, StoragePtr) storageDestructedCallbacks;
-surf_callback(void, StoragePtr) storageStateChangedCallbacks;
-surf_callback(void, StorageActionPtr) storageActionStateChangedCallbacks;
+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;
/*********
* Model *
************/
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)
+ const char* type_id, char *content_name, char *content_type,
+ sg_size_t size)
: Resource(model, name, props)
, p_contentType(content_type)
, m_size(size), m_usedSize(0)
}
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)
+ 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)
, m_size(size), 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");
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);
+ surf_callback_emit(storageStateChangedCallbacks, this, old, 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;
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)
+ 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)
+ 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;
}
void StorageAction::setState(e_surf_action_state_t state){
+ e_surf_action_state_t old = getState();
Action::setState(state);
- surf_callback_emit(storageActionStateChangedCallbacks, this);
+ surf_callback_emit(storageActionStateChangedCallbacks, this, old, state);
}