X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/929bbf2f78b5c0151713d61bf5b163943b8b9343..8de466d0f03f18b22c6c36170b509d48a39fcd52:/src/surf/network_interface.cpp

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 66e1e0b8cc..ac8dcb2b4d 100644
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -1,14 +1,12 @@
-/* Copyright (c) 2013-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2018. The SimGrid Team. 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 <algorithm>
 
-#include "maxmin_private.hpp"
 #include "network_interface.hpp"
-#include "simgrid/sg_config.h"
+#include "simgrid/sg_config.hpp"
 
 #ifndef NETWORK_INTERFACE_CPP_
 #define NETWORK_INTERFACE_CPP_
@@ -68,11 +66,14 @@ simgrid::surf::NetworkModel *surf_network_model = nullptr;
 namespace simgrid {
   namespace surf {
 
-    NetworkModel::~NetworkModel()
-    {
-      delete maxminSystem_;
-      delete modifiedSet_;
-    }
+  /** Value of the command-line option 'network/TCP-gamma' -- see \ref options_model_network_gamma */
+  simgrid::config::Flag<double> NetworkModel::cfg_tcp_gamma(
+      {"network/TCP-gamma", "network/TCP_gamma"},
+      "Size of the biggest TCP window (cat /proc/sys/net/ipv4/tcp_[rw]mem for recv/send window; "
+      "Use the last given value, which is the max window size)",
+      4194304.0);
+
+  NetworkModel::~NetworkModel() = default;
 
     double NetworkModel::latencyFactor(double /*size*/) {
       return sg_latency_factor;
@@ -86,11 +87,11 @@ namespace simgrid {
       return rate;
     }
 
-    double NetworkModel::nextOccuringEventFull(double now)
+    double NetworkModel::next_occuring_event_full(double now)
     {
-      double minRes = Model::nextOccuringEventFull(now);
+      double minRes = Model::next_occuring_event_full(now);
 
-      for (Action const& action : *getRunningActionSet()) {
+      for (kernel::resource::Action const& action : *get_running_action_set()) {
         const NetworkAction& net_action = static_cast<const NetworkAction&>(action);
         if (net_action.latency_ > 0)
           minRes = (minRes < 0) ? net_action.latency_ : std::min(minRes, net_action.latency_);
@@ -105,7 +106,7 @@ namespace simgrid {
      * Resource *
      ************/
 
-    LinkImpl::LinkImpl(simgrid::surf::NetworkModel* model, const std::string& name, lmm_constraint_t constraint)
+    LinkImpl::LinkImpl(simgrid::surf::NetworkModel* model, const std::string& name, kernel::lmm::Constraint* constraint)
         : Resource(model, name, constraint), piface_(this)
     {
 
@@ -137,9 +138,9 @@ namespace simgrid {
       }
     }
 
-    bool LinkImpl::isUsed()
+    bool LinkImpl::is_used()
     {
-      return model()->getMaxminSystem()->constraint_used(constraint());
+      return get_model()->get_maxmin_system()->constraint_used(get_constraint());
     }
 
     double LinkImpl::latency()
@@ -154,36 +155,36 @@ namespace simgrid {
 
     int LinkImpl::sharingPolicy()
     {
-      return constraint()->get_sharing_policy();
+      return get_constraint()->get_sharing_policy();
     }
 
-    void LinkImpl::turnOn()
+    void LinkImpl::turn_on()
     {
-      if (isOff()) {
-        Resource::turnOn();
+      if (is_off()) {
+        Resource::turn_on();
         s4u::Link::onStateChange(this->piface_);
       }
     }
-    void LinkImpl::turnOff()
+    void LinkImpl::turn_off()
     {
-      if (isOn()) {
-        Resource::turnOff();
+      if (is_on()) {
+        Resource::turn_off();
         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", getCname());
+      xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Link %s", get_cname());
       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", getCname());
+      xbt_assert(bandwidth_.event == nullptr, "Cannot set a second bandwidth trace to Link %s", get_cname());
       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", getCname());
+      xbt_assert(latency_.event == nullptr, "Cannot set a second latency trace to Link %s", get_cname());
       latency_.event = future_evt_set->add_trace(trace, this);
     }
 
@@ -192,9 +193,9 @@ namespace simgrid {
      * Action *
      **********/
 
-    void NetworkAction::setState(Action::State state)
+    void NetworkAction::set_state(Action::State state)
     {
-      Action::setState(state);
+      Action::set_state(state);
       s4u::Link::onCommunicationStateChange(this);
     }
 
@@ -202,13 +203,13 @@ namespace simgrid {
     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, getVariable());
+      int llen = get_variable()->get_number_of_constraint();
 
       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_get_cnst_from_var(sys, getVariable(), i)->get_id());
+        kernel::resource::Resource* resource =
+            static_cast<kernel::resource::Resource*>(get_variable()->get_constraint(i)->get_id());
         LinkImpl* link     = dynamic_cast<LinkImpl*>(resource);
         if (link != nullptr)
           retlist.push_back(link);