X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d06a3c5e9caef9c7da9cdeca1a864c5ca253158a..0ea1a3dca97a66f81466333806853c97af7eb398:/src/surf/network_ns3.hpp diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp index ae7f9bdd61..542558e4e7 100644 --- a/src/surf/network_ns3.hpp +++ b/src/surf/network_ns3.hpp @@ -19,10 +19,10 @@ public: ~NetworkNS3Model(); LinkImpl* createLink(const std::string& name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy) override; - Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override; - double nextOccuringEvent(double now) override; + kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override; + double next_occuring_event(double now) override; bool nextOccuringEventIsIdempotent() override { return false; } - void updateActionsState(double now, double delta) override; + void update_actions_state(double now, double delta) override; }; /************ @@ -45,13 +45,12 @@ public: **********/ class XBT_PRIVATE NetworkNS3Action : public NetworkAction { public: - NetworkNS3Action(Model* model, double cost, s4u::Host* src, s4u::Host* dst); + NetworkNS3Action(kernel::resource::Model* model, double cost, s4u::Host* src, s4u::Host* dst); - bool isSuspended() override; - int unref() override; void suspend() override; void resume() override; std::list links() override; + void update_remains_lazy(double now) override; // private: double lastSent_ = 0;