X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3cee343c2f93c3bf4667131e618f01fa692e1138..99b9d1dfab1cfc49e080d24a6c5022723864b15d:/src/surf/storage_interface.cpp

diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp
index 90e14c7939..a068ac62e1 100644
--- a/src/surf/storage_interface.cpp
+++ b/src/surf/storage_interface.cpp
@@ -26,8 +26,8 @@ StorageModelPtr surf_storage_model = NULL;
 
 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 *
@@ -50,7 +50,8 @@ StorageModel::~StorageModel(){
  ************/
 
 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)
@@ -63,8 +64,9 @@ Storage::Storage(ModelPtr model, const char *name, xbt_dict_t props,
 }
 
 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)
@@ -98,8 +100,9 @@ xbt_dict_t Storage::parseContent(char *filename)
   FILE *file = NULL;
 
   file = surf_fopen(filename, "r");
-  xbt_assert(file != NULL, "Cannot open file '%s' (path=%s)", filename,
-              xbt_str_join(surf_path, ":"));
+  if (file == NULL)
+    xbt_die("Cannot open file '%s' (path=%s)", filename,
+            xbt_str_join(surf_path, ":"));
 
   char *line = NULL;
   size_t len = 0;
@@ -107,10 +110,9 @@ 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) {
+      if(sscanf(line,"%s %llu", path, &size) == 2) {
         m_usedSize += size;
         sg_size_t *psize = xbt_new(sg_size_t, 1);
         *psize = size;
@@ -138,14 +140,14 @@ void Storage::updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, d
 
 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;
@@ -162,23 +164,33 @@ 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)
+                             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);
 }