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

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index 8aab263632..e9c07a04d3 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -1,9 +1,13 @@
-/* Copyright (c) 2004-2014. The SimGrid Team.
- *
- * This program is free software; you can redistribute it and/or modify it
+/* Copyright (c) 2004-2015. 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 "surf/ns3/ns3_interface.h"
+#include "src/surf/ns3/ns3_interface.h"
 
 #ifndef NETWORK_NS3_HPP_
 #define NETWORK_NS3_HPP_
@@ -11,31 +15,35 @@
 /***********
  * Classes *
  ***********/
-class NetworkNS3Model;
-typedef NetworkNS3Model *NetworkNS3ModelPtr;
 
-class NetworkNS3Link;
-typedef NetworkNS3Link *NetworkNS3LinkPtr;
+namespace simgrid {
+namespace surf {
 
-class NetworkNS3Action;
-typedef NetworkNS3Action *NetworkNS3ActionPtr;
+class XBT_PRIVATE NetworkNS3Model;
+class XBT_PRIVATE NetworkNS3Action;
+
+}
+}
 
 /*********
  * Tools *
  *********/
 
-void net_define_callbacks(void);
+XBT_PRIVATE void net_define_callbacks(void);
 
 /*********
  * Model *
  *********/
 
+namespace simgrid {
+namespace surf {
+
 class NetworkNS3Model : public NetworkModel {
 public:
   NetworkNS3Model();
 
   ~NetworkNS3Model();
-  NetworkLinkPtr createResource(const char *name,
+  Link* createLink(const char *name,
   	                                 double bw_initial,
   	                                 tmgr_trace_t bw_trace,
   	                                 double lat_initial,
@@ -44,19 +52,21 @@ public:
   	                                 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,
+  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);
+  void addTraces(){DIE_IMPOSSIBLE;}
+  bool shareResourcesIsIdempotent() {return false;}
 };
 
 /************
  * Resource *
  ************/
-class NetworkNS3Link : public NetworkLink {
+class NetworkNS3Link : public Link {
 public:
-  NetworkNS3Link(NetworkNS3ModelPtr model, const char *name, xbt_dict_t props,
+  NetworkNS3Link(NetworkNS3Model *model, const char *name, xbt_dict_t props,
   		         double bw_initial, double lat_initial);
   ~NetworkNS3Link();
 
@@ -78,7 +88,7 @@ public:
  **********/
 class NetworkNS3Action : public NetworkAction {
 public:
-  NetworkNS3Action(ModelPtr model, double cost, bool failed);
+  NetworkNS3Action(Model *model, double cost, bool failed);
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   int getLatencyLimited();
@@ -90,12 +100,12 @@ void suspend();
 void resume();
 
 //private:
-#ifdef HAVE_TRACING
   double m_lastSent;
-  RoutingEdgePtr p_srcElm;
-  RoutingEdgePtr p_dstElm;
-#endif //HAVE_TRACING
+  NetCard *p_srcElm;
+  NetCard *p_dstElm;
 };
 
+}
+}
 
 #endif /* NETWORK_NS3_HPP_ */