X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7c480b01951b33f03d72ede0a47a45a88bd40b61..1d83468696010801d74f8bc1e8c30918ffebabac:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 6cc6da9011..a0275c7cb2 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -3,10 +3,9 @@ /* 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 - #include "network_interface.hpp" -#include "simgrid/sg_config.h" +#include "simgrid/sg_config.hpp" +#include "src/surf/surf_interface.hpp" #ifndef NETWORK_INTERFACE_CPP_ #define NETWORK_INTERFACE_CPP_ @@ -14,15 +13,16 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module"); namespace simgrid { - namespace surf { +namespace kernel { +namespace resource { - /* List of links */ - std::unordered_map* LinkImpl::links = new std::unordered_map(); +/* List of links */ +std::unordered_map* LinkImpl::links = new std::unordered_map(); - LinkImpl* LinkImpl::byName(std::string name) - { - auto link = links->find(name); - return link == links->end() ? nullptr : link->second; +LinkImpl* LinkImpl::byName(std::string name) +{ + auto link = links->find(name); + return link == links->end() ? nullptr : link->second; } /** @brief Returns the amount of links in the platform */ int LinkImpl::linksCount() @@ -56,20 +56,35 @@ namespace simgrid { } } } +} // namespace simgrid /********* * Model * *********/ -simgrid::surf::NetworkModel *surf_network_model = nullptr; +simgrid::kernel::resource::NetworkModel* surf_network_model = nullptr; namespace simgrid { - namespace surf { +namespace kernel { +namespace resource { + +/** @brief Command-line option 'network/TCP-gamma' -- see \ref options_model_network_gamma */ +simgrid::config::Flag 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); + +/** @brief Command-line option 'network/crosstraffic' -- see \ref options_model_network_crosstraffic */ +simgrid::config::Flag NetworkModel::cfg_crosstraffic( + "network/crosstraffic", + "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)", "yes"); - NetworkModel::~NetworkModel() = default; +NetworkModel::~NetworkModel() = default; - double NetworkModel::latencyFactor(double /*size*/) { - return sg_latency_factor; +double NetworkModel::latencyFactor(double /*size*/) +{ + return sg_latency_factor; } double NetworkModel::bandwidthFactor(double /*size*/) { @@ -84,7 +99,7 @@ namespace simgrid { { double minRes = Model::next_occuring_event_full(now); - for (kernel::resource::Action const& action : *get_running_action_set()) { + for (Action const& action : *get_running_action_set()) { const NetworkAction& net_action = static_cast(action); if (net_action.latency_ > 0) minRes = (minRes < 0) ? net_action.latency_ : std::min(minRes, net_action.latency_); @@ -99,7 +114,7 @@ namespace simgrid { * Resource * ************/ - LinkImpl::LinkImpl(simgrid::surf::NetworkModel* model, const std::string& name, kernel::lmm::Constraint* constraint) + LinkImpl::LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint) : Resource(model, name, constraint), piface_(this) { @@ -131,9 +146,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() @@ -146,38 +161,38 @@ namespace simgrid { return bandwidth_.peak * bandwidth_.scale; } - int LinkImpl::sharingPolicy() + s4u::Link::SharingPolicy 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); } @@ -201,8 +216,7 @@ namespace simgrid { 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*... - kernel::resource::Resource* resource = - static_cast(get_variable()->get_constraint(i)->get_id()); + Resource* resource = static_cast(get_variable()->get_constraint(i)->get_id()); LinkImpl* link = dynamic_cast(resource); if (link != nullptr) retlist.push_back(link); @@ -211,6 +225,7 @@ namespace simgrid { return retlist; } } + } // namespace kernel } #endif /* NETWORK_INTERFACE_CPP_ */