-/* 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 <algorithm>
-
#include "network_interface.hpp"
-#include "simgrid/sg_config.h"
+#include "simgrid/sg_config.hpp"
+#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
+#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 *
- *********/
-
-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<std::string,Link *> *Link::links = new boost::unordered_map<std::string,Link *>();
-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<std::string, LinkImpl*>* LinkImpl::links = new std::unordered_map<std::string, LinkImpl*>();
- 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<s4u::Link*>* 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)
+void LinkImpl::linksExit()
+{
+ for (auto const& kv : *links)
(kv.second)->destroy();
delete links;
}
-
-/*************
- * Callbacks *
- *************/
-
-simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onCreation;
-simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onDestruction;
-simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onStateChange;
-
-simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, e_surf_action_state_t, e_surf_action_state_t)> networkActionStateChangedCallbacks;
-simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, simgrid::surf::NetCard *src, simgrid::surf::NetCard *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->createLink(link_id,
- link->bandwidth,
- link->bandwidth_trace,
- link->latency,
- link->latency_trace,
- 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->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->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<double> 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<bool> 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::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<NetworkAction*>(&*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<const NetworkAction&>(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);
* 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});
- m_latency.scale = 1;
- m_bandwidth.scale = 1;
- 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_trace_t state_trace)
-: Resource(model, name, constraint),
- PropertyHolder(props)
-{
- m_latency.scale = 1;
- m_bandwidth.scale = 1;
- if (state_trace)
- m_stateEvent = future_evt_set->add_trace(state_trace, 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() {
+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_) {
+ if (not currentlyDestroying_) {
currentlyDestroying_ = true;
- onDestruction(this);
+ s4u::Link::on_destruction(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_latency.peak * m_latency.scale;
+ return latency_.peak * latency_.scale;
}
-double Link::getBandwidth()
+double LinkImpl::bandwidth()
{
- return m_bandwidth.peak * m_bandwidth.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);
+void LinkImpl::turn_on()
+{
+ if (is_off()) {
+ Resource::turn_on();
+ s4u::Link::on_state_change(this->piface_);
}
}
-void Link::turnOff(){
- if (isOn()) {
- Resource::turnOff();
- onStateChange(this);
+void LinkImpl::turn_off()
+{
+ if (is_on()) {
+ Resource::turn_off();
+ s4u::Link::on_state_change(this->piface_);
}
}
-void Link::set_state_trace(tmgr_trace_t trace)
+
+void LinkImpl::on_bandwidth_change()
{
- xbt_assert(m_stateEvent==NULL,"Cannot set a second state trace to Link %s", getName());
+ if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform())
+ instr::Container::by_name(get_cname())
+ ->get_variable("bandwidth")
+ ->set_event(surf_get_clock(), sg_bandwidth_factor * bandwidth_.scale * bandwidth_.peak);
+ s4u::Link::on_bandwidth_change(this->piface_);
+}
- m_stateEvent = future_evt_set->add_trace(trace, 0.0, this);
+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 Link::set_bandwidth_trace(tmgr_trace_t trace)
+void LinkImpl::setBandwidthTrace(tmgr_trace_t trace)
{
- xbt_assert(m_bandwidth.event==NULL,"Cannot set a second bandwidth trace to Link %s", getName());
-
- m_bandwidth.event = future_evt_set->add_trace(trace, 0.0, this);
+ 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 Link::set_latency_trace(tmgr_trace_t trace)
+void LinkImpl::setLatencyTrace(tmgr_trace_t trace)
{
- xbt_assert(m_latency.event==NULL,"Cannot set a second latency trace to Link %s", getName());
-
- m_latency.event = future_evt_set->add_trace(trace, 0.0, this);
+ 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::on_communication_state_change(this);
}
+/** @brief returns a list of all Links that this action is using */
+std::list<LinkImpl*> NetworkAction::links()
+{
+ std::list<LinkImpl*> 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<Resource*>(get_variable()->get_constraint(i)->get_id());
+ LinkImpl* link = dynamic_cast<LinkImpl*>(resource);
+ if (link != nullptr)
+ retlist.push_back(link);
+ }
+
+ return retlist;
+}
}
+} // namespace kernel
}
#endif /* NETWORK_INTERFACE_CPP_ */