X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/171293b2177631594dafc0a8449ee370aebdd305..72d32c4e88a57f4786f62fec48a1bfa454adbff9:/src/surf/network_constant.hpp

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index 34fd6b1c3e..229043ac12 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-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,46 +6,27 @@
 #ifndef NETWORK_CONSTANT_HPP_
 #define NETWORK_CONSTANT_HPP_
 
-#include <xbt/base.h>
+#include "src/kernel/resource/NetworkModel.hpp"
 
-#include "network_interface.hpp"
+namespace simgrid::kernel::resource {
 
-namespace simgrid {
-namespace kernel {
-namespace resource {
-
-/***********
- * Classes *
- ***********/
-
-class XBT_PRIVATE NetworkConstantModel;
-class XBT_PRIVATE NetworkConstantAction;
-
-/*********
- * Model *
- *********/
 class NetworkConstantModel : public NetworkModel {
 public:
-  NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::FULL) {}
-  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<double>& bws) override;
+  StandardLinkImpl* create_wifi_link(const std::string& name, const std::vector<double>& bws) override;
 };
 
-/**********
- * Action *
- **********/
-class NetworkConstantAction : public NetworkAction {
+class NetworkConstantAction final : public NetworkAction {
 public:
-  NetworkConstantAction(NetworkConstantModel* model_, double size, double latency);
-  ~NetworkConstantAction();
-  double initialLatency_;
+  NetworkConstantAction(NetworkConstantModel* model_, s4u::Host& src, s4u::Host& dst, double size);
   void update_remains_lazy(double now) override;
 };
-}
-} // namespace kernel
-} // namespace simgrid
+
+} // namespace simgrid::kernel::resource
 
 #endif /* NETWORK_CONSTANT_HPP_ */