Completely revise the way to deal with Streamed I/Os

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

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index c6b709f..54c0136 100644 (file)
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2022. 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. */
@@ -6,21 +6,15 @@
 #ifndef SURF_NETWORK_CM02_HPP_
 #define SURF_NETWORK_CM02_HPP_
 
-#include <xbt/base.h>
-
-#include "simgrid/kernel/resource/NetworkModelIntf.hpp"
-#include "src/kernel/resource/LinkImpl.hpp"
+#include "src/kernel/resource/NetworkModel.hpp"
 #include "src/kernel/resource/StandardLinkImpl.hpp"
-#include "xbt/graph.h"
-#include "xbt/string.hpp"
+#include "xbt/base.h"
 
 /***********
  * Classes *
  ***********/
 
-namespace simgrid {
-namespace kernel {
-namespace resource {
+namespace simgrid::kernel::resource {
 
 class XBT_PRIVATE NetworkCm02Model;
 class XBT_PRIVATE NetworkCm02Action;
@@ -45,10 +39,10 @@ class NetworkCm02Model : public NetworkModel {
   /** @brief Set communication bounds for latency and bandwidth */
   void comm_action_set_bounds(const s4u::Host* src, const s4u::Host* dst, double size, NetworkCm02Action* action,
                               const std::vector<StandardLinkImpl*>& route,
-                              const std::unordered_set<kernel::routing::NetZoneImpl*>& netzones, double rate);
+                              const std::unordered_set<kernel::routing::NetZoneImpl*>& netzones, double rate) const;
   /** @brief Create maxmin variable in communication action */
   void comm_action_set_variable(NetworkCm02Action* action, const std::vector<StandardLinkImpl*>& route,
-                                const std::vector<StandardLinkImpl*>& back_route);
+                                const std::vector<StandardLinkImpl*>& back_route, bool streamed);
 
 public:
   explicit NetworkCm02Model(const std::string& name);
@@ -56,17 +50,7 @@ public:
   StandardLinkImpl* create_wifi_link(const std::string& name, const std::vector<double>& bandwidths) override;
   void update_actions_state_lazy(double now, double delta) override;
   void update_actions_state_full(double now, double delta) override;
-  Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
-  void set_lat_factor_cb(const std::function<NetworkFactorCb>& cb) override;
-  void set_bw_factor_cb(const std::function<NetworkFactorCb>& cb) override;
-
-protected:
-  virtual void check_lat_factor_cb();
-  virtual void check_bw_factor_cb();
-
-private:
-  std::function<NetworkFactorCb> lat_factor_cb_;
-  std::function<NetworkFactorCb> bw_factor_cb_;
+  Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate, bool streamed) override;
 };
 
 /************
@@ -85,13 +69,12 @@ public:
  * Action *
  **********/
 class NetworkCm02Action : public NetworkAction {
-  friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate);
+  friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate,
+                                               bool streamed);
 
 public:
   using NetworkAction::NetworkAction;
   void update_remains_lazy(double now) override;
 };
-} // namespace resource
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::resource
 #endif /* SURF_NETWORK_CM02_HPP_ */