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
Update info
[simgrid.git]
/
src
/
surf
/
network_constant.cpp
diff --git
a/src/surf/network_constant.cpp
b/src/surf/network_constant.cpp
index
b9c377e
..
7dc5c25
100644
(file)
--- a/
src/surf/network_constant.cpp
+++ b/
src/surf/network_constant.cpp
@@
-15,33
+15,28
@@
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);
-
- routing_model_create(nullptr);
+ all_existing_models->push_back(surf_network_model);
}
namespace simgrid {
namespace surf {
-
- NetworkConstantModel::~NetworkConstantModel() {}
-
- Link* NetworkConstantModel::createLink(const char *name, double bw, double lat, e_surf_link_sharing_policy_t policy,
- xbt_dict_t properties) {
-
- xbt_die("Refusing to create the link %s: there is no link in the Constant network model. "
- "Please remove any link from your platform (and switch to routing='None')", name);
- return nullptr;
+ LinkImpl* NetworkConstantModel::createLink(const char* name, double bw, double lat,
+ e_surf_link_sharing_policy_t policy)
+ {
+
+ xbt_die("Refusing to create the link %s: there is no link in the Constant network model. "
+ "Please remove any link from your platform (and switch to routing='None')",
+ name);
+ 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,11
+74,11
@@
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);
- Link::onCommunicate(action, src, dst);
+ Link
Impl
::onCommunicate(action, src, dst);
return action;
}
@@
-96,12
+91,11
@@
namespace simgrid {
{
latency_ = latency;
if (latency_ <= 0.0) {
- stateSet_ =
getModel()
->getDoneActionSet();
+ stateSet_ =
model_
->getDoneActionSet();
stateSet_->push_back(*this);
}
};
- NetworkConstantAction::~NetworkConstantAction() {}
-
+ NetworkConstantAction::~NetworkConstantAction() = default;
}
}