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
Python: Add Comm.wait_any
[simgrid.git]
/
src
/
surf
/
network_constant.cpp
diff --git
a/src/surf/network_constant.cpp
b/src/surf/network_constant.cpp
index
e602e94
..
c8a5bcb
100644
(file)
--- a/
src/surf/network_constant.cpp
+++ b/
src/surf/network_constant.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-201
9
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-26,8
+26,7
@@
NetworkConstantModel::NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::F
all_existing_models.push_back(this);
}
all_existing_models.push_back(this);
}
-LinkImpl* NetworkConstantModel::create_link(const std::string& name, double bw, double lat,
- s4u::Link::SharingPolicy policy)
+LinkImpl* NetworkConstantModel::create_link(const std::string& name, double, double, s4u::Link::SharingPolicy)
{
xbt_die("Refusing to create the link %s: there is no link in the Constant network model. "
{
xbt_die("Refusing to create the link %s: there is no link in the Constant network model. "
@@
-60,8
+59,7
@@
void NetworkConstantModel::update_actions_state(double /*now*/, double delta)
}
}
action.update_remains(action.get_cost() * delta / action.initial_latency_);
}
}
action.update_remains(action.get_cost() * delta / action.initial_latency_);
- if (action.get_max_duration() != NO_MAX_DURATION)
- action.update_max_duration(delta);
+ action.update_max_duration(delta);
if ((action.get_remains_no_update() <= 0) ||
((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
if ((action.get_remains_no_update() <= 0) ||
((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
@@
-70,7
+68,7
@@
void NetworkConstantModel::update_actions_state(double /*now*/, double delta)
}
}
}
}
-kernel::resource::Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double
rate
)
+kernel::resource::Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double)
{
NetworkConstantAction* action = new NetworkConstantAction(this, size, sg_latency_factor);
{
NetworkConstantAction* action = new NetworkConstantAction(this, size, sg_latency_factor);