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

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index 7ed353a5a3..fed25486f1 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -11,18 +11,19 @@
 #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;
+  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 nextOccuringEvent(double now) override;
-  bool nextOccuringEventIsIdempotent() override { return false; }
-  void updateActionsState(double now, double delta) 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;
 };
 
 /************
@@ -34,10 +35,10 @@ public:
   ~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 set_bandwidth(double value) override { THROW_UNIMPLEMENTED; }
+  void set_latency(double value) override { THROW_UNIMPLEMENTED; }
+  void set_bandwidth_trace(tmgr_trace_t trace) override;
+  void set_latency_trace(tmgr_trace_t trace) override;
 };
 
 /**********
@@ -47,11 +48,10 @@ class XBT_PRIVATE NetworkNS3Action : public NetworkAction {
 public:
   NetworkNS3Action(kernel::resource::Model* model, double cost, s4u::Host* src, s4u::Host* dst);
 
-  bool isSuspended() override;
-  int unref() override;
   void suspend() override;
   void resume() override;
   std::list<LinkImpl*> links() override;
+  void update_remains_lazy(double now) override;
 
   // private:
   double lastSent_ = 0;
@@ -59,6 +59,7 @@ public:
   s4u::Host* dst_;
 };
 
+} // namespace resource
 }
 }