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

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index d28defd275..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"
 
 
@@ -39,38 +38,32 @@ namespace simgrid {
     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,
-          e_surf_link_sharing_policy_t policy,
-          xbt_dict_t properties) override;
+      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(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*/) {};
+      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 m_haveGap = false;
+      bool haveGap_ = false;
     };
 
     /************
      * Resource *
      ************/
 
-    class NetworkCm02Link : public Link {
+    class NetworkCm02Link : public LinkImpl {
     public:
-      NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props,
-          lmm_system_t system,
-          double constraint_value,
-          double bw_peak, tmgr_trace_t bw_trace,
-          double lat_initial, tmgr_trace_t lat_trace,
-          e_surf_link_sharing_policy_t policy);
-
+      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 updateBandwidth(double value) override;
-      void updateLatency(double value) override;
-      virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
+      void setBandwidth(double value) override;
+      void setLatency(double value) override;
+      virtual void gapAppend(double size, const LinkImpl* link, NetworkAction* action);
     };
 
 
@@ -78,15 +71,15 @@ namespace simgrid {
      * Action *
      **********/
     class NetworkCm02Action : public NetworkAction {
-      friend Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, double rate);
+      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) {};
-      void updateRemainingLazy(double now);
+      : NetworkAction(model, cost, failed) {};
+      ~NetworkCm02Action() override;
+      void updateRemainingLazy(double now) override;
     protected:
-      double m_senderGap;
+      double senderGap_;
     };
 
   }