X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d1428a44b2e13f8c22afcb04c3315b6adbe6be85..08e94eb0482589e4b287cbea301b84daf52635bd:/src/surf/storage_n11.cpp

diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp
index 78ac82e2d3..c91b47ba9e 100644
--- a/src/surf/storage_n11.cpp
+++ b/src/surf/storage_n11.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -36,12 +36,16 @@ void check_disk_attachment()
 void surf_storage_model_init_default()
 {
   surf_storage_model = new simgrid::surf::StorageN11Model();
-  all_existing_models->push_back(surf_storage_model);
 }
 
 namespace simgrid {
 namespace surf {
 
+StorageN11Model::StorageN11Model()
+{
+  all_existing_models.push_back(this);
+}
+
 StorageImpl* StorageN11Model::createStorage(std::string id, std::string type_id, std::string content_name,
                                             std::string attach)
 {
@@ -52,13 +56,11 @@ StorageImpl* StorageN11Model::createStorage(std::string id, std::string type_id,
   double Bwrite = surf_parse_get_bandwidth(storage_type->model_properties->at("Bwrite").c_str(),
                                            "property Bwrite, storage", type_id.c_str());
 
-  StorageImpl* storage =
-      new StorageN11(this, id, get_maxmin_system(), Bread, Bwrite, type_id, content_name, storage_type->size, attach);
-
   XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tBread '%f'\n", id.c_str(), type_id.c_str(),
             Bread);
 
-  return storage;
+  return new StorageN11(this, std::move(id), get_maxmin_system(), Bread, Bwrite, std::move(type_id),
+                        std::move(content_name), storage_type->size, std::move(attach));
 }
 
 double StorageN11Model::next_occuring_event(double now)
@@ -72,12 +74,10 @@ void StorageN11Model::update_actions_state(double /*now*/, double delta)
     StorageAction& action = static_cast<StorageAction&>(*it);
     ++it; // increment iterator here since the following calls to action.finish() may invalidate it
     action.update_remains(lrint(action.get_variable()->get_value() * delta));
-
-    if (action.get_max_duration() > NO_MAX_DURATION)
-      action.update_max_duration(delta);
+    action.update_max_duration(delta);
 
     if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_weight() > 0)) ||
-        ((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
+        ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
       action.finish(kernel::resource::Action::State::FINISHED);
     }
   }
@@ -95,14 +95,19 @@ StorageN11::StorageN11(StorageModel* model, std::string name, kernel::lmm::Syste
   simgrid::s4u::Storage::on_creation(this->piface_);
 }
 
+StorageAction* StorageN11::io_start(sg_size_t size, s4u::Io::OpType type)
+{
+  return new StorageN11Action(get_model(), size, not is_on(), this, type);
+}
+
 StorageAction* StorageN11::read(sg_size_t size)
 {
-  return new StorageN11Action(get_model(), size, is_off(), this, READ);
+  return new StorageN11Action(get_model(), size, not is_on(), this, s4u::Io::OpType::READ);
 }
 
 StorageAction* StorageN11::write(sg_size_t size)
 {
-  return new StorageN11Action(get_model(), size, is_off(), this, WRITE);
+  return new StorageN11Action(get_model(), size, not is_on(), this, s4u::Io::OpType::WRITE);
 }
 
 /**********
@@ -110,7 +115,7 @@ StorageAction* StorageN11::write(sg_size_t size)
  **********/
 
 StorageN11Action::StorageN11Action(kernel::resource::Model* model, double cost, bool failed, StorageImpl* storage,
-                                   e_surf_action_storage_type_t type)
+                                   s4u::Io::OpType type)
     : StorageAction(model, cost, failed, model->get_maxmin_system()->variable_new(this, 1.0, -1.0, 3), storage, type)
 {
   XBT_IN("(%s,%g", storage->get_cname(), cost);
@@ -118,14 +123,14 @@ StorageN11Action::StorageN11Action(kernel::resource::Model* model, double cost,
   // Must be less than the max bandwidth for all actions
   model->get_maxmin_system()->expand(storage->get_constraint(), get_variable(), 1.0);
   switch(type) {
-  case READ:
-    model->get_maxmin_system()->expand(storage->constraintRead_, get_variable(), 1.0);
-    break;
-  case WRITE:
-    model->get_maxmin_system()->expand(storage->constraintWrite_, get_variable(), 1.0);
-    break;
-  default:
-    THROW_UNIMPLEMENTED;
+    case s4u::Io::OpType::READ:
+      model->get_maxmin_system()->expand(storage->constraintRead_, get_variable(), 1.0);
+      break;
+    case s4u::Io::OpType::WRITE:
+      model->get_maxmin_system()->expand(storage->constraintWrite_, get_variable(), 1.0);
+      break;
+    default:
+      THROW_UNIMPLEMENTED;
   }
   XBT_OUT();
 }