X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8b52a012857a15e9403981d7993a00e7af635d94..fec5fff327fcad427d0a399ebc3dbbb35de2852e:/src/surf/storage_n11.cpp

diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp
index d0bc4080f0..04493201dd 100644
--- a/src/surf/storage_n11.cpp
+++ b/src/surf/storage_n11.cpp
@@ -68,7 +68,7 @@ static void parse_storage_init(sg_platf_storage_cbarg_t storage)
       storage->content_type,
       storage->properties);
 
-  surf_storage_model->createResource(storage->id,
+  surf_storage_model->createStorage(storage->id,
                                      ((storage_type_t) stype)->type_id,
                                      storage->content,
                                      storage->content_type,
@@ -195,7 +195,7 @@ static void storage_define_callbacks()
 
 void storage_register_callbacks() {
 
-  ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,xbt_free);
+  ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, xbt_free_f);
   ROUTING_STORAGE_HOST_LEVEL = xbt_lib_add_level(storage_lib, routing_storage_host_free);
   ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib, routing_storage_type_free);
   SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, surf_storage_resource_free);
@@ -234,8 +234,9 @@ StorageN11Model::~StorageN11Model(){
   storage_running_action_set_that_does_not_need_being_checked = NULL;
 }
 
-StoragePtr StorageN11Model::createResource(const char* id, const char* type_id,
-		const char* content_name, const char* content_type, xbt_dict_t properties, const char* attach)
+StoragePtr StorageN11Model::createStorage(const char* id, const char* type_id,
+    const char* content_name, const char* content_type, xbt_dict_t properties,
+    const char* attach)
 {
 
   xbt_assert(!surf_storage_resource_priv(surf_storage_resource_by_name(id)),
@@ -249,10 +250,10 @@ StoragePtr StorageN11Model::createResource(const char* id, const char* type_id,
   double Bconnection   = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bconnection"));
 
   StoragePtr storage = new StorageN11(this, id, properties, p_maxminSystem,
-		  Bread, Bwrite, Bconnection,
-		  type_id, (char *)content_name, xbt_strdup(content_type), storage_type->size, (char *) attach);
+      Bread, Bwrite, Bconnection, type_id, (char *)content_name,
+      xbt_strdup(content_type), storage_type->size, (char *) attach);
 
-  xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, static_cast<ResourcePtr>(storage));
+  xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, storage);
 
   XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tproperties '%p'\n\t\tBread '%f'\n",
       id,
@@ -261,7 +262,7 @@ StoragePtr StorageN11Model::createResource(const char* id, const char* type_id,
       Bread);
 
   if(!p_storageList)
-	p_storageList = xbt_dynar_new(sizeof(char *),NULL);
+    p_storageList = xbt_dynar_new(sizeof(char *),NULL);
   xbt_dynar_push(p_storageList, &storage);
 
   return storage;
@@ -311,7 +312,7 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta)
       // Update the disk usage
       // Update the file size
       // For each action of type write
-      double current_progress =
+      volatile double current_progress =
           delta * lmm_variable_getvalue(action->getVariable());
       long int incr = current_progress;
 
@@ -322,7 +323,7 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta)
                 lrint(action->progress + current_progress),
                 lrint(action->progress)+ incr);
 
-      /* Take care of rounding error accumulation */
+      /* take care of rounding error accumulation */
       if (lrint(action->progress + current_progress) >
           lrint(action->progress)+ incr)
         incr++;
@@ -370,9 +371,10 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta)
  * Resource *
  ************/
 
-StorageN11::StorageN11(StorageModelPtr model, const char* name, xbt_dict_t properties,
-	     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)
+StorageN11::StorageN11(StorageModelPtr model, const char* name,
+    xbt_dict_t properties, 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)
  : Storage(model, name, properties,
     	   maxminSystem, bread, bwrite, bconnection, type_id, content_name, content_type, size, attach) {
   XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size);
@@ -415,7 +417,7 @@ StorageActionPtr StorageN11::close(surf_file_t fd)
   StorageActionPtr write_action;
   unsigned int i;
   xbt_dynar_foreach(p_writeActions, i, _write_action) {
-	write_action = static_cast<StorageActionPtr>(static_cast<ActionPtr>(_write_action));
+	write_action = static_cast<StorageActionPtr>(_write_action);
     if ((write_action->p_file) == fd) {
       xbt_dynar_cursor_rm(p_writeActions, &i);
       write_action->unref();
@@ -482,9 +484,11 @@ StorageN11Action::StorageN11Action(ModelPtr model, double cost, bool failed, Sto
   case WRITE:
     lmm_expand(model->getMaxminSystem(), storage->p_constraintWrite,
                getVariable(), 1.0);
-    ActionPtr action = this;
-    xbt_dynar_push(storage->p_writeActions, &action);
-    ref();
+
+//TODO there is something annoying with what's below. Have to sort it out...
+//    ActionPtr action = this;
+//    xbt_dynar_push(storage->p_writeActions, &action);
+//    ref();
     break;
   }
   XBT_OUT();