X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/558cfc9fc06c8d1a7206b5995d3736cc11319529..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/surf/network_constant.hpp

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index a15b173429..eed41ed0a0 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-2019. 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. */
@@ -12,53 +11,29 @@
 #include "network_interface.hpp"
 
 namespace simgrid {
-  namespace surf {
-
-    /***********
-     * Classes *
-     ***********/
-
-    class XBT_PRIVATE NetworkConstantModel;
-    class XBT_PRIVATE NetworkConstantAction;
-
-    /*********
-     * Model *
-     *********/
-    class NetworkConstantModel : public NetworkModel {
-    public:
-      NetworkConstantModel()  : NetworkModel() { };
-      ~NetworkConstantModel() { }
-
-      Action *communicate(NetCard *src, NetCard *dst, double size, double rate) override;
-      double next_occuring_event(double now) override;
-      bool next_occuring_event_isIdempotent() override {return true;}
-      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)
-    : NetworkAction(model_, size, false)
-    , m_latInit(latency)
-    {
-        m_latency = latency;
-        if (m_latency <= 0.0) {
-          p_stateSet = getModel()->getDoneActionSet();
-          p_stateSet->push_back(*this);
-        }
-        p_variable = NULL;
-    };
-      int unref() override;
-      void cancel() override;
-      double m_latInit;
-    };
-
-  }
-}
+namespace kernel {
+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;
+  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;
+};
+
+class NetworkConstantAction : public NetworkAction {
+public:
+  NetworkConstantAction(NetworkConstantModel* model_, double size, double latency);
+  ~NetworkConstantAction();
+  double initial_latency_;
+  void update_remains_lazy(double now) override;
+};
+
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid
 
 #endif /* NETWORK_CONSTANT_HPP_ */