X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6fb292d7e99020dc305b845e0a2284a9d811a4b2..13a2073e56f059a44fc91c128ca16aa0cf48e6b2:/src/surf/network_ns3.hpp diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp index 6e6359573f..7db4a38bc0 100644 --- a/src/surf/network_ns3.hpp +++ b/src/surf/network_ns3.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2021. 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. */ @@ -16,10 +16,9 @@ namespace resource { class NetworkNS3Model : public NetworkModel { public: - NetworkNS3Model(); - ~NetworkNS3Model() override = default; - LinkImpl* create_link(const std::string& name, const std::vector& bandwidth, double latency, - s4u::Link::SharingPolicy policy) override; + explicit NetworkNS3Model(const std::string& name); + LinkImpl* create_link(const std::string& name, const std::vector& bandwidth) override; + LinkImpl* create_wifi_link(const std::string& name, const std::vector& bandwidth) override; Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override; double next_occurring_event(double now) override; bool next_occurring_event_is_idempotent() override { return false; } @@ -31,17 +30,17 @@ public: ************/ class LinkNS3 : public LinkImpl { public: - explicit LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwidth, double latency, - s4u::Link::SharingPolicy policy); + explicit LinkNS3(const std::string& name, double bandwidth); ~LinkNS3() override; - s4u::Link::SharingPolicy sharing_policy_; + s4u::Link::SharingPolicy sharing_policy_ = s4u::Link::SharingPolicy::SHARED; 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_;} + void set_bandwidth(double) override { THROW_UNIMPLEMENTED; } + LinkImpl* set_latency(double) override; + LinkImpl* set_bandwidth_profile(profile::Profile* profile) override; + LinkImpl* set_latency_profile(profile::Profile* profile) override; + LinkImpl* set_sharing_policy(s4u::Link::SharingPolicy policy) override; + s4u::Link::SharingPolicy get_sharing_policy() const override { return sharing_policy_; } }; /**********