X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/638b21d2071c77f39da2f322156f05f75bf91517..b51da37243dc16575499f4cb7729fe8bdd7fa514:/src/surf/network_cm02.hpp

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index e164901567..3819984e15 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -20,96 +20,70 @@
  ***********/
 
 namespace simgrid {
-namespace surf {
+  namespace surf {
 
-class XBT_PRIVATE NetworkCm02Model;
-class XBT_PRIVATE NetworkCm02Action;
-class XBT_PRIVATE NetworkSmpiModel;
+    class XBT_PRIVATE NetworkCm02Model;
+    class XBT_PRIVATE NetworkCm02Action;
+    class XBT_PRIVATE NetworkSmpiModel;
 
-}
+  }
 }
 
-/*********
- * Tools *
- *********/
-
-XBT_PRIVATE void net_define_callbacks(void);
-
 /*********
  * Model *
  *********/
 
 namespace simgrid {
-namespace surf {
-
-class NetworkCm02Model : public NetworkModel {
-private:
-  void initialize();
-public:
-  NetworkCm02Model(int /*i*/) : NetworkModel() {};
-  NetworkCm02Model();
-  ~NetworkCm02Model() { }
-  Link* createLink(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) override;
-  void addTraces();
-  void updateActionsStateLazy(double now, double delta);
-  void updateActionsStateFull(double now, double delta);
-  Action *communicate(RoutingEdge *src, RoutingEdge *dst,
-		                           double size, double rate);
-  bool shareResourcesIsIdempotent() {return true;}
-  virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
-  bool m_haveGap = false;
-};
-
-/************
- * Resource *
- ************/
-
-class NetworkCm02Link : public Link {
-public:
-  NetworkCm02Link(NetworkCm02Model *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);
-  void updateBandwidth(double value, double date=surf_get_clock());
-  void updateLatency(double value, double date=surf_get_clock());
-  virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
-
-
-};
-
-
-/**********
- * Action *
- **********/
-class NetworkCm02Action : public NetworkAction {
-  friend Action *NetworkCm02Model::communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate);
-  friend NetworkSmpiModel;
-
-public:
-  NetworkCm02Action(Model *model, double cost, bool failed)
-     : NetworkAction(model, cost, failed) {};
-  void updateRemainingLazy(double now);
-protected:
-  double m_senderGap;
-};
-
-}
+  namespace surf {
+
+    class NetworkCm02Model : public NetworkModel {
+    public:
+      NetworkCm02Model();
+      ~NetworkCm02Model();
+      Link* createLink(const char *name, double bandwidth,  double latency, e_surf_link_sharing_policy_t policy,
+          xbt_dict_t properties) override;
+      void updateActionsStateLazy(double now, double delta) override;
+      void updateActionsStateFull(double now, double delta) override;
+      Action *communicate(routing::NetCard *src, routing::NetCard *dst, double size, double rate) override;
+      bool next_occuring_event_isIdempotent() override;
+      virtual void gapAppend(double size, const Link* link, NetworkAction* action);
+    protected:
+      bool haveGap_ = false;
+    };
+
+    /************
+     * Resource *
+     ************/
+
+    class NetworkCm02Link : public Link {
+    public:
+      NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props,
+          double bandwidth, double latency, e_surf_link_sharing_policy_t policy,
+          lmm_system_t system);
+      ~NetworkCm02Link() override;
+      void apply_event(tmgr_trace_iterator_t event, double value) override;
+      void updateBandwidth(double value) override;
+      void updateLatency(double value) override;
+      virtual void gapAppend(double size, const Link* link, NetworkAction* action);
+    };
+
+
+    /**********
+     * Action *
+     **********/
+    class NetworkCm02Action : public NetworkAction {
+      friend Action *NetworkCm02Model::communicate(routing::NetCard *src, routing::NetCard *dst, double size, double rate);
+      friend NetworkSmpiModel;
+    public:
+      NetworkCm02Action(Model *model, double cost, bool failed)
+      : NetworkAction(model, cost, failed) {};
+      ~NetworkCm02Action() override;
+      void updateRemainingLazy(double now) override;
+    protected:
+      double senderGap_;
+    };
+
+  }
 }
 
 #endif /* SURF_NETWORK_CM02_HPP_ */