X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9104957deccc59e0e804215d5db498fabfd40d29..3e8cbdbebfce89fb0abf0cb8710c8505e111d097:/src/surf/network_ns3.hpp

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index f828efdb64..35244212f4 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-2023. 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. */
@@ -8,19 +8,18 @@
 
 #include "xbt/base.h"
 
-#include "network_interface.hpp"
+#include "src/kernel/resource/NetworkModel.hpp"
+#include "src/kernel/resource/StandardLinkImpl.hpp"
 
-namespace simgrid {
-namespace kernel {
-namespace resource {
+namespace simgrid ::kernel::resource {
 
 class NetworkNS3Model : public NetworkModel {
 public:
-  NetworkNS3Model();
-  ~NetworkNS3Model();
-  LinkImpl* create_link(const std::string& name, const std::vector<double>& bandwidth, double latency,
-                        s4u::Link::SharingPolicy policy) override;
-  Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
+  explicit NetworkNS3Model(const std::string& name);
+  ~NetworkNS3Model() override;
+  StandardLinkImpl* create_link(const std::string& name, const std::vector<double>& bandwidth) override;
+  StandardLinkImpl* create_wifi_link(const std::string& name, const std::vector<double>& bandwidth) override;
+  Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate, bool streamed) override;
   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;
@@ -29,16 +28,19 @@ public:
 /************
  * Resource *
  ************/
-class LinkNS3 : public LinkImpl {
+class LinkNS3 : public StandardLinkImpl {
 public:
-  explicit LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwidth, double latency);
-  ~LinkNS3();
+  explicit LinkNS3(const std::string& name, double bandwidth);
+  ~LinkNS3() override;
+  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(double) override { THROW_UNIMPLEMENTED; }
+  void set_latency(double) override;
   void set_bandwidth_profile(profile::Profile* profile) override;
   void set_latency_profile(profile::Profile* profile) override;
+  void set_sharing_policy(s4u::Link::SharingPolicy policy, const s4u::NonLinearResourceCb& cb) override;
+  s4u::Link::SharingPolicy get_sharing_policy() const override { return sharing_policy_; }
 };
 
 /**********
@@ -50,17 +52,13 @@ public:
 
   void suspend() override;
   void resume() override;
-  std::list<LinkImpl*> links() const override;
+  std::list<StandardLinkImpl*> get_links() const override;
   void update_remains_lazy(double now) override;
 
   // private:
   double last_sent_ = 0;
-  s4u::Host* src_;
-  s4u::Host* dst_;
 };
 
-} // namespace resource
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::resource
 
 #endif /* NETWORK_NS3_HPP_ */