X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1046c9806a7cdd50272c2dafe8ec13f48bd58b92..8391d02b6a83f0cececc6957e5d7b9e70781fe09:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 4376384ba6..147747ac0e 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -1,184 +1,110 @@ -/* 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" #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 * - *********/ - -extern "C" { - -const char* sg_link_name(Link *link) { - return link->getName(); -} -Link * sg_link_by_name(const char* name) { - return Link::byName(name); -} - -int sg_link_is_shared(Link *link){ - return link->sharingPolicy(); -} -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(); -} -void sg_link_exit(void) { - Link::linksExit(); -} - -} - -/***************** - * List of links * - *****************/ +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module"); namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { -boost::unordered_map *Link::links = new boost::unordered_map(); -Link *Link::byName(const char* name) { - Link * res = NULL; - try { - res = links->at(name); - } catch (std::out_of_range& e) {} +/* List of links */ +std::unordered_map* LinkImpl::links = new std::unordered_map(); - return res; +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 Link::linksCount() { - return links->size(); +int LinkImpl::linksCount() +{ + return links->size(); } +void LinkImpl::linksList(std::vector* linkList) +{ + for (auto const& kv : *links) { + linkList->push_back(&kv.second->piface_); + } +} + /** @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; +LinkImpl** LinkImpl::linksList() +{ + LinkImpl** res = xbt_new(LinkImpl*, (int)links->size()); + int i = 0; + for (auto const& kv : *links) { + res[i] = kv.second; + i++; + } + 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; // signature: wasOn, currentlyOn - -simgrid::xbt::signal networkActionStateChangedCallbacks; -simgrid::xbt::signal networkCommunicateCallbacks; - +void LinkImpl::linksExit() +{ + for (auto const& kv : *links) + (kv.second)->destroy(); + delete links; } } - -void netlink_parse_init(sg_platf_link_cbarg_t link){ - if (link->policy == SURF_LINK_FULLDUPLEX) { - char *link_id; - link_id = bprintf("%s_UP", link->id); - surf_network_model->createLink(link_id, - link->bandwidth, - link->bandwidth_trace, - link->latency, - link->latency_trace, - link->initiallyOn, - link->state_trace, link->policy, link->properties); - xbt_free(link_id); - link_id = bprintf("%s_DOWN", link->id); - surf_network_model->createLink(link_id, - link->bandwidth, - link->bandwidth_trace, - link->latency, - link->latency_trace, - link->initiallyOn, - link->state_trace, link->policy, link->properties); - xbt_free(link_id); - } else { - surf_network_model->createLink(link->id, - link->bandwidth, - link->bandwidth_trace, - link->latency, - link->latency_trace, - link->initiallyOn, - link->state_trace, link->policy, link->properties); - } } +} // namespace simgrid /********* * Model * *********/ -simgrid::surf::NetworkModel *surf_network_model = NULL; +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; -double NetworkModel::latencyFactor(double /*size*/) { +double NetworkModel::latencyFactor(double /*size*/) +{ return sg_latency_factor; } -double NetworkModel::bandwidthFactor(double /*size*/) { +double NetworkModel::bandwidthFactor(double /*size*/) +{ return sg_bandwidth_factor; } -double NetworkModel::bandwidthConstraint(double rate, double /*bound*/, double /*size*/) { +double NetworkModel::bandwidthConstraint(double rate, double /*bound*/, double /*size*/) +{ return rate; } -double NetworkModel::shareResourcesFull(double now) +double NetworkModel::next_occuring_event_full(double now) { - NetworkAction *action = NULL; - ActionList *runningActions = surf_network_model->getRunningActionSet(); - double minRes; - - minRes = shareResourcesMaxMin(runningActions, surf_network_model->p_maxminSystem, surf_network_model->f_networkSolve); - - for(ActionList::iterator it(runningActions->begin()), itend(runningActions->end()) - ; it != itend ; ++it) { - action = static_cast(&*it); -#ifdef HAVE_LATENCY_BOUND_TRACKING - if (lmm_is_variable_limited_by_latency(action->getVariable())) { - action->m_latencyLimited = 1; - } else { - action->m_latencyLimited = 0; - } -#endif - if (action->m_latency > 0) { - minRes = (minRes < 0) ? action->m_latency : std::min(minRes, action->m_latency); - } + 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_); } XBT_DEBUG("Min of share resources %f", minRes); @@ -190,91 +116,117 @@ double NetworkModel::shareResourcesFull(double now) * Resource * ************/ -Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props) -: Resource(model, name), - PropertyHolder(props) +LinkImpl::LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint) + : Resource(model, name, constraint), piface_(this) { - links->insert({name, this}); - XBT_DEBUG("Create link '%s'",name); -} + if (name != "__loopback__") + xbt_assert(not LinkImpl::byName(name), "Link '%s' declared several times in the platform.", name.c_str()); -Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props, - lmm_constraint_t constraint, - tmgr_history_t history, - tmgr_trace_t state_trace) -: Resource(model, name, constraint), - PropertyHolder(props) -{ - if (state_trace) - p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, this); + latency_.scale = 1; + bandwidth_.scale = 1; links->insert({name, this}); - XBT_DEBUG("Create link '%s'",name); - + XBT_DEBUG("Create link '%s'", name.c_str()); } /** @brief use destroy() instead of this destructor */ -Link::~Link() { - xbt_assert(currentlyDestroying_, "Don't delete Links directly. Call destroy() instead."); +LinkImpl::~LinkImpl() +{ + xbt_assert(currentlyDestroying_, "Don't delete Links directly. Call destroy() instead."); } -/** @brief Fire the require callbacks and destroy the object +/** @brief Fire the required callbacks and destroy the object * - * Don't delete directly an Link, call l->destroy() instead. + * Don't delete directly a Link, call l->destroy() instead. */ -void Link::destroy() +void LinkImpl::destroy() { - if (!currentlyDestroying_) { - currentlyDestroying_ = true; - onDestruction(this); - delete this; - } + if (not currentlyDestroying_) { + currentlyDestroying_ = true; + s4u::Link::onDestruction(this->piface_); + delete this; + } } -bool Link::isUsed() +bool LinkImpl::is_used() { - return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); + return get_model()->get_maxmin_system()->constraint_used(get_constraint()); } -double Link::getLatency() +double LinkImpl::latency() { - return m_latCurrent; + return latency_.peak * latency_.scale; } -double Link::getBandwidth() +double LinkImpl::bandwidth() { - return p_speed.peak * p_speed.scale; + return bandwidth_.peak * bandwidth_.scale; } -int Link::sharingPolicy() +s4u::Link::SharingPolicy LinkImpl::sharingPolicy() { - return lmm_constraint_sharing_policy(getConstraint()); + return get_constraint()->get_sharing_policy(); } -void Link::turnOn(){ - if (isOff()) { - Resource::turnOn(); - onStateChange(this, 0, 1); +void LinkImpl::turn_on() +{ + if (is_off()) { + Resource::turn_on(); + s4u::Link::onStateChange(this->piface_); } } -void Link::turnOff(){ - if (isOn()) { - Resource::turnOff(); - onStateChange(this, 1, 0); +void LinkImpl::turn_off() +{ + 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", 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::setState(e_surf_action_state_t state){ - e_surf_action_state_t old = getState(); - Action::setState(state); - networkActionStateChangedCallbacks(this, old, state); +void NetworkAction::set_state(Action::State state) +{ + Action::set_state(state); + s4u::Link::onCommunicationStateChange(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_ */