X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54e35ebda7e4ffacd769653b8ebb8ba93c7298bf..1bd3b1e9e02dd5662a771c1b382cfa1d1d9a2e08:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 37ee98e702..323652b6c1 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -1,9 +1,11 @@ -/* Copyright (c) 2013-2014. The SimGrid Team. +/* Copyright (c) 2013-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include + #include "network_interface.hpp" #include "simgrid/sg_config.h" @@ -16,7 +18,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, /********* * C API * *********/ -SG_BEGIN_DECL() + +extern "C" { + const char* sg_link_name(Link *link) { return link->getName(); } @@ -25,7 +29,7 @@ Link * sg_link_by_name(const char* name) { } int sg_link_is_shared(Link *link){ - return link->isShared(); + return link->sharingPolicy(); } double sg_link_bandwidth(Link *link){ return link->getBandwidth(); @@ -39,8 +43,8 @@ void* sg_link_data(Link *link) { void sg_link_data_set(Link *link,void *data) { link->setData(data); } -int sg_link_amount(void) { - return Link::linksAmount(); +int sg_link_count(void) { + return Link::linksCount(); } Link** sg_link_list(void) { return Link::linksList(); @@ -48,11 +52,16 @@ Link** sg_link_list(void) { void sg_link_exit(void) { Link::linksExit(); } -SG_END_DECL() + +} + /***************** * 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; @@ -63,7 +72,7 @@ Link *Link::byName(const char* name) { return res; } /** @brief Returns the amount of links in the platform */ -int Link::linksAmount() { +int Link::linksCount() { return links->size(); } /** @brief Returns a list of all existing links */ @@ -78,17 +87,23 @@ Link **Link::linksList() { /** @brief destructor of the static data */ void Link::linksExit() { for (auto kv : *links) - delete (kv.second); + (kv.second)->destroy(); + delete links; } + /************* * Callbacks * *************/ -surf_callback(void, Link*) networkLinkCreatedCallbacks; -surf_callback(void, Link*) networkLinkDestructedCallbacks; -surf_callback(void, Link*, e_surf_resource_state_t, e_surf_resource_state_t) networkLinkStateChangedCallbacks; -surf_callback(void, NetworkAction*, e_surf_action_state_t, e_surf_action_state_t) networkActionStateChangedCallbacks; -surf_callback(void, NetworkAction*, RoutingEdge *src, RoutingEdge *dst, double size, double rate) networkCommunicateCallbacks; +simgrid::xbt::signal Link::onCreation; +simgrid::xbt::signal Link::onDestruction; +simgrid::xbt::signal Link::onStateChange; // signature: wasOn, currentlyOn + +simgrid::xbt::signal networkActionStateChangedCallbacks; +simgrid::xbt::signal networkCommunicateCallbacks; + +} +} void netlink_parse_init(sg_platf_link_cbarg_t link){ if (link->policy == SURF_LINK_FULLDUPLEX) { @@ -99,7 +114,7 @@ void netlink_parse_init(sg_platf_link_cbarg_t link){ link->bandwidth_trace, link->latency, link->latency_trace, - link->state, + link->initiallyOn, link->state_trace, link->policy, link->properties); xbt_free(link_id); link_id = bprintf("%s_DOWN", link->id); @@ -108,7 +123,7 @@ void netlink_parse_init(sg_platf_link_cbarg_t link){ link->bandwidth_trace, link->latency, link->latency_trace, - link->state, + link->initiallyOn, link->state_trace, link->policy, link->properties); xbt_free(link_id); } else { @@ -117,20 +132,19 @@ void netlink_parse_init(sg_platf_link_cbarg_t link){ link->bandwidth_trace, link->latency, link->latency_trace, - link->state, + link->initiallyOn, link->state_trace, link->policy, link->properties); } } -void net_add_traces(){ - surf_network_model->addTraces(); -} - /********* * Model * *********/ -NetworkModel *surf_network_model = NULL; +simgrid::surf::NetworkModel *surf_network_model = NULL; + +namespace simgrid { +namespace surf { double NetworkModel::latencyFactor(double /*size*/) { return sg_latency_factor; @@ -163,7 +177,7 @@ double NetworkModel::shareResourcesFull(double now) } #endif if (action->m_latency > 0) { - minRes = (minRes < 0) ? action->m_latency : min(minRes, action->m_latency); + minRes = (minRes < 0) ? action->m_latency : std::min(minRes, action->m_latency); } } @@ -176,35 +190,45 @@ double NetworkModel::shareResourcesFull(double now) * Resource * ************/ -Link::Link(NetworkModel *model, const char *name, xbt_dict_t props) -: Resource(model, name, props) -, p_latEvent(NULL) +Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props) +: Resource(model, name), + PropertyHolder(props) { - surf_callback_emit(networkLinkCreatedCallbacks, this); links->insert({name, this}); XBT_DEBUG("Create link '%s'",name); } -Link::Link(NetworkModel *model, const char *name, xbt_dict_t props, +Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint, - tmgr_history_t history, + sg_future_evt_set_t fes, tmgr_trace_t state_trace) -: Resource(model, name, props, constraint), - p_latEvent(NULL) +: Resource(model, name, constraint), + PropertyHolder(props) { - surf_callback_emit(networkLinkCreatedCallbacks, this); if (state_trace) - p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, this); + p_stateEvent = fes->add_trace(state_trace, 0.0, 0, this); links->insert({name, this}); XBT_DEBUG("Create link '%s'",name); } -Link::~Link() +/** @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() { - surf_callback_emit(networkLinkDestructedCallbacks, this); + if (!currentlyDestroying_) { + currentlyDestroying_ = true; + onDestruction(this); + delete this; + } } bool Link::isUsed() @@ -219,21 +243,26 @@ double Link::getLatency() double Link::getBandwidth() { - return p_power.peak * p_power.scale; + return p_speed.peak * p_speed.scale; } -bool Link::isShared() +int Link::sharingPolicy() { - return lmm_constraint_is_shared(getConstraint()); + return lmm_constraint_sharing_policy(getConstraint()); } -void Link::setState(e_surf_resource_state_t state){ - e_surf_resource_state_t old = Resource::getState(); - Resource::setState(state); - surf_callback_emit(networkLinkStateChangedCallbacks, this, old, state); +void Link::turnOn(){ + if (isOff()) { + Resource::turnOn(); + onStateChange(this, 0, 1); + } +} +void Link::turnOff(){ + if (isOn()) { + Resource::turnOff(); + onStateChange(this, 1, 0); + } } - - /********** * Action * @@ -242,7 +271,10 @@ void Link::setState(e_surf_resource_state_t state){ void NetworkAction::setState(e_surf_action_state_t state){ e_surf_action_state_t old = getState(); Action::setState(state); - surf_callback_emit(networkActionStateChangedCallbacks, this, old, state); + networkActionStateChangedCallbacks(this, old, state); +} + +} } #endif /* NETWORK_INTERFACE_CPP_ */