X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a59892e02855ae21ccf6abd4925d962f81b384b2..6a711115accd081395c1ff0ac91835a612e9d781:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 6b258252f0..81c55be208 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -12,132 +12,43 @@ #ifndef NETWORK_INTERFACE_CPP_ #define NETWORK_INTERFACE_CPP_ -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, - "Logging specific to the SURF network module"); +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(const char* name) + { + if (links->find(name) == links->end()) + return nullptr; + return links->at(name); } - 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(); + /** @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; + i++; + } + return res; } - -} - -/***************** - * List of links * - *****************/ - -namespace simgrid { - namespace surf { - - 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) {} - - return res; - } - /** @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; - } - - /************* - * Callbacks * - *************/ - - simgrid::xbt::signal Link::onCreation; - simgrid::xbt::signal Link::onDestruction; - simgrid::xbt::signal Link::onStateChange; - - simgrid::xbt::signal networkActionStateChangedCallbacks; - simgrid::xbt::signal networkCommunicateCallbacks; - + /** @brief destructor of the static data */ + void LinkImpl::linksExit() + { + for (auto 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); - Link *l = surf_network_model->createLink(link_id, link->bandwidth, link->latency, - link->policy, link->properties); - if (link->latency_trace) - l->setLatencyTrace(link->latency_trace); - if (link->bandwidth_trace) - l->setBandwidthTrace(link->bandwidth_trace); - if (link->state_trace) - l->setStateTrace(link->state_trace); - - xbt_free(link_id); - link_id = bprintf("%s_DOWN", link->id); - l = surf_network_model->createLink(link_id, link->bandwidth, link->latency, - link->policy, link->properties); - if (link->latency_trace) - l->setLatencyTrace(link->latency_trace); - if (link->bandwidth_trace) - l->setBandwidthTrace(link->bandwidth_trace); - if (link->state_trace) - l->setStateTrace(link->state_trace); - xbt_free(link_id); - } else { - Link *l=surf_network_model->createLink(link->id, link->bandwidth, link->latency, - link->policy, link->properties); - if (link->latency_trace) - l->setLatencyTrace(link->latency_trace); - if (link->bandwidth_trace) - l->setBandwidthTrace(link->bandwidth_trace); - if (link->state_trace) - l->setStateTrace(link->state_trace); } } @@ -145,11 +56,18 @@ void netlink_parse_init(sg_platf_link_cbarg_t link){ * Model * *********/ -simgrid::surf::NetworkModel *surf_network_model = NULL; +simgrid::surf::NetworkModel *surf_network_model = nullptr; namespace simgrid { namespace surf { + NetworkModel::~NetworkModel() + { + lmm_system_free(maxminSystem_); + xbt_heap_free(actionHeap_); + delete modifiedSet_; + } + double NetworkModel::latencyFactor(double /*size*/) { return sg_latency_factor; } @@ -162,20 +80,14 @@ namespace simgrid { return rate; } - double NetworkModel::next_occuring_event_full(double now) + double NetworkModel::nextOccuringEventFull(double now) { - NetworkAction *action = NULL; - 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->m_latency > 0) { - minRes = (minRes < 0) ? action->m_latency : std::min(minRes, action->m_latency); - } + double minRes = Model::nextOccuringEventFull(now); + + for(auto it(getRunningActionSet()->begin()), itend(getRunningActionSet()->end()); it != itend ; it++) { + NetworkAction *action = static_cast(&*it); + if (action->latency_ > 0) + minRes = (minRes < 0) ? action->latency_ : std::min(minRes, action->latency_); } XBT_DEBUG("Min of share resources %f", minRes); @@ -187,23 +99,15 @@ 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 char* name, lmm_constraint_t 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 (strcmp(name,"__loopback__")) + xbt_assert(not LinkImpl::byName(name), "Link '%s' declared several times in the platform.", name); - Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint) - : Resource(model, name, constraint), - PropertyHolder(props) - { - m_latency.scale = 1; - m_bandwidth.scale = 1; + latency_.scale = 1; + bandwidth_.scale = 1; links->insert({name, this}); XBT_DEBUG("Create link '%s'",name); @@ -211,67 +115,71 @@ namespace simgrid { } /** @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 lmm_constraint_used(model()->getMaxminSystem(), 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 lmm_constraint_sharing_policy(constraint()); } - 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==NULL,"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", cname()); + 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==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", cname()); + 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==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", cname()); + latency_.event = future_evt_set->add_trace(trace, this); } @@ -279,12 +187,30 @@ namespace simgrid { * Action * **********/ - void NetworkAction::setState(e_surf_action_state_t state){ - e_surf_action_state_t 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, variable_); + + 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; + } } }