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

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index a92c17d6d4..97eba7a8d9 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -1,43 +1,42 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2018. 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. */
 
-#include <xbt/base.h>
-
-#include "network_interface.hpp"
-#include "src/surf/ns3/ns3_interface.h"
-
 #ifndef NETWORK_NS3_HPP_
 #define NETWORK_NS3_HPP_
 
+#include "xbt/base.h"
+
+#include "network_interface.hpp"
+
 namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
 
-class XBT_PRIVATE NetworkNS3Model : public NetworkModel {
+class NetworkNS3Model : public NetworkModel {
 public:
   NetworkNS3Model();
   ~NetworkNS3Model();
-  Link* createLink(const char *name, double bandwidth, double latency,
-      e_surf_link_sharing_policy_t policy, xbt_dict_t properties) override;
-  Action *communicate(NetCard *src, NetCard *dst, double size, double rate);
+  LinkImpl* createLink(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_isIdempotent() {return false;}
-  void updateActionsState(double now, double delta) override;
+  bool next_occuring_event_is_idempotent() override { return false; }
+  void update_actions_state(double now, double delta) override;
 };
 
 /************
  * Resource *
  ************/
-class LinkNS3 : public Link {
+class LinkNS3 : public LinkImpl {
 public:
-  LinkNS3(NetworkNS3Model *model, const char *name, xbt_dict_t props, double bandwidth, double latency);
+  explicit LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwidth, double latency);
   ~LinkNS3();
 
-  void apply_event(tmgr_trace_iterator_t event, double value) override;
-  void updateBandwidth(double value) override {THROW_UNIMPLEMENTED;}
-  void updateLatency(double value) override {THROW_UNIMPLEMENTED;}
+  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;
 };
@@ -47,19 +46,20 @@ public:
  **********/
 class XBT_PRIVATE NetworkNS3Action : public NetworkAction {
 public:
-  NetworkNS3Action(Model *model, double cost, NetCard *src, NetCard *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:
+  // private:
   double lastSent_ = 0;
-  NetCard *src_;
-  NetCard *dst_;
+  s4u::Host* src_;
+  s4u::Host* dst_;
 };
 
+} // namespace resource
 }
 }