X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/198b09ec16ca1b8fc05053bcae9e75c0ad689711..d5e80f361a8e20f8080faabf65bb2021c46f6656:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 7912f2078d..c57f111915 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -1,261 +1,242 @@ -/* Copyright (c) 2013-2015. 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 - #include "network_interface.hpp" -#include "simgrid/sg_config.h" +#include "simgrid/sg_config.hpp" +#include "src/surf/surf_interface.hpp" +#include "surf/surf.hpp" #ifndef NETWORK_INTERFACE_CPP_ #define NETWORK_INTERFACE_CPP_ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module"); -/********* - * C API * - *********/ +namespace simgrid { +namespace kernel { +namespace resource { -extern "C" { +/* List of links */ +std::unordered_map* LinkImpl::links = new std::unordered_map(); - const char* sg_link_name(Link *link) { - return link->getName(); - } - Link * sg_link_by_name(const char* name) { - return Link::byName(name); +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() +{ + return links->size(); +} +void LinkImpl::linksList(std::vector* linkList) +{ + for (auto const& kv : *links) { + linkList->push_back(&kv.second->piface_); } +} - int sg_link_is_shared(Link *link){ - return link->sharingPolicy(); +/** @brief Returns a list of all existing links */ +LinkImpl** LinkImpl::linksList() +{ + LinkImpl** res = xbt_new(LinkImpl*, (int)links->size()); + int i = 0; + for (auto const& kv : *links) { + res[i] = kv.second; + i++; } - double sg_link_bandwidth(Link *link){ - return link->getBandwidth(); - } - double sg_link_latency(Link *link){ - return link->getLatency(); - } - void* sg_link_data(Link *link) { - return link->getData(); - } - void sg_link_data_set(Link *link,void *data) { - link->setData(data); - } - int sg_link_count(void) { - return Link::linksCount(); - } - Link** sg_link_list(void) { - return Link::linksList(); + return res; +} +/** @brief destructor of the static data */ +void LinkImpl::linksExit() +{ + for (auto const& kv : *links) + (kv.second)->destroy(); + delete links; +} +} +} +} // namespace simgrid + +/********* + * Model * + *********/ + +simgrid::kernel::resource::NetworkModel* surf_network_model = nullptr; + +namespace simgrid { +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; + +double NetworkModel::latencyFactor(double /*size*/) +{ + return sg_latency_factor; +} + +double NetworkModel::bandwidthFactor(double /*size*/) +{ + return sg_bandwidth_factor; +} + +double NetworkModel::bandwidthConstraint(double rate, double /*bound*/, double /*size*/) +{ + return rate; +} + +double NetworkModel::next_occuring_event_full(double now) +{ + double minRes = Model::next_occuring_event_full(now); + + 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_); } - void sg_link_exit(void) { - Link::linksExit(); + + XBT_DEBUG("Min of share resources %f", minRes); + + return minRes; +} + +/************ + * Resource * + ************/ + +LinkImpl::LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint) + : Resource(model, name, constraint), piface_(this) +{ + + if (name != "__loopback__") + xbt_assert(not LinkImpl::byName(name), "Link '%s' declared several times in the platform.", name.c_str()); + + latency_.scale = 1; + bandwidth_.scale = 1; + + links->insert({name, this}); + XBT_DEBUG("Create link '%s'", name.c_str()); +} + +/** @brief use destroy() instead of this destructor */ +LinkImpl::~LinkImpl() +{ + xbt_assert(currentlyDestroying_, "Don't delete Links directly. Call destroy() instead."); +} +/** @brief Fire the required callbacks and destroy the object + * + * Don't delete directly a Link, call l->destroy() instead. + */ +void LinkImpl::destroy() +{ + if (not currentlyDestroying_) { + currentlyDestroying_ = true; + s4u::Link::on_destruction(this->piface_); + delete this; } +} + +bool LinkImpl::is_used() +{ + return get_model()->get_maxmin_system()->constraint_used(get_constraint()); +} +double LinkImpl::latency() +{ + return latency_.peak * latency_.scale; } -/***************** - * List of links * - *****************/ +double LinkImpl::bandwidth() +{ + return bandwidth_.peak * bandwidth_.scale; +} -namespace simgrid { - namespace surf { - - boost::unordered_map *Link::links = new boost::unordered_map(); - Link *Link::byName(const char* name) { - if (links->find(name) == links->end()) - return nullptr; - return links->at(name); - } - /** @brief Returns the amount of links in the platform */ - int Link::linksCount() { - return links->size(); - } - /** @brief Returns a list of all existing links */ - Link **Link::linksList() { - Link **res = xbt_new(Link*, (int)links->size()); - int i=0; - for (auto kv : *links) { - res[i++] = kv.second; - } - return res; - } - /** @brief destructor of the static data */ - void Link::linksExit() { - for (auto kv : *links) - (kv.second)->destroy(); - delete links; - } - - /************* - * Callbacks * - *************/ - - simgrid::xbt::signal Link::onCreation; - simgrid::xbt::signal Link::onDestruction; - simgrid::xbt::signal Link::onStateChange; - - simgrid::xbt::signal networkActionStateChangedCallbacks; - simgrid::xbt::signal Link::onCommunicate; +s4u::Link::SharingPolicy LinkImpl::sharingPolicy() +{ + return get_constraint()->get_sharing_policy(); +} +void LinkImpl::turn_on() +{ + if (is_off()) { + Resource::turn_on(); + s4u::Link::on_state_change(this->piface_); } } -/********* - * Model * - *********/ +void LinkImpl::turn_off() +{ + if (is_on()) { + Resource::turn_off(); + s4u::Link::on_state_change(this->piface_); + } +} -simgrid::surf::NetworkModel *surf_network_model = nullptr; +void LinkImpl::on_bandwidth_change() +{ + s4u::Link::on_bandwidth_change(this->piface_); +} -namespace simgrid { - namespace surf { - - NetworkModel::~NetworkModel() - { - lmm_system_free(maxminSystem_); - xbt_heap_free(actionHeap_); - delete modifiedSet_; - } - - double NetworkModel::latencyFactor(double /*size*/) { - return sg_latency_factor; - } - - double NetworkModel::bandwidthFactor(double /*size*/) { - return sg_bandwidth_factor; - } - - double NetworkModel::bandwidthConstraint(double rate, double /*bound*/, double /*size*/) { - return rate; - } - - double NetworkModel::next_occuring_event_full(double now) - { - NetworkAction *action = nullptr; - ActionList *runningActions = surf_network_model->getRunningActionSet(); - double minRes; - - minRes = shareResourcesMaxMin(runningActions, surf_network_model->maxminSystem_, surf_network_model->f_networkSolve); - - for(ActionList::iterator it(runningActions->begin()), itend(runningActions->end()) - ; it != itend ; ++it) { - action = static_cast(&*it); - if (action->latency_ > 0) { - minRes = (minRes < 0) ? action->latency_ : std::min(minRes, action->latency_); - } - } - - XBT_DEBUG("Min of share resources %f", minRes); - - return minRes; - } - - /************ - * 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) - { - 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; - - links->insert({name, this}); - XBT_DEBUG("Create link '%s'",name); - - } - - /** @brief use destroy() instead of this destructor */ - Link::~Link() { - xbt_assert(currentlyDestroying_, "Don't delete Links directly. Call destroy() instead."); - } - /** @brief Fire the require callbacks and destroy the object - * - * Don't delete directly an Link, call l->destroy() instead. - */ - void Link::destroy() - { - if (!currentlyDestroying_) { - currentlyDestroying_ = true; - onDestruction(this); - delete this; - } - } - - bool Link::isUsed() - { - return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); - } - - double Link::getLatency() - { - return m_latency.peak * m_latency.scale; - } - - double Link::getBandwidth() - { - return m_bandwidth.peak * m_bandwidth.scale; - } - - int Link::sharingPolicy() - { - return lmm_constraint_sharing_policy(getConstraint()); - } - - void Link::turnOn(){ - if (isOff()) { - Resource::turnOn(); - onStateChange(this); - } - } - void Link::turnOff(){ - if (isOn()) { - Resource::turnOff(); - onStateChange(this); - } - } - 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); - } - 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); - } - 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); - } - - - /********** - * Action * - **********/ - - void NetworkAction::setState(Action::State state){ - Action::State old = getState(); - Action::setState(state); - networkActionStateChangedCallbacks(this, old, state); - } +void LinkImpl::setStateTrace(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) +{ + 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", get_cname()); + latency_.event = future_evt_set->add_trace(trace, this); +} + +/********** + * Action * + **********/ + +void NetworkAction::set_state(Action::State state) +{ + Action::State previous = get_state(); + Action::set_state(state); + 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 */ +std::list NetworkAction::links() +{ + std::list retlist; + 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(get_variable()->get_constraint(i)->get_id()); + LinkImpl* link = dynamic_cast(resource); + if (link != nullptr) + retlist.push_back(link); } + + return retlist; +} +} +} // namespace kernel } #endif /* NETWORK_INTERFACE_CPP_ */