X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf108868b4eeed4d0d9d343bc68557d7814e18c0..38fa7b2d3e69aa9aa4957b2b847bec34bc1096ac:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 547145bbb3..6a0a74a6b7 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -12,8 +12,7 @@ #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 * @@ -21,37 +20,37 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, extern "C" { -const char* sg_link_name(Link *link) { - return link->getName(); -} -Link * sg_link_by_name(const char* name) { - return Link::byName(name); -} + 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(); -} + 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() { + return Link::linksCount(); + } + Link** sg_link_list() { + return Link::linksList(); + } + void sg_link_exit() { + Link::linksExit(); + } } @@ -60,80 +59,45 @@ void sg_link_exit(void) { *****************/ 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) {} + namespace surf { - 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; + std::unordered_map *Link::links = new std::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; } - 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; + /************* + * Callbacks * + *************/ -simgrid::xbt::signal networkActionStateChangedCallbacks; -simgrid::xbt::signal networkCommunicateCallbacks; + simgrid::xbt::signal Link::onCreation; + simgrid::xbt::signal Link::onDestruction; + simgrid::xbt::signal Link::onStateChange; -} -} + simgrid::xbt::signal networkActionStateChangedCallbacks; + simgrid::xbt::signal Link::onCommunicate; -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->initiallyOn, - 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->initiallyOn, - 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->initiallyOn, - link->state_trace, link->policy, link->properties); } } @@ -141,162 +105,153 @@ 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 { - -double NetworkModel::latencyFactor(double /*size*/) { - return sg_latency_factor; -} + namespace surf { -double NetworkModel::bandwidthFactor(double /*size*/) { - return sg_bandwidth_factor; -} + NetworkModel::~NetworkModel() + { + lmm_system_free(maxminSystem_); + xbt_heap_free(actionHeap_); + delete modifiedSet_; + } -double NetworkModel::bandwidthConstraint(double rate, double /*bound*/, double /*size*/) { - return rate; -} + double NetworkModel::latencyFactor(double /*size*/) { + return sg_latency_factor; + } -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(&*it); -#ifdef HAVE_LATENCY_BOUND_TRACKING - if (lmm_is_variable_limited_by_latency(action->getVariable())) { - action->m_latencyLimited = 1; - } else { - action->m_latencyLimited = 0; + double NetworkModel::bandwidthFactor(double /*size*/) { + return sg_bandwidth_factor; } -#endif - if (action->m_latency > 0) { - minRes = (minRes < 0) ? action->m_latency : std::min(minRes, action->m_latency); + + double NetworkModel::bandwidthConstraint(double rate, double /*bound*/, double /*size*/) { + return rate; } - } - XBT_DEBUG("Min of share resources %f", minRes); + double NetworkModel::next_occuring_event_full(double now) + { + ActionList *runningActions = surf_network_model->getRunningActionSet(); + double minRes = shareResourcesMaxMin(runningActions, surf_network_model->maxminSystem_, surf_network_model->f_networkSolve); - return minRes; -} + for(ActionList::iterator it(runningActions->begin()), itend(runningActions->end()) + ; it != itend ; ++it) { + NetworkAction *action = static_cast(&*it); + if (action->latency_ > 0) + minRes = (minRes < 0) ? action->latency_ : std::min(minRes, action->latency_); + } -/************ - * Resource * - ************/ + XBT_DEBUG("Min of share resources %f", minRes); -Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props) -: Resource(model, name), - PropertyHolder(props) -{ - links->insert({name, this}); + return minRes; + } - m_latency.scale = 1; - m_bandwidth.scale = 1; - XBT_DEBUG("Create link '%s'",name); -} + /************ + * Resource * + ************/ -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); + Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props) + : Resource(model, name), + PropertyHolder(props) + { + links->insert({name, this}); - links->insert({name, this}); - XBT_DEBUG("Create link '%s'",name); + m_latency.scale = 1; + m_bandwidth.scale = 1; + XBT_DEBUG("Create link '%s'",name); + } -} + 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); -/** @brief use destroy() instead of this destructor */ -Link::~Link() { - xbt_assert(currentlyDestroying_, "Don't delete Links directly. Call destroy() instead."); -} -/** @brief Fire the require callbacks and destroy the object - * - * Don't delete directly an Link, call l->destroy() instead. - */ -void Link::destroy() -{ - if (!currentlyDestroying_) { - currentlyDestroying_ = true; - onDestruction(this); - delete this; - } -} + m_latency.scale = 1; + m_bandwidth.scale = 1; -bool Link::isUsed() -{ - return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); -} + links->insert({name, this}); + XBT_DEBUG("Create link '%s'",name); -double Link::getLatency() -{ - return m_latency.peak * m_latency.scale; -} + } -double Link::getBandwidth() -{ - return m_bandwidth.peak * m_bandwidth.scale; -} + /** @brief use destroy() instead of this destructor */ + Link::~Link() { + xbt_assert(currentlyDestroying_, "Don't delete Links directly. Call destroy() instead."); + } + /** @brief Fire the require callbacks and destroy the object + * + * Don't delete directly an Link, call l->destroy() instead. + */ + void Link::destroy() + { + if (!currentlyDestroying_) { + currentlyDestroying_ = true; + onDestruction(this); + delete this; + } + } -int Link::sharingPolicy() -{ - return lmm_constraint_sharing_policy(getConstraint()); -} + bool Link::isUsed() + { + return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); + } -void Link::turnOn(){ - if (isOff()) { - Resource::turnOn(); - onStateChange(this); - } -} -void Link::turnOff(){ - if (isOn()) { - Resource::turnOff(); - onStateChange(this); - } -} -void Link::set_state_trace(tmgr_trace_t trace) -{ - xbt_assert(m_stateEvent==NULL,"Cannot set a second state trace to Link %s", getName()); + double Link::getLatency() + { + return m_latency.peak * m_latency.scale; + } - m_stateEvent = future_evt_set->add_trace(trace, 0.0, this); -} -void Link::set_bandwidth_trace(tmgr_trace_t trace) -{ - xbt_assert(m_bandwidth.event==NULL,"Cannot set a second bandwidth trace to Link %s", getName()); + double Link::getBandwidth() + { + return m_bandwidth.peak * m_bandwidth.scale; + } - m_bandwidth.event = future_evt_set->add_trace(trace, 0.0, this); -} -void Link::set_latency_trace(tmgr_trace_t trace) -{ - xbt_assert(m_latency.event==NULL,"Cannot set a second latency trace to Link %s", getName()); + int Link::sharingPolicy() + { + return lmm_constraint_sharing_policy(getConstraint()); + } - m_latency.event = future_evt_set->add_trace(trace, 0.0, this); -} + void Link::turnOn(){ + if (isOff()) { + Resource::turnOn(); + onStateChange(this); + } + } + void Link::turnOff(){ + if (isOn()) { + Resource::turnOff(); + onStateChange(this); + } + } + 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 Link::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); + } + void Link::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); + } -/********** - * Action * - **********/ + /********** + * 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::setState(Action::State state){ + Action::State old = getState(); + Action::setState(state); + networkActionStateChangedCallbacks(this, old, state); + } -} + } } #endif /* NETWORK_INTERFACE_CPP_ */