X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/237fd22b56db7d1c67360c37559ce3aab16a002d..3be0396ca83e510e42adc8e3eb12f4befb2f1fff:/src/surf/network_cm02.hpp

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index c962616e35..54c01364e9 100644
--- 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,20 +6,15 @@
 #ifndef SURF_NETWORK_CM02_HPP_
 #define SURF_NETWORK_CM02_HPP_
 
-#include <xbt/base.h>
-
-#include "network_interface.hpp"
-#include "simgrid/kernel/resource/NetworkModelIntf.hpp"
-#include "xbt/graph.h"
-#include "xbt/string.hpp"
+#include "src/kernel/resource/NetworkModel.hpp"
+#include "src/kernel/resource/StandardLinkImpl.hpp"
+#include "xbt/base.h"
 
 /***********
  * Classes *
  ***********/
 
-namespace simgrid {
-namespace kernel {
-namespace resource {
+namespace simgrid::kernel::resource {
 
 class XBT_PRIVATE NetworkCm02Model;
 class XBT_PRIVATE NetworkCm02Action;
@@ -32,47 +27,37 @@ class XBT_PRIVATE NetworkSmpiModel;
 class NetworkCm02Model : public NetworkModel {
   /** @brief Get route information (2-way) */
   bool comm_get_route_info(const s4u::Host* src, const s4u::Host* dst, /* OUT */ double& latency,
-                           std::vector<LinkImpl*>& route, std::vector<LinkImpl*>& back_route,
+                           std::vector<StandardLinkImpl*>& route, std::vector<StandardLinkImpl*>& back_route,
                            std::unordered_set<kernel::routing::NetZoneImpl*>& netzones) const;
   /** @brief Create network action for this communication */
   NetworkCm02Action* comm_action_create(s4u::Host* src, s4u::Host* dst, double size,
-                                        const std::vector<LinkImpl*>& route, bool failed);
+                                        const std::vector<StandardLinkImpl*>& route, bool failed);
   /** @brief Expand link contraint considering this new communication action */
   void comm_action_expand_constraints(const s4u::Host* src, const s4u::Host* dst, const NetworkCm02Action* action,
-                                      const std::vector<LinkImpl*>& route,
-                                      const std::vector<LinkImpl*>& back_route) const;
+                                      const std::vector<StandardLinkImpl*>& route,
+                                      const std::vector<StandardLinkImpl*>& back_route) const;
   /** @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<LinkImpl*>& route,
-                              const std::unordered_set<kernel::routing::NetZoneImpl*>& netzones, double rate);
+                              const std::vector<StandardLinkImpl*>& route,
+                              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<LinkImpl*>& route,
-                                const std::vector<LinkImpl*>& back_route);
+  void comm_action_set_variable(NetworkCm02Action* action, const std::vector<StandardLinkImpl*>& route,
+                                const std::vector<StandardLinkImpl*>& back_route, bool streamed);
 
 public:
   explicit NetworkCm02Model(const std::string& name);
-  LinkImpl* create_link(const std::string& name, const std::vector<double>& bandwidths) final;
-  LinkImpl* create_wifi_link(const std::string& name, const std::vector<double>& bandwidths) 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;
   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;
 };
 
 /************
  * Resource *
  ************/
 
-class NetworkCm02Link : public LinkImpl {
+class NetworkCm02Link : public StandardLinkImpl {
 public:
   NetworkCm02Link(const std::string& name, double bandwidth, lmm::System* system);
   void apply_event(kernel::profile::Event* event, double value) override;
@@ -84,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_ */