X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7da2926d0733ff0683f31aeea176ce71e127264f..102eee116018d7c6e9f4b9301421b137272d84fb:/src/surf/network_ns3.hpp

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index f452d94d9e..9dd44ba99a 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -7,7 +7,7 @@
 #include <xbt/base.h>
 
 #include "network_interface.hpp"
-#include "surf/ns3/ns3_interface.h"
+#include "src/surf/ns3/ns3_interface.h"
 
 #ifndef NETWORK_NS3_HPP_
 #define NETWORK_NS3_HPP_
@@ -15,9 +15,16 @@
 /***********
  * Classes *
  ***********/
+
+namespace simgrid {
+namespace surf {
+
 class XBT_PRIVATE NetworkNS3Model;
 class XBT_PRIVATE NetworkNS3Action;
 
+}
+}
+
 /*********
  * Tools *
  *********/
@@ -28,48 +35,36 @@ XBT_PRIVATE void net_define_callbacks(void);
  * Model *
  *********/
 
+namespace simgrid {
+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,
-  	                                 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(RoutingEdge *src, RoutingEdge *dst);
-  Action *communicate(RoutingEdge *src, RoutingEdge *dst,
-		                           double size, double rate);
-  double shareResources(double now);
-  void updateActionsState(double now, double delta);
-  void addTraces(){DIE_IMPOSSIBLE;}
-  bool shareResourcesIsIdempotent() {return false;}
+  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);
+  double next_occuring_event(double now) override;
+  bool next_occuring_event_isIdempotent() {return false;}
+  void updateActionsState(double now, double delta) override;
 };
 
 /************
  * Resource *
  ************/
-class NetworkNS3Link : public Link {
+class LinkNS3 : public Link {
 public:
-  NetworkNS3Link(NetworkNS3Model *model, const char *name, xbt_dict_t props,
-  		         double bw_initial, double lat_initial);
-  ~NetworkNS3Link();
+  LinkNS3(NetworkNS3Model *model, const char *name, xbt_dict_t props, double bandwidth, double latency);
+  ~LinkNS3();
 
-  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;}
+  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 setBandwidthTrace(tmgr_trace_t trace) override;
+  void setLatencyTrace(tmgr_trace_t trace) override;
 
 //private:
- char *p_id;
- char *p_lat;
- char *p_bdw;
  int m_created;
 };
 
@@ -80,10 +75,6 @@ class 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();
@@ -91,9 +82,11 @@ void resume();
 
 //private:
   double m_lastSent;
-  RoutingEdge *p_srcElm;
-  RoutingEdge *p_dstElm;
+  NetCard *p_srcElm;
+  NetCard *p_dstElm;
 };
 
+}
+}
 
 #endif /* NETWORK_NS3_HPP_ */