X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8bc0555e5d58d2d32d82009d4bde24248093b06c..9bcd28fb0c558fbaa23ee46416f96baef5279045:/src/surf/network_cm02.hpp

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 8ffa8ef3b0..8cabad50ae 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2017. 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. */
@@ -8,55 +8,77 @@
 
 #include <xbt/base.h>
 
-#include "network_interface.hpp"
+#include "simgrid/kernel/resource/NetworkModelIntf.hpp"
+#include "src/kernel/resource/LinkImpl.hpp"
+#include "src/kernel/resource/StandardLinkImpl.hpp"
 #include "xbt/graph.h"
-
+#include "xbt/string.hpp"
 
 /***********
  * Classes *
  ***********/
 
 namespace simgrid {
-  namespace surf {
-
-    class XBT_PRIVATE NetworkCm02Model;
-    class XBT_PRIVATE NetworkCm02Action;
-    class XBT_PRIVATE NetworkSmpiModel;
+namespace kernel {
+namespace resource {
 
-  }
-}
+class XBT_PRIVATE NetworkCm02Model;
+class XBT_PRIVATE NetworkCm02Action;
+class XBT_PRIVATE NetworkSmpiModel;
 
 /*********
  * Model *
  *********/
 
-namespace simgrid {
-namespace surf {
-
 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<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<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<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<StandardLinkImpl*>& route,
+                              const std::unordered_set<kernel::routing::NetZoneImpl*>& netzones, double rate);
+  /** @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);
+
 public:
-  NetworkCm02Model();
-  explicit NetworkCm02Model(void (*solve_fun)(lmm_system_t self));
-  virtual ~NetworkCm02Model() = default;
-  LinkImpl* createLink(const char* name, double bandwidth, double latency,
-                       e_surf_link_sharing_policy_t policy) override;
-  void updateActionsStateLazy(double now, double delta) override;
-  void updateActionsStateFull(double now, double delta) override;
+  explicit NetworkCm02Model(const std::string& name);
+  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_;
 };
 
 /************
  * Resource *
  ************/
 
-class NetworkCm02Link : public LinkImpl {
+class NetworkCm02Link : public StandardLinkImpl {
 public:
-  NetworkCm02Link(NetworkCm02Model* model, const char* name, double bandwidth, double latency,
-                  e_surf_link_sharing_policy_t policy, lmm_system_t system);
-  virtual ~NetworkCm02Link() = default;
-  void apply_event(tmgr_trace_event_t event, double value) override;
-  void setBandwidth(double value) override;
-  void setLatency(double value) override;
+  NetworkCm02Link(const std::string& name, double bandwidth, lmm::System* system);
+  void apply_event(kernel::profile::Event* event, double value) override;
+  void set_bandwidth(double value) override;
+  void set_latency(double value) override;
 };
 
 /**********
@@ -64,14 +86,12 @@ public:
  **********/
 class NetworkCm02Action : public NetworkAction {
   friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate);
-  friend NetworkSmpiModel;
 
 public:
-  NetworkCm02Action(Model* model, double cost, bool failed) : NetworkAction(model, cost, failed){};
-  virtual ~NetworkCm02Action() = default;
-  void updateRemainingLazy(double now) override;
+  using NetworkAction::NetworkAction;
+  void update_remains_lazy(double now) override;
 };
-}
-}
-
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid
 #endif /* SURF_NETWORK_CM02_HPP_ */