X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7c480b01951b33f03d72ede0a47a45a88bd40b61..a46510650f4fe2e157740c0f1982da871ac9c3ce:/src/surf/network_ns3.hpp

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index 542558e4e7..2b907ba3a5 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2018. 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. */
@@ -11,17 +11,18 @@
 #include "network_interface.hpp"
 
 namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
 
 class NetworkNS3Model : public NetworkModel {
 public:
   NetworkNS3Model();
-  ~NetworkNS3Model();
-  LinkImpl* createLink(const std::string& name, double bandwidth, double latency,
-                       e_surf_link_sharing_policy_t policy) 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; }
+  ~NetworkNS3Model() override = default;
+  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;
+  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;
 };
 
@@ -30,14 +31,17 @@ public:
  ************/
 class LinkNS3 : public LinkImpl {
 public:
-  explicit LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwidth, double latency);
-  ~LinkNS3();
+  explicit LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwidth, double latency,
+                   s4u::Link::SharingPolicy policy);
+  ~LinkNS3() override;
+  s4u::Link::SharingPolicy sharing_policy_;
 
-  void apply_event(tmgr_trace_event_t event, double value) override;
-  void setBandwidth(double value) override { THROW_UNIMPLEMENTED; }
-  void setLatency(double value) override { THROW_UNIMPLEMENTED; }
-  void setBandwidthTrace(tmgr_trace_t trace) override;
-  void setLatencyTrace(tmgr_trace_t trace) override;
+  void apply_event(profile::Event* event, double value) override;
+  void set_bandwidth(double) override { THROW_UNIMPLEMENTED; }
+  void set_latency(double) 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() const override { return sharing_policy_; }
 };
 
 /**********
@@ -45,20 +49,19 @@ public:
  **********/
 class XBT_PRIVATE NetworkNS3Action : public NetworkAction {
 public:
-  NetworkNS3Action(kernel::resource::Model* model, double cost, s4u::Host* src, s4u::Host* dst);
+  NetworkNS3Action(Model* model, double cost, s4u::Host* src, s4u::Host* dst);
 
   void suspend() override;
   void resume() override;
-  std::list<LinkImpl*> links() override;
+  std::list<LinkImpl*> get_links() const override;
   void update_remains_lazy(double now) override;
 
   // private:
-  double lastSent_ = 0;
-  s4u::Host* src_;
-  s4u::Host* dst_;
+  double last_sent_ = 0;
 };
 
-}
-}
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid
 
 #endif /* NETWORK_NS3_HPP_ */