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

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 08702719bb..54c01364e9 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2013-2015. 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. */
@@ -7,82 +6,75 @@
 #ifndef SURF_NETWORK_CM02_HPP_
 #define SURF_NETWORK_CM02_HPP_
 
-#include <xbt/base.h>
-
-#include "network_interface.hpp"
-#include "xbt/graph.h"
-
-
+#include "src/kernel/resource/NetworkModel.hpp"
+#include "src/kernel/resource/StandardLinkImpl.hpp"
+#include "xbt/base.h"
 
 /***********
  * Classes *
  ***********/
 
-namespace simgrid {
-  namespace surf {
+namespace simgrid::kernel::resource {
 
-    class XBT_PRIVATE NetworkCm02Model;
-    class XBT_PRIVATE NetworkCm02Action;
-    class XBT_PRIVATE NetworkSmpiModel;
-
-  }
-}
+class XBT_PRIVATE NetworkCm02Model;
+class XBT_PRIVATE NetworkCm02Action;
+class XBT_PRIVATE NetworkSmpiModel;
 
 /*********
  * Model *
  *********/
 
-namespace simgrid {
-  namespace surf {
-
-    class NetworkCm02Model : public NetworkModel {
-    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;
-      Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
-      virtual void gapAppend(double size, const LinkImpl* link, NetworkAction* action);
-
-    protected:
-      bool haveGap_ = false;
-    };
-
-    /************
-     * Resource *
-     ************/
-
-    class NetworkCm02Link : public LinkImpl {
-    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;
-      virtual void gapAppend(double size, const LinkImpl* link, NetworkAction* action);
-    };
-
-
-    /**********
-     * Action *
-     **********/
-    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;
-    protected:
-      double senderGap_;
-    };
-
-  }
-}
-
+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) 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, bool streamed);
+
+public:
+  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, bool streamed) override;
+};
+
+/************
+ * Resource *
+ ************/
+
+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;
+  void set_bandwidth(double value) override;
+  void set_latency(double value) override;
+};
+
+/**********
+ * Action *
+ **********/
+class NetworkCm02Action : public NetworkAction {
+  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 simgrid::kernel::resource
 #endif /* SURF_NETWORK_CM02_HPP_ */