X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/957da2691fc483ae05228fc6ef815af5944452af..c86fbd9ddd59c63d254ddc5f9f661889419df5f9:/src/surf/network_ns3.hpp diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp index b565c976a6..abd978b2f9 100644 --- a/src/surf/network_ns3.hpp +++ b/src/surf/network_ns3.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -17,12 +17,12 @@ namespace resource { class NetworkNS3Model : public NetworkModel { public: NetworkNS3Model(); - ~NetworkNS3Model(); + ~NetworkNS3Model() = default; LinkImpl* create_link(const std::string& name, const std::vector& bandwidth, double latency, s4u::Link::SharingPolicy policy) override; Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override; - double next_occuring_event(double now) override; - bool next_occuring_event_is_idempotent() override { return false; } + double next_occurring_event(double now) override; + bool next_occurring_event_is_idempotent() override { return false; } void update_actions_state(double now, double delta) override; }; @@ -31,14 +31,17 @@ public: ************/ class LinkNS3 : public LinkImpl { public: - explicit LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwidth, double latency); + explicit LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwidth, double latency, + s4u::Link::SharingPolicy policy); ~LinkNS3(); + s4u::Link::SharingPolicy sharing_policy_; void apply_event(profile::Event* event, double value) override; void set_bandwidth(double value) override { THROW_UNIMPLEMENTED; } void set_latency(double value) override { THROW_UNIMPLEMENTED; } void set_bandwidth_profile(profile::Profile* profile) override; void set_latency_profile(profile::Profile* profile) override; + s4u::Link::SharingPolicy get_sharing_policy() override {return sharing_policy_;} }; /********** @@ -50,13 +53,11 @@ public: void suspend() override; void resume() override; - std::list links() const override; + std::list get_links() const override; void update_remains_lazy(double now) override; // private: double last_sent_ = 0; - s4u::Host* src_; - s4u::Host* dst_; }; } // namespace resource