Action::links() cannot be used for NS3Actions

[simgrid.git] / src / surf / network_interface.cpp

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index f88f52b..c315bb1 100644 (file)
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -35,9 +35,10 @@ namespace simgrid {
     LinkImpl** LinkImpl::linksList()
     {
       LinkImpl** res = xbt_new(LinkImpl*, (int)links->size());
-      int i=0;
+      int i          = 0;
       for (auto kv : *links) {
-        res[i++] = kv.second;
+        res[i] = kv.second;
+        i++;
       }
       return res;
     }
@@ -48,17 +49,6 @@ namespace simgrid {
         (kv.second)->destroy();
       delete links;
     }
-
-    /*************
-     * Callbacks *
-     *************/
-
-    simgrid::xbt::signal<void(LinkImpl*)> LinkImpl::onCreation;
-    simgrid::xbt::signal<void(LinkImpl*)> LinkImpl::onDestruction;
-    simgrid::xbt::signal<void(LinkImpl*)> LinkImpl::onStateChange;
-
-    simgrid::xbt::signal<void(NetworkAction*, Action::State, Action::State)> networkActionStateChangedCallbacks;
-    simgrid::xbt::signal<void(NetworkAction*, s4u::Host* src, s4u::Host* dst)> LinkImpl::onCommunicate;
   }
 }
 
@@ -110,11 +100,11 @@ namespace simgrid {
      ************/
 
     LinkImpl::LinkImpl(simgrid::surf::NetworkModel* model, const char* name, lmm_constraint_t constraint)
-        : Resource(model, name, constraint), piface_(Link(this))
+        : Resource(model, name, constraint), piface_(this)
     {
 
       if (strcmp(name,"__loopback__"))
-        xbt_assert(!LinkImpl::byName(name), "Link '%s' declared several times in the platform.", name);
+        xbt_assert(not LinkImpl::byName(name), "Link '%s' declared several times in the platform.", name);
 
       latency_.scale   = 1;
       bandwidth_.scale = 1;
@@ -135,9 +125,9 @@ namespace simgrid {
      */
     void LinkImpl::destroy()
     {
-      if (!currentlyDestroying_) {
+      if (not currentlyDestroying_) {
         currentlyDestroying_ = true;
-        onDestruction(this);
+        s4u::Link::onDestruction(this->piface_);
         delete this;
       }
     }
@@ -166,30 +156,30 @@ namespace simgrid {
     {
       if (isOff()) {
         Resource::turnOn();
-        onStateChange(this);
+        s4u::Link::onStateChange(this->piface_);
       }
     }
     void LinkImpl::turnOff()
     {
       if (isOn()) {
         Resource::turnOff();
-        onStateChange(this);
+        s4u::Link::onStateChange(this->piface_);
       }
     }
     void LinkImpl::setStateTrace(tmgr_trace_t trace)
     {
       xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Link %s", cname());
-      stateEvent_ = future_evt_set->add_trace(trace, 0.0, this);
+      stateEvent_ = future_evt_set->add_trace(trace, this);
     }
     void LinkImpl::setBandwidthTrace(tmgr_trace_t trace)
     {
       xbt_assert(bandwidth_.event == nullptr, "Cannot set a second bandwidth trace to Link %s", cname());
-      bandwidth_.event = future_evt_set->add_trace(trace, 0.0, this);
+      bandwidth_.event = future_evt_set->add_trace(trace, this);
     }
     void LinkImpl::setLatencyTrace(tmgr_trace_t trace)
     {
       xbt_assert(latency_.event == nullptr, "Cannot set a second latency trace to Link %s", cname());
-      latency_.event = future_evt_set->add_trace(trace, 0.0, this);
+      latency_.event = future_evt_set->add_trace(trace, this);
     }
 
 
@@ -197,12 +187,30 @@ namespace simgrid {
      * Action *
      **********/
 
-    void NetworkAction::setState(Action::State state){
-      Action::State old = getState();
+    void NetworkAction::setState(Action::State state)
+    {
       Action::setState(state);
-      networkActionStateChangedCallbacks(this, old, state);
+      s4u::Link::onCommunicationStateChange(this);
     }
 
+    /** @brief returns a list of all Links that this action is using */
+    std::list<LinkImpl*> NetworkAction::links()
+    {
+      std::list<LinkImpl*> retlist;
+      lmm_system_t sys = getModel()->getMaxminSystem();
+      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 */
+        // extra pb: we cannot dynamic_cast from void*...
+        Resource* resource = static_cast<Resource*>(lmm_constraint_id(lmm_get_cnst_from_var(sys, getVariable(), i)));
+        LinkImpl* link     = dynamic_cast<LinkImpl*>(resource);
+        if (link != nullptr)
+          retlist.push_back(link);
+      }
+
+      return retlist;
+    }
   }
 }