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
last call to MSG_hosts_as_dynar -> deprecate !
[simgrid.git]
/
src
/
surf
/
network_constant.cpp
diff --git
a/src/surf/network_constant.cpp
b/src/surf/network_constant.cpp
index
7dd7d45
..
ad2f6e0
100644
(file)
--- a/
src/surf/network_constant.cpp
+++ b/
src/surf/network_constant.cpp
@@
-1,9
+1,11
@@
-/* Copyright (c) 2013-20
18
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-20
20
. 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. */
#include "network_constant.hpp"
/* 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. */
#include "network_constant.hpp"
+#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
@@
-13,27
+15,32
@@
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
void surf_network_model_init_Constant()
{
xbt_assert(surf_network_model == nullptr);
void surf_network_model_init_Constant()
{
xbt_assert(surf_network_model == nullptr);
- surf_network_model = new simgrid::surf::NetworkConstantModel();
- all_existing_models->push_back(surf_network_model);
+ surf_network_model = new simgrid::kernel::resource::NetworkConstantModel();
}
namespace simgrid {
}
namespace simgrid {
-namespace surf {
-LinkImpl* NetworkConstantModel::createLink(const std::string& name, double bw, double lat,
- e_surf_link_sharing_policy_t policy)
+namespace kernel {
+namespace resource {
+
+NetworkConstantModel::NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::FULL)
{
{
+ all_existing_models.push_back(this);
+}
+LinkImpl* NetworkConstantModel::create_link(const std::string& name, const std::vector<double>& /*bandwidth*/,
+ double /*latency*/, s4u::Link::SharingPolicy)
+{
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.c_str());
return nullptr;
}
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.c_str());
return nullptr;
}
-double NetworkConstantModel::next_occuring_event(double /*now*/)
+double NetworkConstantModel::next_occur
r
ing_event(double /*now*/)
{
double min = -1.0;
{
double min = -1.0;
- for (kernel::resource::Action const& action : *get_
running
_action_set()) {
- const
NetworkConstantAction
& net_action = static_cast<const NetworkConstantAction&>(action);
+ for (kernel::resource::Action const& action : *get_
started
_action_set()) {
+ const
auto
& net_action = static_cast<const NetworkConstantAction&>(action);
if (net_action.latency_ > 0 && (min < 0 || net_action.latency_ < min))
min = net_action.latency_;
}
if (net_action.latency_ > 0 && (min < 0 || net_action.latency_ < min))
min = net_action.latency_;
}
@@
-42,8
+49,8
@@
double NetworkConstantModel::next_occuring_event(double /*now*/)
void NetworkConstantModel::update_actions_state(double /*now*/, double delta)
{
void NetworkConstantModel::update_actions_state(double /*now*/, double delta)
{
- for (auto it = std::begin(*get_
running_action_set()); it != std::end(*get_running
_action_set());) {
-
NetworkConstantAction
& action = static_cast<NetworkConstantAction&>(*it);
+ for (auto it = std::begin(*get_
started_action_set()); it != std::end(*get_started
_action_set());) {
+
auto
& action = static_cast<NetworkConstantAction&>(*it);
++it; // increment iterator here since the following calls to action.finish() may invalidate it
if (action.latency_ > 0) {
if (action.latency_ > delta) {
++it; // increment iterator here since the following calls to action.finish() may invalidate it
if (action.latency_ > 0) {
if (action.latency_ > delta) {
@@
-52,22
+59,21
@@
void NetworkConstantModel::update_actions_state(double /*now*/, double delta)
action.latency_ = 0.0;
}
}
action.latency_ = 0.0;
}
}
- action.update_remains(action.get_cost() * delta / action.initialLatency_);
- if (action.get_max_duration() != NO_MAX_DURATION)
- action.update_max_duration(delta);
+ action.update_remains(action.get_cost() * delta / action.initial_latency_);
+ 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))) {
- action.finish(
kernel::resource::Action::State::done
);
+ action.finish(
Action::State::FINISHED
);
}
}
}
}
}
}
-
kernel::resource::Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double rat
e)
+
Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, doubl
e)
{
{
-
NetworkConstantAction
* action = new NetworkConstantAction(this, size, sg_latency_factor);
+
auto
* action = new NetworkConstantAction(this, size, sg_latency_factor);
- s
imgrid::s4u::Link::onCommunicate(
action, src, dst);
+ s
4u::Link::on_communicate(*
action, src, dst);
return action;
}
return action;
}
@@
-75,12
+81,12
@@
kernel::resource::Action* NetworkConstantModel::communicate(s4u::Host* src, s4u:
* Action *
**********/
NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, double size, double latency)
* Action *
**********/
NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, double size, double latency)
- : NetworkAction(model_, size, false), initial
L
atency_(latency)
+ : NetworkAction(model_, size, false), initial
_l
atency_(latency)
{
latency_ = latency;
if (latency_ <= 0.0)
{
latency_ = latency;
if (latency_ <= 0.0)
- NetworkConstantAction::set_state(Action::State::
done
);
-}
;
+ NetworkConstantAction::set_state(Action::State::
FINISHED
);
+}
NetworkConstantAction::~NetworkConstantAction() = default;
NetworkConstantAction::~NetworkConstantAction() = default;
@@
-88,5
+94,7
@@
void NetworkConstantAction::update_remains_lazy(double /*now*/)
{
THROW_IMPOSSIBLE;
}
{
THROW_IMPOSSIBLE;
}
-}
-}
+
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid