X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/16bbb8a8212497d9c44c81333ed2c0e689e0c5af..c8d6bade6ee8fff928228bec67e9b2e86484793d:/src/surf/storage_interface.cpp

diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp
index 7cc21ff054..8fd56a833a 100644
--- a/src/surf/storage_interface.cpp
+++ b/src/surf/storage_interface.cpp
@@ -13,13 +13,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf,
 
 xbt_lib_t file_lib;
 xbt_lib_t storage_lib;
-int ROUTING_STORAGE_LEVEL;      //Routing for storagelevel
-int ROUTING_STORAGE_HOST_LEVEL;
-int SURF_STORAGE_LEVEL;
+int ROUTING_STORAGE_LEVEL = -1;      //Routing for storagelevel
+int ROUTING_STORAGE_HOST_LEVEL = -1;
+int SURF_STORAGE_LEVEL = -1;
 xbt_lib_t storage_type_lib;
-int ROUTING_STORAGE_TYPE_LEVEL; //Routing for storage_type level
-xbt_dynar_t mount_list = NULL;
-simgrid::surf::StorageModel *surf_storage_model = NULL;
+int ROUTING_STORAGE_TYPE_LEVEL = -1; //Routing for storage_type level
+simgrid::surf::StorageModel *surf_storage_model = nullptr;
 
 namespace simgrid {
 namespace surf {
@@ -28,10 +27,10 @@ namespace surf {
  * Callbacks *
  *************/
 
-simgrid::xbt::signal<void(simgrid::surf::Storage*)> storageCreatedCallbacks;
-simgrid::xbt::signal<void(simgrid::surf::Storage*)> storageDestructedCallbacks;
-simgrid::xbt::signal<void(simgrid::surf::Storage*, int, int)> storageStateChangedCallbacks; // signature: wasOn, isOn
-simgrid::xbt::signal<void(simgrid::surf::StorageAction*, e_surf_action_state_t, e_surf_action_state_t)> storageActionStateChangedCallbacks;
+simgrid::xbt::signal<void(Storage*)> storageCreatedCallbacks;
+simgrid::xbt::signal<void(Storage*)> storageDestructedCallbacks;
+simgrid::xbt::signal<void(Storage*, int, int)> storageStateChangedCallbacks; // signature: wasOn, isOn
+simgrid::xbt::signal<void(StorageAction*, Action::State, Action::State)> storageActionStateChangedCallbacks;
 
 /*********
  * Model *
@@ -40,14 +39,12 @@ simgrid::xbt::signal<void(simgrid::surf::StorageAction*, e_surf_action_state_t,
 StorageModel::StorageModel()
   : Model()
 {
-  p_storageList = NULL;
+  p_storageList = nullptr;
 }
 
 StorageModel::~StorageModel(){
-  lmm_system_free(p_maxminSystem);
-
-  surf_storage_model = NULL;
-
+  lmm_system_free(maxminSystem_);
+  surf_storage_model = nullptr;
   xbt_dynar_free(&p_storageList);
 }
 
@@ -63,7 +60,7 @@ Storage::Storage(Model *model, const char *name, xbt_dict_t 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(Action*),NULL))
+ , p_writeActions(xbt_dynar_new(sizeof(Action*),nullptr))
 {
   p_content = parseContent(content_name);
   turnOn();
@@ -78,7 +75,7 @@ Storage::Storage(Model *model, const char *name, xbt_dict_t 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(Action*),NULL))
+ , p_writeActions(xbt_dynar_new(sizeof(Action*),nullptr))
 {
   p_content = parseContent(content_name);
   p_attach = xbt_strdup(attach);
@@ -101,17 +98,14 @@ xbt_dict_t Storage::parseContent(const char *filename)
 {
   m_usedSize = 0;
   if ((!filename) || (strcmp(filename, "") == 0))
-    return NULL;
+    return nullptr;
 
   xbt_dict_t parse_content = xbt_dict_new_homogeneous(xbt_free_f);
-  FILE *file = NULL;
 
-  file = surf_fopen(filename, "r");
-  if (file == NULL)
-    xbt_die("Cannot open file '%s' (path=%s)", filename,
-            xbt_str_join(surf_path, ":"));
+  FILE *file =  surf_fopen(filename, "r");
+  xbt_assert(file, "Cannot open file '%s' (path=%s)", filename, xbt_str_join(surf_path, ":"));
 
-  char *line = NULL;
+  char *line = nullptr;
   size_t len = 0;
   ssize_t read;
   char path[1024];
@@ -119,14 +113,12 @@ xbt_dict_t Storage::parseContent(const char *filename)
 
   while ((read = xbt_getline(&line, &len, file)) != -1) {
     if (read){
-      if(sscanf(line,"%s %llu", path, &size) == 2) {
-        m_usedSize += size;
-        sg_size_t *psize = xbt_new(sg_size_t, 1);
-        *psize = size;
-        xbt_dict_set(parse_content,path,psize,NULL);
-      } else {
-        xbt_die("Be sure of passing a good format for content file.\n");
-      }
+      xbt_assert(sscanf(line,"%s %llu", path, &size) == 2, "Parse error in %s: %s",filename,line);
+
+      m_usedSize += size;
+      sg_size_t *psize = xbt_new(sg_size_t, 1);
+      *psize = size;
+      xbt_dict_set(parse_content,path,psize,nullptr);
     }
   }
   free(line);
@@ -140,7 +132,7 @@ bool Storage::isUsed()
   return false;
 }
 
-void Storage::updateState(tmgr_trace_iterator_t /*event_type*/, double /*value*/, double /*date*/)
+void Storage::apply_event(tmgr_trace_iterator_t /*event*/, double /*value*/)
 {
   THROW_UNIMPLEMENTED;
 }
@@ -162,13 +154,13 @@ 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 content_dict = xbt_dict_new_homogeneous(NULL);
-  xbt_dict_cursor_t cursor = NULL;
+  xbt_dict_t content_dict = xbt_dict_new_homogeneous(nullptr);
+  xbt_dict_cursor_t cursor = nullptr;
   char *file;
   sg_size_t *psize;
 
   xbt_dict_foreach(p_content, cursor, file, psize){
-    xbt_dict_set(content_dict,file,psize,NULL);
+    xbt_dict_set(content_dict,file,psize,nullptr);
   }
   return content_dict;
 }
@@ -191,19 +183,19 @@ sg_size_t Storage::getUsedSize(){
 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){
+, m_type(type), p_storage(storage), p_file(nullptr){
   progress = 0;
 };
 
 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){
+  , m_type(type), p_storage(storage), p_file(nullptr){
   progress = 0;
 }
 
-void StorageAction::setState(e_surf_action_state_t state){
-  e_surf_action_state_t old = getState();
+void StorageAction::setState(Action::State state){
+  Action::State old = getState();
   Action::setState(state);
   storageActionStateChangedCallbacks(this, old, state);
 }