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

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index b04d5c98b0..97eba7a8d9 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -1,99 +1,66 @@
-/* Copyright (c) 2004-2014. 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 "network_interface.hpp"
-#include "surf/ns3/ns3_interface.h"
-
 #ifndef NETWORK_NS3_HPP_
 #define NETWORK_NS3_HPP_
 
-/***********
- * Classes *
- ***********/
-class NetworkNS3Model;
-typedef NetworkNS3Model *NetworkNS3ModelPtr;
-
-class NetworkNS3Action;
-typedef NetworkNS3Action *NetworkNS3ActionPtr;
+#include "xbt/base.h"
 
-/*********
- * Tools *
- *********/
-
-void net_define_callbacks(void);
+#include "network_interface.hpp"
 
-/*********
- * Model *
- *********/
+namespace simgrid {
+namespace kernel {
+namespace resource {
 
 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,
-  	                                 e_surf_resource_state_t state_initial,
-  	                                 tmgr_trace_t state_trace,
-  	                                 e_surf_link_sharing_policy_t policy,
-  	                                 xbt_dict_t properties);
-  xbt_dynar_t getRoute(RoutingEdgePtr src, RoutingEdgePtr dst);
-  ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
-		                           double size, double rate);
-  double shareResources(double now);
-  void updateActionsState(double now, double delta);
-  void addTraces(){DIE_IMPOSSIBLE;}
+  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_is_idempotent() override { return false; }
+  void update_actions_state(double now, double delta) override;
 };
 
 /************
  * Resource *
  ************/
-class NetworkNS3Link : public Link {
+class LinkNS3 : public LinkImpl {
 public:
-  NetworkNS3Link(NetworkNS3ModelPtr model, const char *name, xbt_dict_t props,
-  		         double bw_initial, double lat_initial);
-  ~NetworkNS3Link();
-
-  void updateState(tmgr_trace_event_t event_type, double value, double date);
-  double getLatency(){THROW_UNIMPLEMENTED;}
-  double getBandwidth(){THROW_UNIMPLEMENTED;}
-  void updateBandwidth(double value, double date=surf_get_clock()){THROW_UNIMPLEMENTED;}
-  void updateLatency(double value, double date=surf_get_clock()){THROW_UNIMPLEMENTED;}
-
-//private:
- char *p_id;
- char *p_lat;
- char *p_bdw;
- 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(ModelPtr model, double cost, bool failed);
-
-#ifdef HAVE_LATENCY_BOUND_TRACKING
-  int getLatencyLimited();
-#endif
+  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 m_lastSent;
-  RoutingEdgePtr p_srcElm;
-  RoutingEdgePtr p_dstElm;
+  // private:
+  double lastSent_ = 0;
+  s4u::Host* src_;
+  s4u::Host* dst_;
 };
 
+} // namespace resource
+}
+}
 
 #endif /* NETWORK_NS3_HPP_ */