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
make As->father_ protected
[simgrid.git]
/
src
/
surf
/
network_constant.cpp
diff --git
a/src/surf/network_constant.cpp
b/src/surf/network_constant.cpp
index
b9c377e
..
2da4340
100644
(file)
--- a/
src/surf/network_constant.cpp
+++ b/
src/surf/network_constant.cpp
@@
-15,7
+15,7
@@
void surf_network_model_init_Constant()
{
xbt_assert(surf_network_model == nullptr);
surf_network_model = new simgrid::surf::NetworkConstantModel();
-
xbt_dynar_push(all_existing_models, &
surf_network_model);
+
all_existing_models->push_back(
surf_network_model);
routing_model_create(nullptr);
}
@@
-33,15
+33,13
@@
namespace simgrid {
return nullptr;
}
- double NetworkConstantModel::next
_occuring_e
vent(double /*now*/)
+ double NetworkConstantModel::next
OccuringE
vent(double /*now*/)
{
- NetworkConstantAction *action = nullptr;
double min = -1.0;
ActionList *actionSet = getRunningActionSet();
- for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end())
- ; it != itend ; ++it) {
- action = static_cast<NetworkConstantAction*>(&*it);
+ for(auto it(actionSet->begin()), itend(actionSet->end()) ; it != itend ; ++it) {
+ NetworkConstantAction *action = static_cast<NetworkConstantAction*>(&*it);
if (action->latency_ > 0 && (min < 0 || action->latency_ < min))
min = action->latency_;
}
@@
-79,7
+77,7
@@
namespace simgrid {
}
}
- Action
*NetworkConstantModel::communicate(routing::NetCard *src, routing::NetCard *
dst, double size, double rate)
+ Action
* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host*
dst, double size, double rate)
{
NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);