Deprecate the is_off() methods.

[simgrid.git] / src / surf / storage_n11.cpp

diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp
index 74ff08a..2b12036 100644 (file)
--- 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. */
@@ -99,19 +99,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, e_surf_action_storage_type_t type)
+StorageAction* StorageN11::io_start(sg_size_t size, s4u::Io::OpType type)
 {
-  return new StorageN11Action(get_model(), size, is_off(), this, 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);
 }
 
 /**********
@@ -119,7 +119,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);
@@ -127,14 +127,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();
 }