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

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index 58e8ce97a6..229043ac12 100644
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2013-2015. 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. */
@@ -7,43 +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 surf {
+class NetworkConstantModel : public NetworkModel {
+public:
+  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;
 
-    /***********
-     * Classes *
-     ***********/
+  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;
+};
 
-    class XBT_PRIVATE NetworkConstantModel;
-    class XBT_PRIVATE NetworkConstantAction;
+class NetworkConstantAction final : public NetworkAction {
+public:
+  NetworkConstantAction(NetworkConstantModel* model_, s4u::Host& src, s4u::Host& dst, double size);
+  void update_remains_lazy(double now) override;
+};
 
-    /*********
-     * Model *
-     *********/
-    class NetworkConstantModel : public NetworkModel {
-    public:
-      Action* communicate(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, double size, double rate) override;
-      double nextOccuringEvent(double now) override;
-      void updateActionsState(double now, double delta) override;
-
-      Link* createLink(const char *name, double bw, double lat, e_surf_link_sharing_policy_t policy, xbt_dict_t properties) override;
-    };
-
-    /**********
-     * Action *
-     **********/
-    class NetworkConstantAction : public NetworkAction {
-    public:
-      NetworkConstantAction(NetworkConstantModel *model_, double size, double latency);
-      ~NetworkConstantAction();
-      double initialLatency_;
-    };
-
-  }
-}
+} // namespace simgrid::kernel::resource
 
 #endif /* NETWORK_CONSTANT_HPP_ */