simplify the I/O stream thing A LOT. Might be plunged in CLM03 afterall

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

diff --git a/src/surf/sio_S22.hpp b/src/surf/sio_S22.hpp
index a8d7cb7..ef89c17 100644 (file)
--- a/src/surf/sio_S22.hpp
+++ b/src/surf/sio_S22.hpp
@@ -18,8 +18,6 @@ namespace simgrid::kernel::resource {
  ***********/
 
 class XBT_PRIVATE HostS22Model;
-class XBT_PRIVATE DiskS22Model;
-class XBT_PRIVATE NetworkS22Model;
 
 class XBT_PRIVATE DiskS22;
 class XBT_PRIVATE LinkS22;
@@ -37,74 +35,13 @@ public:
 
   double next_occurring_event(double now) override;
   void update_actions_state(double now, double delta) override;
-  Action* execute_thread(const s4u::Host* host, double flops_amount, int thread_count) override { return nullptr; }
+  Action* execute_thread(const s4u::Host* host, double flops_amount, int thread_count) override;
   CpuAction* execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
                               const double* bytes_amount, double rate) override { return nullptr; }
   DiskAction* io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk,
                         double size) override;
 };
 
-class DiskS22Model : public DiskModel {
-public:
-  DiskS22Model(const std::string& name, HostS22Model* hmodel, lmm::System* sys);
-  DiskS22Model(const DiskS22Model&) = delete;
-  DiskS22Model& operator=(const DiskS22Model&) = delete;
-  ~DiskS22Model() override;
-  void update_actions_state(double /*now*/, double /*delta*/) override{
-      /* this action is done by HostS22Model which shares the LMM system with the Disk model
-       * Overriding to an empty function here allows us to handle the DiskS22Model as a regular
-       * method in EngineImpl::presolve */
-  };
-
-  DiskImpl* create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) override;
-  HostS22Model* hostModel_;
-};
-
-class NetworkS22Model : public NetworkModel {
-public:
-  NetworkS22Model(const std::string& name, HostS22Model* hmodel, lmm::System* sys);
-  NetworkS22Model(const NetworkS22Model&) = delete;
-  NetworkS22Model& operator=(const NetworkS22Model&) = delete;
-  ~NetworkS22Model() override;
-  StandardLinkImpl* create_link(const std::string& name, const std::vector<double>& bandwidths) final;
-  StandardLinkImpl* create_wifi_link(const std::string& name, const std::vector<double>& bandwidths) override;
-
-  Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
-  void update_actions_state(double /*now*/, double /*delta*/) override{
-      /* this action is done by HostS22Model which shares the LMM system with the Network model
-       * Overriding to an empty function here allows us to handle the NetworkS22Model as a regular
-       * method in EngineImpl::presolve */
-  };
-
-  HostS22Model* hostModel_;
-};
-
-/************
- * Resource *
- ************/
-
-class DiskS22 : public DiskImpl {
-public:
-  using DiskImpl::DiskImpl;
-  DiskS22(const DiskS22&) = delete;
-  DiskS22& operator=(const DiskS22&) = delete;
-
-  void apply_event(profile::Event* event, double value) override;
-  DiskAction* io_start(sg_size_t size, s4u::Io::OpType type) override;
-};
-
-class LinkS22 : public StandardLinkImpl {
-public:
-  LinkS22(const std::string& name, double bandwidth, lmm::System* system);
-  LinkS22(const LinkS22&) = delete;
-  LinkS22& operator=(const LinkS22&) = delete;
-  ~LinkS22() = default;
-
-  void apply_event(profile::Event* event, double value) override;
-  void set_bandwidth(double value) override;
-  void set_latency(double value) override;
-};
-
 /**********
  * Action *
  **********/
@@ -117,13 +54,7 @@ class S22Action : public DiskAction {
 
   const double size_;
 
-  double latency_;
-
-  friend DiskAction* DiskS22::io_start(sg_size_t size, s4u::Io::OpType type);
-  friend Action* NetworkS22Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate);
-
-  double calculate_io_read_bound() const;
-  double calculate_io_write_bound() const;
+  double latency_ = 0;
 
   /**
    * @brief Calculate the network bound for the parallel task