X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39f579ce40d3bd04d9f64a7914b07d1ec3334e4b..e34f4a3d8b2aa4081ada02909800ae3cc08d48d5:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 5a23538984..764c414c75 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -76,7 +76,6 @@ double NetworkModel::next_occurring_event_full(double now) 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()); @@ -139,11 +138,11 @@ void LinkImpl::turn_off() Resource::turn_off(); s4u::Link::on_state_change(this->piface_); - kernel::lmm::Variable* var = nullptr; + 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(var->get_id()); + Action* 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); @@ -152,7 +151,7 @@ void LinkImpl::turn_off() } } -void LinkImpl::on_bandwidth_change() +void LinkImpl::on_bandwidth_change() const { s4u::Link::on_bandwidth_change(this->piface_); } @@ -182,7 +181,7 @@ void NetworkAction::set_state(Action::State state) } /** @brief returns a list of all Links that this action is using */ -std::list NetworkAction::links() const +std::list NetworkAction::get_links() const { std::list retlist; int llen = get_variable()->get_number_of_constraint();