-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2019. 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"
+#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
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);
-
- routing_model_create(nullptr);
+ surf_network_model = new simgrid::kernel::resource::NetworkConstantModel();
}
namespace simgrid {
- namespace surf {
-
- NetworkConstantModel::~NetworkConstantModel() {}
+namespace kernel {
+namespace resource {
+NetworkConstantModel::NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::FULL)
+{
+ all_existing_models.push_back(this);
+}
- Link* NetworkConstantModel::createLink(const char *name, double bw, double lat, e_surf_link_sharing_policy_t policy,
- xbt_dict_t properties) {
+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. "
- "Please remove any link from your platform (and switch to routing='None')", name);
- 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 min = -1.0;
+double NetworkConstantModel::next_occuring_event(double /*now*/)
+{
+ double min = -1.0;
+ for (kernel::resource::Action const& action : *get_started_action_set()) {
+ const NetworkConstantAction& net_action = static_cast<const NetworkConstantAction&>(action);
+ if (net_action.latency_ > 0 && (min < 0 || net_action.latency_ < min))
+ min = net_action.latency_;
+ }
+ return min;
+}
- ActionList *actionSet = getRunningActionSet();
- 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_;
+void NetworkConstantModel::update_actions_state(double /*now*/, double delta)
+{
+ for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) {
+ NetworkConstantAction& 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) {
+ double_update(&action.latency_, delta, sg_surf_precision);
+ } else {
+ action.latency_ = 0.0;
}
-
- return min;
}
+ action.update_remains(action.get_cost() * delta / action.initial_latency_);
+ if (action.get_max_duration() != NO_MAX_DURATION)
+ action.update_max_duration(delta);
- void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
- {
- NetworkConstantAction *action = nullptr;
- ActionList *actionSet = getRunningActionSet();
- for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end())
- ; it != itend ; it=itNext) {
- ++itNext;
- action = static_cast<NetworkConstantAction*>(&*it);
- if (action->latency_ > 0) {
- if (action->latency_ > delta) {
- double_update(&(action->latency_), delta, sg_surf_precision);
- } else {
- action->latency_ = 0.0;
- }
- }
- action->updateRemains(action->getCost() * delta / action->initialLatency_);
- if (action->getMaxDuration() != NO_MAX_DURATION)
- action->updateMaxDuration(delta);
-
- if (action->getRemainsNoUpdate() <= 0) {
- action->finish();
- action->setState(Action::State::done);
- } else if ((action->getMaxDuration() != NO_MAX_DURATION)
- && (action->getMaxDuration() <= 0)) {
- action->finish();
- action->setState(Action::State::done);
- }
- }
+ 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::FINISHED);
}
+ }
+}
- Action *NetworkConstantModel::communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *dst, double size, double rate)
- {
- NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
+kernel::resource::Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double)
+{
+ NetworkConstantAction* action = new NetworkConstantAction(this, size, sg_latency_factor);
- Link::onCommunicate(action, src, dst);
- return action;
- }
+ simgrid::s4u::Link::on_communicate(action, src, dst);
+ return action;
+}
- /**********
- * Action *
- **********/
- NetworkConstantAction::NetworkConstantAction(NetworkConstantModel *model_, double size, double latency)
- : NetworkAction(model_, size, false)
- , initialLatency_(latency)
- {
- latency_ = latency;
- if (latency_ <= 0.0) {
- stateSet_ = getModel()->getDoneActionSet();
- stateSet_->push_back(*this);
- }
- };
+/**********
+ * Action *
+ **********/
+NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, double size, double latency)
+ : NetworkAction(model_, size, false), initial_latency_(latency)
+{
+ latency_ = latency;
+ if (latency_ <= 0.0)
+ NetworkConstantAction::set_state(Action::State::FINISHED);
+};
- NetworkConstantAction::~NetworkConstantAction() {}
+NetworkConstantAction::~NetworkConstantAction() = default;
- }
+void NetworkConstantAction::update_remains_lazy(double /*now*/)
+{
+ THROW_IMPOSSIBLE;
+}
+}
+} // namespace kernel
}