prepare for next NS3 release

[simgrid.git] / src / surf / network_ns3.hpp

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index c0a8e11..275d45d 100644 (file)
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2022. 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,7 +8,8 @@
 
 #include "xbt/base.h"
 
-#include "network_interface.hpp"
+#include "src/kernel/resource/NetworkModel.hpp"
+#include "src/kernel/resource/StandardLinkImpl.hpp"
 
 namespace simgrid {
 namespace kernel {
@@ -17,8 +18,9 @@ namespace resource {
 class NetworkNS3Model : public NetworkModel {
 public:
   explicit NetworkNS3Model(const std::string& name);
-  LinkImpl* create_link(const std::string& name, const std::vector<double>& bandwidth) override;
-  LinkImpl* create_wifi_link(const std::string& name, const std::vector<double>& bandwidth) override;
+  ~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) override;
   double next_occurring_event(double now) override;
   bool next_occurring_event_is_idempotent() override { return false; }
@@ -28,7 +30,7 @@ public:
 /************
  * Resource *
  ************/
-class LinkNS3 : public LinkImpl {
+class LinkNS3 : public StandardLinkImpl {
 public:
   explicit LinkNS3(const std::string& name, double bandwidth);
   ~LinkNS3() override;
@@ -39,7 +41,7 @@ public:
   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) 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_; }
 };
 
@@ -52,7 +54,7 @@ public:
 
   void suspend() override;
   void resume() override;
-  std::list<LinkImpl*> get_links() const override;
+  std::list<StandardLinkImpl*> get_links() const override;
   void update_remains_lazy(double now) override;
 
   // private: