X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/96cedde3cdbc0b8ffc3f096a1b65d021b0226f99..9bcd28fb0c558fbaa23ee46416f96baef5279045:/src/surf/network_constant.hpp diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp index eed41ed0a0..2a8c70fc60 100644 --- a/src/surf/network_constant.hpp +++ b/src/surf/network_constant.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2022. 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,9 +6,7 @@ #ifndef NETWORK_CONSTANT_HPP_ #define NETWORK_CONSTANT_HPP_ -#include - -#include "network_interface.hpp" +#include "src/kernel/resource/LinkImpl.hpp" namespace simgrid { namespace kernel { @@ -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; + StandardLinkImpl* create_link(const std::string& name, const std::vector& bws) override; + StandardLinkImpl* 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; };