first round of cleanups in the NS3 network

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

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index e9c07a0..57c31ab 100644 (file)
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -44,17 +44,17 @@ public:
 
   ~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);
+                                     double bw_initial,
+                                     tmgr_trace_t bw_trace,
+                                     double lat_initial,
+                                     tmgr_trace_t lat_trace,
+                                     int initiallyOn,
+                                     tmgr_trace_t state_trace,
+                                     e_surf_link_sharing_policy_t policy,
+                                     xbt_dict_t properties);
   xbt_dynar_t getRoute(NetCard *src, NetCard *dst);
   Action *communicate(NetCard *src, NetCard *dst,
-                                          double size, double rate);
+                               double size, double rate);
   double shareResources(double now);
   void updateActionsState(double now, double delta);
   void addTraces(){DIE_IMPOSSIBLE;}
@@ -67,19 +67,14 @@ public:
 class NetworkNS3Link : public Link {
 public:
   NetworkNS3Link(NetworkNS3Model *model, const char *name, xbt_dict_t props,
-                        double bw_initial, double lat_initial);
+               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 updateState(tmgr_trace_iterator_t event_type, double value, double date);
   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;
 };