#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 *
boost::unordered_map<std::string,Link *> *Link::links = new boost::unordered_map<std::string,Link *>();
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 NULL;
+ return links->at(name);
}
/** @brief Returns the amount of links in the platform */
int Link::linksCount() {
}
void netlink_parse_init(sg_platf_link_cbarg_t link){
+ std::vector<char*> names;
+
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->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->state_trace, link->policy, link->properties);
- xbt_free(link_id);
+ names.push_back(bprintf("%s_UP", link->id));
+ names.push_back(bprintf("%s_DOWN", link->id));
} else {
- surf_network_model->createLink(link->id,
- link->bandwidth,
- link->bandwidth_trace,
- link->latency,
- link->latency_trace,
- link->state_trace, link->policy, link->properties);
+ names.push_back(xbt_strdup(link->id));
+ }
+ for (auto link_name : names) {
+ Link *l = surf_network_model->createLink(link_name, 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_name);
}
}
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) {
XBT_DEBUG("Create link '%s'",name);
}
- Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props,
- lmm_constraint_t constraint,
- tmgr_trace_t state_trace)
+ 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;
- if (state_trace)
- m_stateEvent = future_evt_set->add_trace(state_trace, 0.0, this);
links->insert({name, this});
XBT_DEBUG("Create link '%s'",name);
onStateChange(this);
}
}
- void Link::set_state_trace(tmgr_trace_t trace)
- {
+ 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 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());
-
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());
-
m_latency.event = future_evt_set->add_trace(trace, 0.0, this);
}