X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a8b29f2bc452ad2be0c7285e98f3bf7026d0ce6d..6a5dd57f29dc1312869e80dfd4869c47d0b9e2eb:/src/surf/network_cm02.hpp diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp index e231d3a497..9f160e4722 100644 --- a/src/surf/network_cm02.hpp +++ b/src/surf/network_cm02.hpp @@ -10,7 +10,6 @@ #include #include "network_interface.hpp" -#include "xbt/fifo.h" #include "xbt/graph.h" @@ -40,13 +39,14 @@ namespace simgrid { public: 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) override; + virtual ~NetworkCm02Model() = default; + 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 Link* link, NetworkAction* action); + virtual void gapAppend(double size, const LinkImpl* link, NetworkAction* action); + protected: bool haveGap_ = false; }; @@ -55,7 +55,7 @@ namespace simgrid { * Resource * ************/ - class NetworkCm02Link : public Link { + 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); @@ -63,7 +63,7 @@ namespace simgrid { 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 Link* link, NetworkAction* action); + virtual void gapAppend(double size, const LinkImpl* link, NetworkAction* action); };