X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d336a6ef3b2aee3aa81de0fbedfaa9971b89fb3..9cdf0f51bf67ecb8df0ece7c12283c705f1531d7:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 54f82296d3..5d9a7a522c 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. */ @@ -54,9 +54,9 @@ double NetworkModel::get_bandwidth_constraint(double rate, double /*bound*/, dou 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(action); @@ -76,7 +76,6 @@ double NetworkModel::next_occuring_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,7 +138,7 @@ 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))) { @@ -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();