#include "network_interface.hpp"
#include "simgrid/sg_config.hpp"
#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
#ifndef NETWORK_INTERFACE_CPP_
#define NETWORK_INTERFACE_CPP_
/* List of links */
std::unordered_map<std::string, LinkImpl*>* LinkImpl::links = new std::unordered_map<std::string, LinkImpl*>();
-LinkImpl* LinkImpl::byName(std::string name)
+LinkImpl* LinkImpl::by_name(std::string name)
{
auto link = links->find(name);
return link == links->end() ? nullptr : link->second;
/** @brief 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"},
+ "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);
{
double minRes = Model::next_occuring_event_full(now);
- for (Action const& action : *get_running_action_set()) {
+ for (Action const& action : *get_started_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_);
{
if (name != "__loopback__")
- xbt_assert(not LinkImpl::byName(name), "Link '%s' declared several times in the platform.", name.c_str());
+ xbt_assert(not LinkImpl::by_name(name), "Link '%s' declared several times in the platform.", name.c_str());
latency_.scale = 1;
bandwidth_.scale = 1;
{
if (not currentlyDestroying_) {
currentlyDestroying_ = true;
- s4u::Link::onDestruction(this->piface_);
+ s4u::Link::on_destruction(this->piface_);
delete this;
}
}
return get_model()->get_maxmin_system()->constraint_used(get_constraint());
}
-double LinkImpl::latency()
+double LinkImpl::get_latency()
{
return latency_.peak * latency_.scale;
}
-double LinkImpl::bandwidth()
+double LinkImpl::get_bandwidth()
{
return bandwidth_.peak * bandwidth_.scale;
}
-s4u::Link::SharingPolicy LinkImpl::sharingPolicy()
+s4u::Link::SharingPolicy LinkImpl::get_sharing_policy()
{
return get_constraint()->get_sharing_policy();
}
{
if (is_off()) {
Resource::turn_on();
- s4u::Link::onStateChange(this->piface_);
+ s4u::Link::on_state_change(this->piface_);
}
}
+
void LinkImpl::turn_off()
{
if (is_on()) {
Resource::turn_off();
- s4u::Link::onStateChange(this->piface_);
+ s4u::Link::on_state_change(this->piface_);
}
}
-void LinkImpl::setStateTrace(tmgr_trace_t trace)
+
+void LinkImpl::on_bandwidth_change()
+{
+ s4u::Link::on_bandwidth_change(this->piface_);
+}
+
+void LinkImpl::set_state_trace(tmgr_trace_t trace)
{
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)
+void LinkImpl::set_bandwidth_trace(tmgr_trace_t trace)
{
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)
+void LinkImpl::set_latency_trace(tmgr_trace_t trace)
{
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);
void NetworkAction::set_state(Action::State state)
{
+ Action::State previous = get_state();
Action::set_state(state);
- s4u::Link::onCommunicationStateChange(this);
+ if (previous != state) // Trigger only if the state changed
+ s4u::Link::on_communication_state_change(this);
}
/** @brief returns a list of all Links that this action is using */