* 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);
+ surf_network_model = new simgrid::kernel::resource::NetworkConstantModel();
}
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, double bw, double lat,
+ s4u::Link::SharingPolicy policy)
{
xbt_die("Refusing to create the link %s: there is no link in the Constant network model. "
return nullptr;
}
-double NetworkConstantModel::nextOccuringEvent(double /*now*/)
+double NetworkConstantModel::next_occuring_event(double /*now*/)
{
double min = -1.0;
- for (kernel::resource::Action const& action : *getRunningActionSet()) {
+ 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;
}
-void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
+void NetworkConstantModel::update_actions_state(double /*now*/, double delta)
{
- for (auto it = std::begin(*getRunningActionSet()); it != std::end(*getRunningActionSet());) {
+ 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.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(kernel::resource::Action::State::FINISHED);
}
}
}
{
NetworkConstantAction* action = new NetworkConstantAction(this, size, sg_latency_factor);
- simgrid::s4u::Link::onCommunicate(action, src, dst);
+ simgrid::s4u::Link::on_communicate(action, src, dst);
return action;
}
{
latency_ = latency;
if (latency_ <= 0.0)
- set_state(Action::State::done);
+ NetworkConstantAction::set_state(Action::State::FINISHED);
};
NetworkConstantAction::~NetworkConstantAction() = default;
THROW_IMPOSSIBLE;
}
}
+} // namespace kernel
}