X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a962524dde4462c012866f371f0a0810915508c..b59417738c8cf11f1804269c65a4738bbf43c150:/src/surf/network_constant.hpp diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp index 2576c59fbf..d0f733eda3 100644 --- a/src/surf/network_constant.hpp +++ b/src/surf/network_constant.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2021. 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. */ @@ -6,8 +6,6 @@ #ifndef NETWORK_CONSTANT_HPP_ #define NETWORK_CONSTANT_HPP_ -#include - #include "network_interface.hpp" namespace simgrid { @@ -16,19 +14,18 @@ namespace resource { class NetworkConstantModel : public NetworkModel { public: - NetworkConstantModel(); - Action* communicate(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, double size, double rate) override; - double next_occuring_event(double now) override; + using NetworkModel::NetworkModel; + Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override; + double next_occurring_event(double now) override; void update_actions_state(double now, double delta) override; - LinkImpl* create_link(const std::string& name, double bw, double lat, s4u::Link::SharingPolicy policy) override; + LinkImpl* create_link(const std::string& name, const std::vector& bws) override; + LinkImpl* create_wifi_link(const std::string& name, const std::vector& bws) override; }; -class NetworkConstantAction : public NetworkAction { +class NetworkConstantAction final : public NetworkAction { public: - NetworkConstantAction(NetworkConstantModel* model_, double size, double latency); - ~NetworkConstantAction(); - double initial_latency_; + NetworkConstantAction(NetworkConstantModel* model_, s4u::Host& src, s4u::Host& dst, double size); void update_remains_lazy(double now) override; };