X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c80eff88110151cbf0bf09fafeeab4b287e185ab..64916baf9d485ba6a2546bf79c948c591a233465:/src/surf/network_cm02.hpp

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index f1c6b68d4d..4020ec6e09 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -10,7 +10,6 @@
 #include <xbt/base.h>
 
 #include "network_interface.hpp"
-#include "xbt/fifo.h"
 #include "xbt/graph.h"
 
 
@@ -20,13 +19,13 @@
  ***********/
 
 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;
 
-}
+  }
 }
 
 /*********
@@ -34,64 +33,56 @@ class XBT_PRIVATE NetworkSmpiModel;
  *********/
 
 namespace simgrid {
-namespace surf {
-
-class NetworkCm02Model : public NetworkModel {
-public:
-  NetworkCm02Model();
-  ~NetworkCm02Model() { }
-  Link* createLink(const char *name,
-      double bw_initial, tmgr_trace_t bw_trace,
-      double lat_initial, tmgr_trace_t lat_trace,
-      tmgr_trace_t state_trace,
-      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(NetCard *src, NetCard *dst, double size, double rate) override;
-  bool next_occuring_event_isIdempotent() override {return true;}
-  virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
-protected:
-  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_trace_t state_trace,
-      double bw_peak, tmgr_trace_t bw_trace,
-      double lat_initial, tmgr_trace_t lat_trace,
-      e_surf_link_sharing_policy_t policy);
-
-  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(NetCard *src, NetCard *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();
+      explicit NetworkCm02Model(void (*solve_fun)(lmm_system_t self));
+      virtual ~NetworkCm02Model();
+      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);
+      ~NetworkCm02Link() override;
+      void apply_event(tmgr_trace_iterator_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) {};
+      ~NetworkCm02Action() override;
+      void updateRemainingLazy(double now) override;
+    protected:
+      double senderGap_;
+    };
+
+  }
 }
 
 #endif /* SURF_NETWORK_CM02_HPP_ */