A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
implement some more getters in surf::Link and s4u::Link
[simgrid.git]
/
src
/
surf
/
network_interface.cpp
diff --git
a/src/surf/network_interface.cpp
b/src/surf/network_interface.cpp
index
668f4ed
..
6521cfd
100644
(file)
--- a/
src/surf/network_interface.cpp
+++ b/
src/surf/network_interface.cpp
@@
-30,12
+30,19
@@
namespace simgrid {
{
return links->size();
}
+ void LinkImpl::linksList(std::vector<s4u::Link*>* linkList)
+ {
+ for (auto const& kv : *links) {
+ linkList->push_back(&kv.second->piface_);
+ }
+ }
+
/** @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) {
+ for (auto
const&
kv : *links) {
res[i] = kv.second;
i++;
}
@@
-44,7
+51,7
@@
namespace simgrid {
/** @brief destructor of the static data */
void LinkImpl::linksExit()
{
- for (auto kv : *links)
+ for (auto
const&
kv : *links)
(kv.second)->destroy();
delete links;
}
@@
-98,19
+105,18
@@
namespace simgrid {
* Resource *
************/
- LinkImpl::LinkImpl(simgrid::surf::NetworkModel* model, const
char*
name, lmm_constraint_t constraint)
+ 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(not 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 */
@@
-167,17
+173,17
@@
namespace simgrid {
}
void LinkImpl::setStateTrace(tmgr_trace_t trace)
{
- xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Link %s",
c
name());
+ xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Link %s",
getC
name());
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",
c
name());
+ xbt_assert(bandwidth_.event == nullptr, "Cannot set a second bandwidth trace to Link %s",
getC
name());
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",
c
name());
+ xbt_assert(latency_.event == nullptr, "Cannot set a second latency trace to Link %s",
getC
name());
latency_.event = future_evt_set->add_trace(trace, this);
}
@@
-197,7
+203,7
@@
namespace simgrid {
{
std::list<LinkImpl*> retlist;
lmm_system_t sys = getModel()->getMaxminSystem();
- int llen = lmm_get_number_of_cnst_from_var(sys,
variable_
);
+ int llen = lmm_get_number_of_cnst_from_var(sys,
getVariable()
);
for (int i = 0; i < llen; i++) {
/* Beware of composite actions: ptasks put links and cpus together */