X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/67f36ac7e6410496964e1c3c5104af9920438131..902f44b9e3ebc4440e3dd623c2683a65cf418b75:/src/surf/ptask_L07.hpp diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp index a611d4771e..bdac3627a5 100644 --- a/src/surf/ptask_L07.hpp +++ b/src/surf/ptask_L07.hpp @@ -58,12 +58,10 @@ class NetworkL07Model : public NetworkModel { public: NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys); ~NetworkL07Model(); - 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; - Action *communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *dst, double size, double rate) override; - bool next_occuring_event_isIdempotent() override {return true;} + Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override; HostL07Model *hostModel_; }; @@ -84,15 +82,15 @@ protected: void onSpeedChange() override; }; -class LinkL07 : public Link { +class LinkL07 : public LinkImpl { public: - LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props, - double bandwidth, double latency, e_surf_link_sharing_policy_t policy); + LinkL07(NetworkL07Model* model, const char* name, double bandwidth, double latency, + e_surf_link_sharing_policy_t policy); ~LinkL07(){ }; bool isUsed() override; void apply_event(tmgr_trace_iterator_t event, double value) override; - void updateBandwidth(double value) override; - void updateLatency(double value) override; + void setBandwidth(double value) override; + void setLatency(double value) override; }; /********** @@ -111,7 +109,7 @@ public: int unref() override; - std::vector * netcardList_ = new std::vector(); + std::vector* hostList_ = new std::vector(); double *computationAmount_; double *communicationAmount_; double latency_;