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
plug another similar memleak. The solution is not nicer
[simgrid.git]
/
src
/
surf
/
network_ns3.cpp
diff --git
a/src/surf/network_ns3.cpp
b/src/surf/network_ns3.cpp
index
5675e73
..
c095a64
100644
(file)
--- a/
src/surf/network_ns3.cpp
+++ b/
src/surf/network_ns3.cpp
@@
-301,9
+301,9
@@
Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst,
return (surf_action_t) action;
}
return (surf_action_t) action;
}
-double NetworkNS3Model::
shareResources
(double now)
+double NetworkNS3Model::
next_occuring_event
(double now)
{
{
- XBT_DEBUG("ns3_
share_resources
");
+ XBT_DEBUG("ns3_
next_occuring_event
");
//get the first relevant value from the running_actions list
if (!getRunningActionSet()->size() || now == 0.0)
//get the first relevant value from the running_actions list
if (!getRunningActionSet()->size() || now == 0.0)
@@
-393,18
+393,17
@@
NetworkNS3Link::NetworkNS3Link(NetworkNS3Model *model, const char *name, xbt_dic
: Link(model, name, props)
, m_created(1)
{
: Link(model, name, props)
, m_created(1)
{
- p_speed.scale = 1.0;
- p_speed.peak = bw_initial;
- m_latCurrent = lat_initial;
+ m_bandwidth.peak = bw_initial;
+ m_latency.peak = lat_initial;
}
NetworkNS3Link::~NetworkNS3Link()
{
}
}
NetworkNS3Link::~NetworkNS3Link()
{
}
-void NetworkNS3Link::
updateState(tmgr_trace_iterator_t event_type, double value, double dat
e)
+void NetworkNS3Link::
apply_event(tmgr_trace_iterator_t event, double valu
e)
{
{
-
+ THROW_UNIMPLEMENTED;
}
/**********
}
/**********