-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-2017. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
/* List of links */
std::unordered_map<std::string, LinkImpl*>* LinkImpl::links = new std::unordered_map<std::string, LinkImpl*>();
- LinkImpl* LinkImpl::byName(const char* name)
+ LinkImpl* LinkImpl::byName(std::string name)
{
- if (links->find(name) == links->end())
- return nullptr;
- return links->at(name);
+ auto link = links->find(name);
+ return link == links->end() ? nullptr : link->second;
}
/** @brief Returns the amount of links in the platform */
int LinkImpl::linksCount()
{
return links->size();
+ }
+ /** @brief Returns a list of all existing links */
+ LinkImpl** LinkImpl::linksList()
+ {
+ LinkImpl** res = xbt_new(LinkImpl*, (int)links->size());
+ int i = 0;
+ for (auto const& kv : *links) {
+ res[i] = kv.second;
+ i++;
}
- /** @brief Returns a list of all existing links */
- LinkImpl** LinkImpl::linksList()
- {
- LinkImpl** res = xbt_new(LinkImpl*, (int)links->size());
- int i=0;
- for (auto kv : *links) {
- res[i++] = kv.second;
- }
- return res;
- }
- /** @brief destructor of the static data */
- void LinkImpl::linksExit()
- {
- for (auto kv : *links)
- (kv.second)->destroy();
- delete links;
- }
+ return res;
+ }
+ /** @brief destructor of the static data */
+ void LinkImpl::linksExit()
+ {
+ for (auto const& kv : *links)
+ (kv.second)->destroy();
+ delete links;
+ }
}
}
NetworkModel::~NetworkModel()
{
lmm_system_free(maxminSystem_);
- xbt_heap_free(actionHeap_);
delete modifiedSet_;
}
* Resource *
************/
- LinkImpl::LinkImpl(simgrid::surf::NetworkModel* model, const char* name, lmm_constraint_t constraint)
- : Resource(model, name, constraint), piface_(Link(this))
+ LinkImpl::LinkImpl(simgrid::surf::NetworkModel* model, const std::string& name, lmm_constraint_t constraint)
+ : Resource(model, name, constraint), piface_(this)
{
- if (strcmp(name,"__loopback__"))
- xbt_assert(!LinkImpl::byName(name), "Link '%s' declared several times in the platform.", name);
+ if (name != "__loopback__")
+ xbt_assert(not LinkImpl::byName(name), "Link '%s' declared several times in the platform.", name.c_str());
latency_.scale = 1;
bandwidth_.scale = 1;
links->insert({name, this});
- XBT_DEBUG("Create link '%s'",name);
-
+ XBT_DEBUG("Create link '%s'", name.c_str());
}
/** @brief use destroy() instead of this destructor */
*/
void LinkImpl::destroy()
{
- if (!currentlyDestroying_) {
+ if (not currentlyDestroying_) {
currentlyDestroying_ = true;
s4u::Link::onDestruction(this->piface_);
delete this;
}
void LinkImpl::setStateTrace(tmgr_trace_t trace)
{
- xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Link %s", cname());
- stateEvent_ = future_evt_set->add_trace(trace, 0.0, this);
+ xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Link %s", getCname());
+ stateEvent_ = future_evt_set->add_trace(trace, this);
}
void LinkImpl::setBandwidthTrace(tmgr_trace_t trace)
{
- xbt_assert(bandwidth_.event == nullptr, "Cannot set a second bandwidth trace to Link %s", cname());
- bandwidth_.event = future_evt_set->add_trace(trace, 0.0, this);
+ xbt_assert(bandwidth_.event == nullptr, "Cannot set a second bandwidth trace to Link %s", getCname());
+ bandwidth_.event = future_evt_set->add_trace(trace, this);
}
void LinkImpl::setLatencyTrace(tmgr_trace_t trace)
{
- xbt_assert(latency_.event == nullptr, "Cannot set a second latency trace to Link %s", cname());
- latency_.event = future_evt_set->add_trace(trace, 0.0, this);
+ xbt_assert(latency_.event == nullptr, "Cannot set a second latency trace to Link %s", getCname());
+ latency_.event = future_evt_set->add_trace(trace, this);
}