X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2c01336cbfb90976b513b71718a748b3a01a8e6a..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/surf/network_ns3.hpp

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index ecdb950492..632fe81ccc 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -1,30 +1,29 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2019. 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. */
+
 #ifndef NETWORK_NS3_HPP_
 #define NETWORK_NS3_HPP_
 
-
-#include <xbt/base.h>
+#include "xbt/base.h"
 
 #include "network_interface.hpp"
-#include "src/surf/ns3/ns3_interface.h"
 
 namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
 
 class NetworkNS3Model : public NetworkModel {
 public:
   NetworkNS3Model();
   ~NetworkNS3Model();
-  LinkImpl* createLink(const char* name, double bandwidth, double latency,
-                       e_surf_link_sharing_policy_t policy) override;
-  Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
-  double nextOccuringEvent(double now) override;
-  bool nextOccuringEventIsIdempotent() {return false;}
-  void updateActionsState(double now, double delta) override;
+  LinkImpl* create_link(const std::string& name, double bandwidth, double latency,
+                        s4u::Link::SharingPolicy 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 next_occuring_event_is_idempotent() override { return false; }
+  void update_actions_state(double now, double delta) override;
 };
 
 /************
@@ -32,14 +31,14 @@ public:
  ************/
 class LinkNS3 : public LinkImpl {
 public:
-  explicit LinkNS3(NetworkNS3Model* model, const char* name, double bandwidth, double latency);
+  explicit LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwidth, double latency);
   ~LinkNS3();
 
-  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(simgrid::kernel::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;
 };
 
 /**********
@@ -47,19 +46,20 @@ public:
  **********/
 class XBT_PRIVATE NetworkNS3Action : public NetworkAction {
 public:
-  NetworkNS3Action(Model* model, double cost, s4u::Host* src, s4u::Host* dst);
+  NetworkNS3Action(kernel::resource::Model* model, double cost, s4u::Host* src, s4u::Host* dst);
 
-  bool isSuspended();
-  int unref();
-  void suspend();
-  void resume();
+  void suspend() override;
+  void resume() override;
+  std::list<LinkImpl*> links() override;
+  void update_remains_lazy(double now) override;
 
-//private:
-  double lastSent_ = 0;
+  // private:
+  double last_sent_ = 0;
   s4u::Host* src_;
   s4u::Host* dst_;
 };
 
+} // namespace resource
 }
 }