From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 24 May 2017 12:45:54 +0000 (+0200)
Subject: Action::links() cannot be used for NS3Actions
X-Git-Tag: v3.16~220
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f2907d4c4e2bfdd55ae8a7c41711b731d106f668?hp=a4ebb6917b0c05404f2444620b7230f3a9c0f262;ds=inline

Action::links() cannot be used for NS3Actions
---

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index f14530a7ec..c315bb1002 100644
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -198,7 +198,7 @@ namespace simgrid {
     {
       std::list<LinkImpl*> retlist;
       lmm_system_t sys = getModel()->getMaxminSystem();
-      int llen         = lmm_get_number_of_cnst_from_var(sys, getVariable());
+      int llen         = lmm_get_number_of_cnst_from_var(sys, variable_);
 
       for (int i = 0; i < llen; i++) {
         /* Beware of composite actions: ptasks put links and cpus together */
diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index 01a2372c99..59c93ccc0e 100644
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -206,7 +206,7 @@ public:
       : simgrid::surf::Action(model, cost, failed, var){};
 
   void setState(simgrid::surf::Action::State state) override;
-  std::list<LinkImpl*> links();
+  virtual std::list<LinkImpl*> links();
 
   double latency_;
   double latCurrent_;
diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index c2dda73269..aedde294bd 100644
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -317,7 +317,12 @@ void NetworkNS3Action::resume() {
   THROW_UNIMPLEMENTED;
 }
 
-  /* Test whether a flow is suspended */
+std::list<LinkImpl*> NetworkNS3Action::links()
+{
+  THROW_UNIMPLEMENTED;
+}
+
+/* Test whether a flow is suspended */
 bool NetworkNS3Action::isSuspended()
 {
   return false;
diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index 40a49d6067..d7ff3ceffe 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -49,11 +49,12 @@ public:
   NetworkNS3Action(Model* model, double cost, s4u::Host* src, s4u::Host* dst);
 
   bool isSuspended();
-  int unref();
-  void suspend();
-  void resume();
+  int unref() override;
+  void suspend() override;
+  void resume() override;
+  std::list<LinkImpl*> links() override;
 
-//private:
+  // private:
   double lastSent_ = 0;
   s4u::Host* src_;
   s4u::Host* dst_;