untangle resource::state (ON/OFF) and VM::state (STARTED/MIGRATING/etc)

[simgrid.git] / src / surf / network_ns3.hpp

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index f452d94..55c36b5 100644 (file)
--- 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,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);
@@ -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_ */