X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae6b6e727bc0b3b7726f48fbac4449c3a9c479a2..dac676c1180a5ea95897072e55f698433a857d90:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 7912f2078d..c53c07dee3 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. +/* Copyright (c) 2013-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -14,90 +14,47 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module"); -/********* - * C API * - *********/ - -extern "C" { +namespace simgrid { + namespace surf { - const char* sg_link_name(Link *link) { - return link->getName(); - } - Link * sg_link_by_name(const char* name) { - return Link::byName(name); - } + /* List of links */ + std::unordered_map* LinkImpl::links = new std::unordered_map(); - 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(); + LinkImpl* LinkImpl::byName(std::string name) + { + auto link = links->find(name); + return link == links->end() ? nullptr : link->second; } - Link** sg_link_list(void) { - return Link::linksList(); + /** @brief Returns the amount of links in the platform */ + int LinkImpl::linksCount() + { + return links->size(); } - void sg_link_exit(void) { - Link::linksExit(); + void LinkImpl::linksList(std::vector* linkList) + { + for (auto const& kv : *links) { + linkList->push_back(&kv.second->piface_); + } } -} - -/***************** - * List of links * - *****************/ - -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; + /** @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++; } - - /************* - * 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; - + return res; + } + /** @brief destructor of the static data */ + void LinkImpl::linksExit() + { + for (auto const& kv : *links) + (kv.second)->destroy(); + delete links; + } } } @@ -110,12 +67,7 @@ simgrid::surf::NetworkModel *surf_network_model = nullptr; namespace simgrid { namespace surf { - NetworkModel::~NetworkModel() - { - lmm_system_free(maxminSystem_); - xbt_heap_free(actionHeap_); - delete modifiedSet_; - } + NetworkModel::~NetworkModel() = default; double NetworkModel::latencyFactor(double /*size*/) { return sg_latency_factor; @@ -129,20 +81,14 @@ namespace simgrid { return rate; } - double NetworkModel::next_occuring_event_full(double now) + double NetworkModel::nextOccuringEventFull(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_); - } + double minRes = Model::nextOccuringEventFull(now); + + for (Action const& action : *getRunningActionSet()) { + 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); @@ -154,94 +100,86 @@ namespace simgrid { * Resource * ************/ - Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props) - : Resource(model, name), - PropertyHolder(props) + LinkImpl::LinkImpl(simgrid::surf::NetworkModel* model, const std::string& name, kernel::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) - : 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; + 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::onDestruction(this->piface_); delete this; } } - bool Link::isUsed() + bool LinkImpl::isUsed() { - return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); + return model()->getMaxminSystem()->constraint_used(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() + int LinkImpl::sharingPolicy() { - return lmm_constraint_sharing_policy(getConstraint()); + return constraint()->get_sharing_policy(); } - void Link::turnOn(){ + void LinkImpl::turnOn() + { if (isOff()) { Resource::turnOn(); - onStateChange(this); + s4u::Link::onStateChange(this->piface_); } } - void Link::turnOff(){ + void LinkImpl::turnOff() + { if (isOn()) { Resource::turnOff(); - onStateChange(this); + s4u::Link::onStateChange(this->piface_); } } - 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 LinkImpl::setStateTrace(tmgr_trace_t trace) + { + xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Link %s", getCname()); + stateEvent_ = future_evt_set->add_trace(trace, this); } - void Link::setBandwidthTrace(tmgr_trace_t trace) + void LinkImpl::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); + xbt_assert(bandwidth_.event == nullptr, "Cannot set a second bandwidth trace to Link %s", getCname()); + bandwidth_.event = future_evt_set->add_trace(trace, this); } - void Link::setLatencyTrace(tmgr_trace_t trace) + void LinkImpl::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); + xbt_assert(latency_.event == nullptr, "Cannot set a second latency trace to Link %s", getCname()); + latency_.event = future_evt_set->add_trace(trace, this); } @@ -249,12 +187,30 @@ namespace simgrid { * Action * **********/ - void NetworkAction::setState(Action::State state){ - Action::State old = getState(); + void NetworkAction::setState(Action::State state) + { Action::setState(state); - networkActionStateChangedCallbacks(this, old, 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 = getVariable()->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*... + kernel::resource::Resource* resource = + static_cast(getVariable()->get_constraint(i)->get_id()); + LinkImpl* link = dynamic_cast(resource); + if (link != nullptr) + retlist.push_back(link); + } + + return retlist; + } } }