X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bbe6c726ee543b902eed02a60cd49fb3f6e83462..b34091e09160c288b36b9bcd1b6e828aeeb0976b:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index ed0dd2188d..00ea637a3d 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 * @@ -43,13 +42,13 @@ extern "C" { void sg_link_data_set(Link *link,void *data) { link->setData(data); } - int sg_link_count(void) { + int sg_link_count() { return Link::linksCount(); } - Link** sg_link_list(void) { + Link** sg_link_list() { return Link::linksList(); } - void sg_link_exit(void) { + void sg_link_exit() { Link::linksExit(); } @@ -64,12 +63,9 @@ namespace simgrid { 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; + if (links->find(name) == links->end()) + return nullptr; + return links->at(name); } /** @brief Returns the amount of links in the platform */ int Link::linksCount() { @@ -95,49 +91,13 @@ namespace simgrid { * Callbacks * *************/ - simgrid::xbt::signal Link::onCreation; - simgrid::xbt::signal Link::onDestruction; - simgrid::xbt::signal Link::onStateChange; - - 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); - Link *l = surf_network_model->createLink(link_id, - link->bandwidth, - link->bandwidth_trace, - link->latency, - link->latency_trace, - link->policy, link->properties); - 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->bandwidth_trace, - link->latency, - link->latency_trace, - link->policy, link->properties); - 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->bandwidth_trace, - link->latency, - link->latency_trace, - link->policy, link->properties); - if (link->state_trace) - l->setStateTrace(link->state_trace); } } @@ -145,11 +105,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; } @@ -164,17 +131,17 @@ namespace simgrid { double NetworkModel::next_occuring_event_full(double now) { - NetworkAction *action = NULL; + NetworkAction *action = nullptr; ActionList *runningActions = surf_network_model->getRunningActionSet(); double minRes; - minRes = shareResourcesMaxMin(runningActions, surf_network_model->p_maxminSystem, surf_network_model->f_networkSolve); + 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); + if (action->latency_ > 0) { + minRes = (minRes < 0) ? action->latency_ : std::min(minRes, action->latency_); } } @@ -202,6 +169,9 @@ namespace simgrid { : 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; @@ -209,11 +179,6 @@ namespace simgrid { XBT_DEBUG("Create link '%s'",name); } - void Link::setStateTrace(tmgr_trace_t trace) { - if (m_stateEvent != nullptr) - XBT_INFO("Changing the state trace is not well tested. You're on your own."); - m_stateEvent = future_evt_set->add_trace(trace, 0.0, this); - } /** @brief use destroy() instead of this destructor */ Link::~Link() { @@ -264,22 +229,18 @@ namespace simgrid { 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()); - + 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::set_bandwidth_trace(tmgr_trace_t trace) + void Link::setBandwidthTrace(tmgr_trace_t trace) { - xbt_assert(m_bandwidth.event==NULL,"Cannot set a second bandwidth trace to Link %s", getName()); - + 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::set_latency_trace(tmgr_trace_t trace) + void Link::setLatencyTrace(tmgr_trace_t trace) { - xbt_assert(m_latency.event==NULL,"Cannot set a second latency trace to Link %s", getName()); - + 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); } @@ -288,8 +249,8 @@ 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::State old = getState(); Action::setState(state); networkActionStateChangedCallbacks(this, old, state); }