X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f369ede376801d20323abaf6a7f72fe230acd562..b3b356352e87ae00a20f737c48e19b0c8413455a:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 63f13561a8..9fd4ccc489 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -1,4 +1,4 @@ -/* 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 @@ -13,21 +13,88 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module"); +/********* + * C API * + *********/ +SG_BEGIN_DECL() +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->isShared(); +} +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_amount(void) { + return Link::linksAmount(); +} +Link** sg_link_list(void) { + return Link::linksList(); +} +void sg_link_exit(void) { + Link::linksExit(); +} +SG_END_DECL() +/***************** + * List of links * + *****************/ + +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::linksAmount() { + 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) + delete (kv.second); +} /************* * Callbacks * *************/ -surf_callback(void, NetworkLinkPtr) networkLinkCreatedCallbacks; -surf_callback(void, NetworkLinkPtr) networkLinkDestructedCallbacks; -surf_callback(void, NetworkLinkPtr, e_surf_resource_state_t, e_surf_resource_state_t) networkLinkStateChangedCallbacks; -surf_callback(void, NetworkActionPtr, e_surf_action_state_t, e_surf_action_state_t) networkActionStateChangedCallbacks; -surf_callback(void, NetworkActionPtr, RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate) networkCommunicateCallbacks; +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; 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->createNetworkLink(link_id, + surf_network_model->createLink(link_id, link->bandwidth, link->bandwidth_trace, link->latency, @@ -36,7 +103,7 @@ void netlink_parse_init(sg_platf_link_cbarg_t link){ link->state_trace, link->policy, link->properties); xbt_free(link_id); link_id = bprintf("%s_DOWN", link->id); - surf_network_model->createNetworkLink(link_id, + surf_network_model->createLink(link_id, link->bandwidth, link->bandwidth_trace, link->latency, @@ -45,13 +112,13 @@ void netlink_parse_init(sg_platf_link_cbarg_t link){ link->state_trace, link->policy, link->properties); xbt_free(link_id); } else { - surf_network_model->createNetworkLink(link->id, - link->bandwidth, - link->bandwidth_trace, - link->latency, - link->latency_trace, - link->state, - link->state_trace, link->policy, link->properties); + surf_network_model->createLink(link->id, + link->bandwidth, + link->bandwidth_trace, + link->latency, + link->latency_trace, + link->state, + link->state_trace, link->policy, link->properties); } } @@ -63,7 +130,7 @@ void net_add_traces(){ * Model * *********/ -NetworkModelPtr surf_network_model = NULL; +NetworkModel *surf_network_model = NULL; double NetworkModel::latencyFactor(double /*size*/) { return sg_latency_factor; @@ -79,15 +146,15 @@ double NetworkModel::bandwidthConstraint(double rate, double /*bound*/, double / double NetworkModel::shareResourcesFull(double now) { - NetworkActionPtr action = NULL; - ActionListPtr runningActions = surf_network_model->getRunningActionSet(); + 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); + action = static_cast(&*it); #ifdef HAVE_LATENCY_BOUND_TRACKING if (lmm_is_variable_limited_by_latency(action->getVariable())) { action->m_latencyLimited = 1; @@ -109,14 +176,17 @@ double NetworkModel::shareResourcesFull(double now) * Resource * ************/ -NetworkLink::NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props) +Link::Link(NetworkModel *model, const char *name, xbt_dict_t props) : Resource(model, name, props) , p_latEvent(NULL) { surf_callback_emit(networkLinkCreatedCallbacks, this); + links->insert({name, this}); + + XBT_DEBUG("Create link '%s'",name); } -NetworkLink::NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props, +Link::Link(NetworkModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint, tmgr_history_t history, tmgr_trace_t state_trace) @@ -126,39 +196,45 @@ NetworkLink::NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t pro surf_callback_emit(networkLinkCreatedCallbacks, this); if (state_trace) p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, this); + + links->insert({name, this}); + XBT_DEBUG("Create link '%s'",name); + } -NetworkLink::~NetworkLink() +Link::~Link() { surf_callback_emit(networkLinkDestructedCallbacks, this); } -bool NetworkLink::isUsed() +bool Link::isUsed() { return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); } -double NetworkLink::getLatency() +double Link::getLatency() { return m_latCurrent; } -double NetworkLink::getBandwidth() +double Link::getBandwidth() { return p_power.peak * p_power.scale; } -bool NetworkLink::isShared() +bool Link::isShared() { return lmm_constraint_is_shared(getConstraint()); } -void NetworkLink::setState(e_surf_resource_state_t state){ +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); } + + /********** * Action * **********/