-/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2020. 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_interface.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/sg_config.hpp"
+#include "src/kernel/resource/profile/Profile.hpp"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
return rate;
}
-double NetworkModel::next_occuring_event_full(double now)
+double NetworkModel::next_occurring_event_full(double now)
{
- double minRes = Model::next_occuring_event_full(now);
+ double minRes = Model::next_occurring_event_full(now);
for (Action const& action : *get_started_action_set()) {
const NetworkAction& net_action = static_cast<const NetworkAction&>(action);
LinkImpl::LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint)
: Resource(model, name, constraint), piface_(this)
{
-
if (name != "__loopback__")
xbt_assert(not s4u::Link::by_name_or_null(name), "Link '%s' declared several times in the platform.", name.c_str());
if (is_on()) {
Resource::turn_off();
s4u::Link::on_state_change(this->piface_);
+
+ const kernel::lmm::Variable* var;
+ const kernel::lmm::Element* elem = nullptr;
+ double now = surf_get_clock();
+ while ((var = get_constraint()->get_variable(&elem))) {
+ Action* action = static_cast<Action*>(var->get_id());
+ if (action->get_state() == Action::State::INITED || action->get_state() == Action::State::STARTED) {
+ action->set_finish_time(now);
+ action->set_state(Action::State::FAILED);
+ }
+ }
}
}
void LinkImpl::set_bandwidth_profile(profile::Profile* profile)
{
xbt_assert(bandwidth_.event == nullptr, "Cannot set a second bandwidth profile to Link %s", get_cname());
- bandwidth_.event = profile->schedule(&future_evt_set, this);
+ bandwidth_.event = profile->schedule(&profile::future_evt_set, this);
}
void LinkImpl::set_latency_profile(profile::Profile* profile)
{
xbt_assert(latency_.event == nullptr, "Cannot set a second latency profile to Link %s", get_cname());
- latency_.event = profile->schedule(&future_evt_set, this);
+ latency_.event = profile->schedule(&profile::future_evt_set, this);
}
/**********
for (int i = 0; i < llen; i++) {
/* Beware of composite actions: ptasks put links and cpus together */
// extra pb: we cannot dynamic_cast from void*...
- Resource* resource = static_cast<Resource*>(get_variable()->get_constraint(i)->get_id());
+ Resource* resource = get_variable()->get_constraint(i)->get_id();
LinkImpl* link = dynamic_cast<LinkImpl*>(resource);
if (link != nullptr)
retlist.push_back(link);