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

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index 686feeecf8..1fea2d7bfa 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -15,9 +15,16 @@
 /***********
  * Classes *
  ***********/
+
+namespace simgrid {
+namespace surf {
+
 class XBT_PRIVATE NetworkNS3Model;
 class XBT_PRIVATE NetworkNS3Action;
 
+}
+}
+
 /*********
  * Tools *
  *********/
@@ -28,6 +35,9 @@ XBT_PRIVATE void net_define_callbacks(void);
  * Model *
  *********/
 
+namespace simgrid {
+namespace surf {
+
 class NetworkNS3Model : public NetworkModel {
 public:
   NetworkNS3Model();
@@ -38,12 +48,12 @@ public:
   	                                 tmgr_trace_t bw_trace,
   	                                 double lat_initial,
   	                                 tmgr_trace_t lat_trace,
-  	                                 e_surf_resource_state_t state_initial,
+  	                                 int initiallyOn,
   	                                 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,
+  xbt_dynar_t getRoute(NetCard *src, NetCard *dst);
+  Action *communicate(NetCard *src, NetCard *dst,
 		                           double size, double rate);
   double shareResources(double now);
   void updateActionsState(double now, double delta);
@@ -60,7 +70,7 @@ public:
   		         double bw_initial, double lat_initial);
   ~NetworkNS3Link();
 
-  void updateState(tmgr_trace_event_t event_type, double value, double date);
+  void updateState(tmgr_trace_iterator_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;}
@@ -91,9 +101,11 @@ void resume();
 
 //private:
   double m_lastSent;
-  RoutingEdge *p_srcElm;
-  RoutingEdge *p_dstElm;
+  NetCard *p_srcElm;
+  NetCard *p_dstElm;
 };
 
+}
+}
 
 #endif /* NETWORK_NS3_HPP_ */