Rollback a little in programmatic description of disks

[simgrid.git] / src / surf / network_interface.hpp

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index 9cb6cc7621886d1c8642d3d61788bc8ad8f3c660..f092a1765137374b8dec67bb555e64831b96ddd3 100644 (file)
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-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. */
@@ -35,7 +35,7 @@ public:
   static config::Flag<double> cfg_tcp_gamma;
   static config::Flag<bool> cfg_crosstraffic;
 
-  explicit NetworkModel(Model::UpdateAlgo algo) : Model(algo) {}
+  using Model::Model;
   NetworkModel(const NetworkModel&) = delete;
   NetworkModel& operator=(const NetworkModel&) = delete;
   ~NetworkModel() override;
@@ -108,38 +108,38 @@ public:
  * @details A Link represents the link between two [hosts](@ref simgrid::surf::HostImpl)
  */
 class LinkImpl : public Resource, public xbt::PropertyHolder {
-  bool currently_destroying_ = false;
   s4u::Link piface_;
 
 protected:
   LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint);
   LinkImpl(const LinkImpl&) = delete;
   LinkImpl& operator=(const LinkImpl&) = delete;
-  ~LinkImpl() override;
+  ~LinkImpl() override                 = default; // Use destroy() instead of this destructor.
 
 public:
   void destroy(); // Must be called instead of the destructor
 
   /** @brief Public interface */
+  const s4u::Link* get_iface() const { return &piface_; }
   s4u::Link* get_iface() { return &piface_; }
 
   /** @brief Get the bandwidth in bytes per second of current Link */
-  virtual double get_bandwidth();
+  double get_bandwidth() const;
 
   /** @brief Update the bandwidth in bytes per second of current Link */
   virtual void set_bandwidth(double value) = 0;
 
   /** @brief Get the latency in seconds of current Link */
-  virtual double get_latency();
+  double get_latency() const;
 
   /** @brief Update the latency in seconds of current Link */
   virtual void set_latency(double value) = 0;
 
   /** @brief The sharing policy */
-  virtual s4u::Link::SharingPolicy get_sharing_policy();
+  virtual s4u::Link::SharingPolicy get_sharing_policy() const;
 
   /** @brief Check if the Link is used */
-  bool is_used() override;
+  bool is_used() const override;
 
   void turn_on() override;
   void turn_off() override;
@@ -196,8 +196,8 @@ public:
   void set_state(Action::State state) override;
   virtual std::list<LinkImpl*> get_links() const;
 
-  double latency_    = {};
-  double lat_current_ = {};
+  double latency_         = 0.; // Delay before the action starts
+  double lat_current_     = 0.; // Used to compute the communication RTT, and accordingly limit the communication rate
   double sharing_penalty_ = {};
   double rate_       = {};
   s4u::Host& get_src() const { return src_; }