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

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 6cc6da9011..ac8dcb2b4d 100644
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -6,7 +6,7 @@
 #include <algorithm>
 
 #include "network_interface.hpp"
-#include "simgrid/sg_config.h"
+#include "simgrid/sg_config.hpp"
 
 #ifndef NETWORK_INTERFACE_CPP_
 #define NETWORK_INTERFACE_CPP_
@@ -66,6 +66,13 @@ simgrid::surf::NetworkModel *surf_network_model = nullptr;
 namespace simgrid {
   namespace surf {
 
+  /** 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*/) {
@@ -131,9 +138,9 @@ namespace simgrid {
       }
     }
 
-    bool LinkImpl::isUsed()
+    bool LinkImpl::is_used()
     {
-      return model()->get_maxmin_system()->constraint_used(constraint());
+      return get_model()->get_maxmin_system()->constraint_used(get_constraint());
     }
 
     double LinkImpl::latency()
@@ -148,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);
     }