give Link a proper public interface

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

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index f5389b8..2807f8f 100644 (file)
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -1,7 +1,9 @@
 /* Copyright (c) 2004-2014. The SimGrid Team.
- *
- * This program is free software; you can redistribute it and/or modify it
+ * 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 "network_interface.hpp"
 #include "surf/ns3/ns3_interface.h"
 
@@ -35,7 +37,7 @@ public:
   NetworkNS3Model();
 
   ~NetworkNS3Model();
-  NetworkLinkPtr createResource(const char *name,
+  LinkPtr createLink(const char *name,
                                         double bw_initial,
                                         tmgr_trace_t bw_trace,
                                         double lat_initial,
@@ -49,20 +51,23 @@ public:
                                           double size, double rate);
   double shareResources(double now);
   void updateActionsState(double now, double delta);
+  void addTraces(){DIE_IMPOSSIBLE;}
 };
 
 /************
  * Resource *
  ************/
-class NetworkNS3Link : public NetworkLink {
+class NetworkNS3Link : public Link {
 public:
   NetworkNS3Link(NetworkNS3ModelPtr model, const char *name, xbt_dict_t props,
                         double bw_initial, double lat_initial);
   ~NetworkNS3Link();
 
   void updateState(tmgr_trace_event_t event_type, double value, double date);
-  double getLatency();
-  double getBandwidth();
+  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;}
 
 //private:
  char *p_id;
@@ -88,11 +93,9 @@ void suspend();
 void resume();
 
 //private:
-#ifdef HAVE_TRACING
   double m_lastSent;
   RoutingEdgePtr p_srcElm;
   RoutingEdgePtr p_dstElm;
-#endif //HAVE_TRACING
 };