X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/416eebc1f127894d201c28c05c4900eb660d657c..8391d02b6a83f0cececc6957e5d7b9e70781fe09:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 4694f9ddbe..147747ac0e 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -1,144 +1,232 @@ -/* Copyright (c) 2013-2014. 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 "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"); - -/************* - * Callbacks * - *************/ - -surf_callback(void, NetworkLinkPtr) networkLinkCreatedCallbacks; -surf_callback(void, NetworkLinkPtr) networkLinkDestructedCallbacks; -surf_callback(void, NetworkLinkPtr, e_surf_resource_state_t, e_surf_resource_state_t) networkLinkStateChangedCallbacks; -surf_callback(void, NetworkActionPtr, e_surf_action_state_t, e_surf_action_state_t) networkActionStateChangedCallbacks; -surf_callback(void, NetworkActionPtr, RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate) networkCommunicateCallbacks; - -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->createNetworkLink(link_id, - link->bandwidth, - link->bandwidth_trace, - link->latency, - link->latency_trace, - link->state, - link->state_trace, link->policy, link->properties); - xbt_free(link_id); - link_id = bprintf("%s_DOWN", link->id); - surf_network_model->createNetworkLink(link_id, - link->bandwidth, - link->bandwidth_trace, - link->latency, - link->latency_trace, - link->state, - link->state_trace, link->policy, link->properties); - xbt_free(link_id); - } else { - surf_network_model->createNetworkLink(link->id, - link->bandwidth, - link->bandwidth_trace, - link->latency, - link->latency_trace, - link->state, - link->state_trace, link->policy, link->properties); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module"); + +namespace simgrid { +namespace kernel { +namespace resource { + +/* 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; +} +/** @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_); } } -void net_add_traces(){ - surf_network_model->addTraces(); +/** @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++; + } + return res; +} +/** @brief destructor of the static data */ +void LinkImpl::linksExit() +{ + for (auto const& kv : *links) + (kv.second)->destroy(); + delete links; +} } +} +} // namespace simgrid /********* * Model * *********/ -NetworkModelPtr surf_network_model = NULL; +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"); -double NetworkModel::latencyFactor(double /*size*/) { +NetworkModel::~NetworkModel() = default; + +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::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_); + } + + XBT_DEBUG("Min of share resources %f", minRes); + + return minRes; +} + /************ * Resource * ************/ -NetworkLink::NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props) -: Resource(model, name, props) -, p_latEvent(NULL) +LinkImpl::LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint) + : Resource(model, name, constraint), piface_(this) { - surf_callback_emit(networkLinkCreatedCallbacks, 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()); } -NetworkLink::NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props, - lmm_constraint_t constraint, - tmgr_history_t history, - tmgr_trace_t state_trace) -: Resource(model, name, props, constraint), - p_latEvent(NULL) +/** @brief use destroy() instead of this destructor */ +LinkImpl::~LinkImpl() { - surf_callback_emit(networkLinkCreatedCallbacks, this); - if (state_trace) - p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, this); + xbt_assert(currentlyDestroying_, "Don't delete Links directly. Call destroy() instead."); } - -NetworkLink::~NetworkLink() +/** @brief Fire the required callbacks and destroy the object + * + * Don't delete directly a Link, call l->destroy() instead. + */ +void LinkImpl::destroy() { - surf_callback_emit(networkLinkDestructedCallbacks, this); + if (not currentlyDestroying_) { + currentlyDestroying_ = true; + s4u::Link::onDestruction(this->piface_); + delete this; + } } -bool NetworkLink::isUsed() +bool LinkImpl::is_used() { - return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); + return get_model()->get_maxmin_system()->constraint_used(get_constraint()); } -double NetworkLink::getLatency() +double LinkImpl::latency() { - return m_latCurrent; + return latency_.peak * latency_.scale; } -double NetworkLink::getBandwidth() +double LinkImpl::bandwidth() { - return p_power.peak * p_power.scale; + return bandwidth_.peak * bandwidth_.scale; } -bool NetworkLink::isShared() +s4u::Link::SharingPolicy LinkImpl::sharingPolicy() { - return lmm_constraint_is_shared(getConstraint()); + return get_constraint()->get_sharing_policy(); } -void NetworkLink::setState(e_surf_resource_state_t state){ - e_surf_resource_state_t old = Resource::getState(); - Resource::setState(state); - surf_callback_emit(networkLinkStateChangedCallbacks, this, old, state); +void LinkImpl::turn_on() +{ + if (is_off()) { + Resource::turn_on(); + s4u::Link::onStateChange(this->piface_); + } +} +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); - surf_callback_emit(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_ */