X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/08cb25aa027aa2f86e89fd04f0de3ac319083be2..30aca4d4af004d1ec899d12f0a9fe3997e9be15e:/src/surf/network_interface.cpp

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 038b535a1b..5a2e56d3c6 100644
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -31,10 +31,10 @@ extern "C" {
     return link->sharingPolicy();
   }
   double sg_link_bandwidth(Link *link){
-    return link->getBandwidth();
+    return link->bandwidth();
   }
   double sg_link_latency(Link *link){
-    return link->getLatency();
+    return link->latency();
   }
   void* sg_link_data(Link *link) {
     return link->getData();
@@ -96,8 +96,7 @@ namespace simgrid {
     simgrid::xbt::signal<void(Link*)> Link::onStateChange;
 
     simgrid::xbt::signal<void(NetworkAction*, Action::State, Action::State)> networkActionStateChangedCallbacks;
-    simgrid::xbt::signal<void(NetworkAction*, kernel::routing::NetCard *src, kernel::routing::NetCard *dst)> Link::onCommunicate;
-
+    simgrid::xbt::signal<void(NetworkAction*, s4u::Host* src, s4u::Host* dst)> Link::onCommunicate;
   }
 }
 
@@ -129,12 +128,11 @@ namespace simgrid {
       return rate;
     }
 
-    double NetworkModel::next_occuring_event_full(double now)
+    double NetworkModel::nextOccuringEventFull(double now)
     {
-      ActionList *runningActions = surf_network_model->getRunningActionSet();
-      double minRes = shareResourcesMaxMin(runningActions, maxminSystem_, f_networkSolve);
+      double minRes = Model::nextOccuringEventFull(now);
 
-      for(auto it(runningActions->begin()), itend(runningActions->end()); it != itend ; ++it) {
+      for(auto it(getRunningActionSet()->begin()), itend(getRunningActionSet()->end()); it != itend ; it++) {
         NetworkAction *action = static_cast<NetworkAction*>(&*it);
         if (action->latency_ > 0)
           minRes = (minRes < 0) ? action->latency_ : std::min(minRes, action->latency_);
@@ -149,26 +147,14 @@ namespace simgrid {
      * Resource *
      ************/
 
-    Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props)
-    : Resource(model, name),
-      PropertyHolder(props)
-    {
-      links->insert({name, this});
-
-      m_latency.scale = 1;
-      m_bandwidth.scale = 1;
-      XBT_DEBUG("Create link '%s'",name);
-    }
-
-    Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint)
-    : Resource(model, name, constraint),
-      PropertyHolder(props)
+    Link::Link(simgrid::surf::NetworkModel* model, const char* name, lmm_constraint_t constraint)
+        : Resource(model, name, constraint)
     {
       if (strcmp(name,"__loopback__"))
         xbt_assert(!Link::byName(name), "Link '%s' declared several times in the platform.", name);
 
-      m_latency.scale = 1;
-      m_bandwidth.scale = 1;
+      latency_.scale   = 1;
+      bandwidth_.scale = 1;
 
       links->insert({name, this});
       XBT_DEBUG("Create link '%s'",name);
@@ -179,9 +165,9 @@ namespace simgrid {
     Link::~Link() {
       xbt_assert(currentlyDestroying_, "Don't delete Links directly. Call destroy() instead.");
     }
-    /** @brief Fire the require callbacks and destroy the object
+    /** @brief Fire the required callbacks and destroy the object
      *
-     * Don't delete directly an Link, call l->destroy() instead.
+     * Don't delete directly a Link, call l->destroy() instead.
      */
     void Link::destroy()
     {
@@ -197,14 +183,14 @@ namespace simgrid {
       return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint());
     }
 
-    double Link::getLatency()
+    double Link::latency()
     {
-      return m_latency.peak * m_latency.scale;
+      return latency_.peak * latency_.scale;
     }
 
-    double Link::getBandwidth()
+    double Link::bandwidth()
     {
-      return m_bandwidth.peak * m_bandwidth.scale;
+      return bandwidth_.peak * bandwidth_.scale;
     }
 
     int Link::sharingPolicy()
@@ -225,18 +211,18 @@ namespace simgrid {
       }
     }
     void Link::setStateTrace(tmgr_trace_t trace) {
-      xbt_assert(m_stateEvent==nullptr,"Cannot set a second state trace to Link %s", getName());
-      m_stateEvent = future_evt_set->add_trace(trace, 0.0, this);
+      xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Link %s", getName());
+      stateEvent_ = future_evt_set->add_trace(trace, 0.0, this);
     }
     void Link::setBandwidthTrace(tmgr_trace_t trace)
     {
-      xbt_assert(m_bandwidth.event==nullptr,"Cannot set a second bandwidth trace to Link %s", getName());
-      m_bandwidth.event = future_evt_set->add_trace(trace, 0.0, this);
+      xbt_assert(bandwidth_.event == nullptr, "Cannot set a second bandwidth trace to Link %s", getName());
+      bandwidth_.event = future_evt_set->add_trace(trace, 0.0, this);
     }
     void Link::setLatencyTrace(tmgr_trace_t trace)
     {
-      xbt_assert(m_latency.event==nullptr,"Cannot set a second latency trace to Link %s", getName());
-      m_latency.event = future_evt_set->add_trace(trace, 0.0, this);
+      xbt_assert(latency_.event == nullptr, "Cannot set a second latency trace to Link %s", getName());
+      latency_.event = future_evt_set->add_trace(trace, 0.0, this);
     }