X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d5b29830df70e823202e384a7655e4371193ecd7..67bdf5427542ebb33da6978c6ae422a763ea0ab3:/src/surf/network_cm02.hpp diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp index a04f21518f..7fd4187441 100644 --- a/src/surf/network_cm02.hpp +++ b/src/surf/network_cm02.hpp @@ -38,15 +38,11 @@ public: NetworkCm02Model(); explicit NetworkCm02Model(void (*solve_fun)(lmm_system_t self)); virtual ~NetworkCm02Model() = default; - LinkImpl* createLink(const char* name, double bandwidth, double latency, + LinkImpl* createLink(const std::string& 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; }; /************ @@ -55,13 +51,12 @@ protected: class NetworkCm02Link : public LinkImpl { public: - NetworkCm02Link(NetworkCm02Model* model, const char* name, double bandwidth, double latency, + NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy, lmm_system_t system); virtual ~NetworkCm02Link() = default; void apply_event(tmgr_trace_event_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); }; /********** @@ -75,9 +70,6 @@ public: NetworkCm02Action(Model* model, double cost, bool failed) : NetworkAction(model, cost, failed){}; virtual ~NetworkCm02Action() = default; void updateRemainingLazy(double now) override; - -protected: - double senderGap_; }; } }