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
Use std::vector for s_lmm_element_t::cnsts.
[simgrid.git]
/
src
/
surf
/
network_interface.cpp
diff --git
a/src/surf/network_interface.cpp
b/src/surf/network_interface.cpp
index
6e2569a
..
2bbbd86
100644
(file)
--- a/
src/surf/network_interface.cpp
+++ b/
src/surf/network_interface.cpp
@@
-63,7
+63,6
@@
namespace simgrid {
NetworkModel::~NetworkModel()
{
lmm_system_free(maxminSystem_);
NetworkModel::~NetworkModel()
{
lmm_system_free(maxminSystem_);
- xbt_heap_free(actionHeap_);
delete modifiedSet_;
}
delete modifiedSet_;
}
@@
-166,17
+165,17
@@
namespace simgrid {
}
void LinkImpl::setStateTrace(tmgr_trace_t trace)
{
}
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)
{
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)
{
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);
}
latency_.event = future_evt_set->add_trace(trace, this);
}
@@
-196,7
+195,7
@@
namespace simgrid {
{
std::list<LinkImpl*> retlist;
lmm_system_t sys = getModel()->getMaxminSystem();
{
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 */
for (int i = 0; i < llen; i++) {
/* Beware of composite actions: ptasks put links and cpus together */