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

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index 716dc4c2e9..f8e3e3c84d 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -1,39 +1,14 @@
-/* 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_
 
-/***********
- * Classes *
- ***********/
-
-namespace simgrid {
-namespace surf {
-
-class XBT_PRIVATE NetworkNS3Model;
-class XBT_PRIVATE NetworkNS3Action;
-
-}
-}
+#include "xbt/base.h"
 
-/*********
- * Tools *
- *********/
-
-XBT_PRIVATE void net_define_callbacks(void);
-
-/*********
- * Model *
- *********/
+#include "network_interface.hpp"
 
 namespace simgrid {
 namespace surf {
@@ -41,61 +16,48 @@ namespace surf {
 class NetworkNS3Model : public NetworkModel {
 public:
   NetworkNS3Model();
-
   ~NetworkNS3Model();
-  Link* createLink(const char *name,
-                                     double bw_initial,
-                                     tmgr_trace_t bw_trace,
-                                     double lat_initial,
-                                     tmgr_trace_t lat_trace,
-                                     int initiallyOn,
-                                     tmgr_trace_t state_trace,
-                                     e_surf_link_sharing_policy_t policy,
-                                     xbt_dict_t properties);
-  xbt_dynar_t getRoute(NetCard *src, NetCard *dst);
-  Action *communicate(NetCard *src, NetCard *dst, double size, double rate);
-  double next_occuring_event(double now) override;
-  bool next_occuring_event_isIdempotent() {return false;}
+  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 nextOccuringEvent(double now) override;
+  bool nextOccuringEventIsIdempotent() override { return false; }
   void updateActionsState(double now, double delta) override;
 };
 
 /************
  * Resource *
  ************/
-class NetworkNS3Link : public Link {
+class LinkNS3 : public LinkImpl {
 public:
-  NetworkNS3Link(NetworkNS3Model *model, const char *name, xbt_dict_t props,
-               double bw_initial, double lat_initial);
-  ~NetworkNS3Link();
-
-  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;}
-
-//private:
- int m_created;
+  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;
 };
 
 /**********
  * Action *
  **********/
-class NetworkNS3Action : public NetworkAction {
+class XBT_PRIVATE NetworkNS3Action : public NetworkAction {
 public:
-  NetworkNS3Action(Model *model, double cost, bool failed);
-
-#ifdef HAVE_LATENCY_BOUND_TRACKING
-  int getLatencyLimited();
-#endif
-
-bool isSuspended();
-int unref();
-void suspend();
-void resume();
-
-//private:
-  double m_lastSent;
-  NetCard *p_srcElm;
-  NetCard *p_dstElm;
+  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 updateRemainingLazy(double now) override;
+
+  // private:
+  double lastSent_ = 0;
+  s4u::Host* src_;
+  s4u::Host* dst_;
 };
 
 }