X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e2c8aeab0ec45fb9945018b9de3cab5c1019875..69aaa26fa5228c31e55086fa166479732a9cd1b7:/src/surf/network_cm02.hpp

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index bd8821aca5..172a267046 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -1,93 +1,96 @@
-#include "network_interface.hpp"
-#include "xbt/fifo.h"
-#include "xbt/graph.h"
+/* Copyright (c) 2013-2021. 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. */
 
 #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"
+
 /***********
  * Classes *
  ***********/
-class NetworkCm02Model;
-typedef NetworkCm02Model *NetworkCm02ModelPtr;
 
-class NetworkCm02LinkLmm;
-typedef NetworkCm02LinkLmm *NetworkCm02LinkLmmPtr;
+namespace simgrid {
+namespace kernel {
+namespace resource {
 
-class NetworkCm02ActionLmm;
-typedef NetworkCm02ActionLmm *NetworkCm02ActionLmmPtr;
-
-/*********
- * Tools *
- *********/
-
-void net_define_callbacks(void);
+class XBT_PRIVATE NetworkCm02Model;
+class XBT_PRIVATE NetworkCm02Action;
+class XBT_PRIVATE NetworkSmpiModel;
 
 /*********
  * Model *
  *********/
+
 class NetworkCm02Model : public NetworkModel {
-private:
-  void initialize();
+  /** @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::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);
+  /** @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;
+  /** @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);
+  /** @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);
+
 public:
-  NetworkCm02Model(int /*i*/) : NetworkModel("network") {
-	f_networkSolve = lmm_solve;
-	m_haveGap = false;
-  };//FIXME: add network clean interface
-  NetworkCm02Model(string name) : NetworkModel(name) {
-    this->initialize();
-  }
-  NetworkCm02Model() : NetworkModel("network") {
-    this->initialize();
-  }
-  ~NetworkCm02Model() {
-  }
-  NetworkLinkPtr createResource(const char *name,
-                                   double bw_initial,
-                                   tmgr_trace_t bw_trace,
-                                   double lat_initial,
-                                   tmgr_trace_t lat_trace,
-                                   e_surf_resource_state_t state_initial,
-                                   tmgr_trace_t state_trace,
-                                   e_surf_link_sharing_policy_t policy,
-                                   xbt_dict_t properties);
-  void updateActionsStateLazy(double now, double delta);
-  void gapAppend(double /*size*/, const NetworkCm02LinkLmmPtr /*link*/, NetworkCm02ActionLmmPtr /*action*/) {};
-  ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
-		                           double size, double rate);
+  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;
+  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 NetworkCm02LinkLmm : public NetworkLinkLmm {
+class NetworkCm02Link : public LinkImpl {
 public:
-  NetworkCm02LinkLmm(NetworkCm02ModelPtr model, const char *name, xbt_dict_t props,
-	                           lmm_system_t system,
-	                           double constraint_value,
-	                           tmgr_history_t history,
-	                           e_surf_resource_state_t state_init,
-	                           tmgr_trace_t state_trace,
-	                           double metric_peak,
-	                           tmgr_trace_t metric_trace,
-	                           double lat_initial,
-	                           tmgr_trace_t lat_trace,
-                               e_surf_link_sharing_policy_t policy);
-  void updateState(tmgr_trace_event_t event_type, double value, double date);
+  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;
+  LinkImpl* set_latency(double value) override;
 };
 
-
 /**********
  * Action *
  **********/
+class NetworkCm02Action : public NetworkAction {
+  friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate);
 
-class NetworkCm02ActionLmm : public NetworkActionLmm {
 public:
-  NetworkCm02ActionLmm(ModelPtr model, double cost, bool failed)
- : Action(model, cost, failed) {};
-  void updateRemainingLazy(double now);
-  void recycle();
+  using NetworkAction::NetworkAction;
+  void update_remains_lazy(double now) override;
 };
-
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid
 #endif /* SURF_NETWORK_CM02_HPP_ */