X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b356ce9a510410f879eb3cd1b16b33856aebfdbe..ed06a04349269c97969b549f83f73d718246cc13:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index f88f52b66e..6521cfd300 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 @@ -20,45 +20,41 @@ namespace simgrid { /* List of links */ std::unordered_map* LinkImpl::links = new std::unordered_map(); - LinkImpl* LinkImpl::byName(const char* name) + LinkImpl* LinkImpl::byName(std::string name) { - if (links->find(name) == links->end()) - return nullptr; - return links->at(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_); } - /** @brief Returns a list of all existing links */ - LinkImpl** LinkImpl::linksList() - { - LinkImpl** res = xbt_new(LinkImpl*, (int)links->size()); - int i=0; - for (auto kv : *links) { - res[i++] = kv.second; - } - return res; - } - /** @brief destructor of the static data */ - void LinkImpl::linksExit() - { - for (auto kv : *links) - (kv.second)->destroy(); - delete links; - } - - /************* - * Callbacks * - *************/ - - simgrid::xbt::signal LinkImpl::onCreation; - simgrid::xbt::signal LinkImpl::onDestruction; - simgrid::xbt::signal LinkImpl::onStateChange; + } - simgrid::xbt::signal networkActionStateChangedCallbacks; - simgrid::xbt::signal LinkImpl::onCommunicate; + /** @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; + } } } @@ -109,19 +105,18 @@ namespace simgrid { * Resource * ************/ - LinkImpl::LinkImpl(simgrid::surf::NetworkModel* model, const char* name, lmm_constraint_t constraint) - : Resource(model, name, constraint), piface_(Link(this)) + LinkImpl::LinkImpl(simgrid::surf::NetworkModel* model, const std::string& name, lmm_constraint_t constraint) + : Resource(model, name, constraint), piface_(this) { - if (strcmp(name,"__loopback__")) - xbt_assert(!LinkImpl::byName(name), "Link '%s' declared several times in the platform.", name); + 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); - + XBT_DEBUG("Create link '%s'", name.c_str()); } /** @brief use destroy() instead of this destructor */ @@ -135,9 +130,9 @@ namespace simgrid { */ void LinkImpl::destroy() { - if (!currentlyDestroying_) { + if (not currentlyDestroying_) { currentlyDestroying_ = true; - onDestruction(this); + s4u::Link::onDestruction(this->piface_); delete this; } } @@ -166,30 +161,30 @@ namespace simgrid { { if (isOff()) { Resource::turnOn(); - onStateChange(this); + s4u::Link::onStateChange(this->piface_); } } void LinkImpl::turnOff() { if (isOn()) { Resource::turnOff(); - onStateChange(this); + 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", cname()); - stateEvent_ = future_evt_set->add_trace(trace, 0.0, this); + xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Link %s", getCname()); + 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", cname()); - 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 LinkImpl::setLatencyTrace(tmgr_trace_t trace) { - xbt_assert(latency_.event == nullptr, "Cannot set a second latency trace to Link %s", cname()); - 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); } @@ -197,12 +192,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; + lmm_system_t sys = getModel()->getMaxminSystem(); + int llen = lmm_get_number_of_cnst_from_var(sys, getVariable()); + + 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(lmm_constraint_id(lmm_get_cnst_from_var(sys, getVariable(), i))); + LinkImpl* link = dynamic_cast(resource); + if (link != nullptr) + retlist.push_back(link); + } + + return retlist; + } } }