Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / surf / network_cm02.hpp

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 7970a18..4020ec6 100644 (file)
--- 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"
 
 
@@ -38,15 +37,16 @@ namespace simgrid {
 
     class NetworkCm02Model : public NetworkModel {
     public:
-      explicit NetworkCm02Model();
+      NetworkCm02Model();
       explicit NetworkCm02Model(void (*solve_fun)(lmm_system_t self));
       virtual ~NetworkCm02Model();
-      Link* createLink(const char *name, double bandwidth,  double latency, e_surf_link_sharing_policy_t policy,
-          xbt_dict_t properties) override;
+      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(kernel::routing::NetCard *src, kernel::routing::NetCard *dst, double size, double rate) override;
-      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 haveGap_ = false;
     };
@@ -55,16 +55,15 @@ namespace simgrid {
      * Resource *
      ************/
 
-    class NetworkCm02Link : public Link {
+    class NetworkCm02Link : public LinkImpl {
     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(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);
     };
 
 
@@ -72,7 +71,7 @@ namespace simgrid {
      * Action *
      **********/
     class NetworkCm02Action : public NetworkAction {
-      friend Action *NetworkCm02Model::communicate(kernel::routing::NetCard *src, kernel::routing::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)