Drop simgrid::xbt::demangle and use boost::core::demangle instead.

[simgrid.git] / src / kernel / resource / DiskImpl.hpp

diff --git a/src/kernel/resource/DiskImpl.hpp b/src/kernel/resource/DiskImpl.hpp
index 29841c2..146fb31 100644 (file)
--- a/src/kernel/resource/DiskImpl.hpp
+++ b/src/kernel/resource/DiskImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2019-2021. 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. */
@@ -54,7 +54,7 @@ class DiskImpl : public Resource, public xbt::PropertyHolder {
   double read_bw_;
   double write_bw_;
   lmm::Constraint* constraint_write_; /* Constraint for maximum write bandwidth*/
-  lmm::Constraint* constraint_read_;  /* Constraint for maximum write bandwidth*/
+  lmm::Constraint* constraint_read_;  /* Constraint for maximum read bandwidth*/
 
 public:
   DiskImpl(Model* model, const std::string& name, kernel::lmm::System* maxmin_system, double read_bw, double bwrite_bw);
@@ -64,6 +64,7 @@ public:
   ~DiskImpl() override;
 
   /** @brief Public interface */
+  const s4u::Disk* get_iface() const { return &piface_; }
   s4u::Disk* get_iface() { return &piface_; }
   s4u::Host* get_host() const { return host_; }
   void set_host(s4u::Host* host) { host_ = host; }
@@ -73,8 +74,8 @@ public:
   lmm::Constraint* get_read_constraint() const { return constraint_read_; }
   lmm::Constraint* get_write_constraint() const { return constraint_write_; }
 
-  /** @brief Check if the Storage is used (if an action currently uses its resources) */
-  bool is_used() override;
+  /** @brief Check if the Disk is used (if an action currently uses its resources) */
+  bool is_used() const override;
   void apply_event(profile::Event* event, double value) override;
   void turn_on() override;
   void turn_off() override;
@@ -99,11 +100,11 @@ public:
   /**
    * @brief diskAction constructor
    *
-   * @param model The StorageModel associated to this DiskAction
+   * @param model The DiskModel associated to this DiskAction
    * @param cost The cost of this DiskAction in bytes
    * @param failed [description]
    * @param var The lmm variable associated to this DiskAction if it is part of a LMM component
-   * @param storage The Storage associated to this DiskAction
+   * @param disk The Disk associated to this DiskAction
    * @param type [description]
    */
   DiskAction(kernel::resource::Model* model, double cost, bool failed, kernel::lmm::Variable* var, DiskImpl* disk,