X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a6b0a991a67e6f2f67c03fed43529e078da7115..deaf4c6f1cb3026b053ca861fe77313c78385be7:/src/surf/network_constant.hpp

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index f428c3a01e..198dd8ac4e 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-2018. 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,59 +11,41 @@
 #include "network_interface.hpp"
 
 namespace simgrid {
-namespace surf {
+  namespace surf {
+
+    /***********
+     * Classes *
+     ***********/
+
+    class XBT_PRIVATE NetworkConstantModel;
+    class XBT_PRIVATE NetworkConstantAction;
+
+    /*********
+     * Model *
+     *********/
+    class NetworkConstantModel : public NetworkModel {
+    public:
+      kernel::resource::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;
+
+      LinkImpl* createLink(const std::string& name, double bw, double lat,
+                           e_surf_link_sharing_policy_t policy) override;
+    };
+
+    /**********
+     * Action *
+     **********/
+    class NetworkConstantAction : public NetworkAction {
+    public:
+      NetworkConstantAction(NetworkConstantModel *model_, double size, double latency);
+      ~NetworkConstantAction();
+      double initialLatency_;
+      void updateRemainingLazy(double now) override;
+    };
 
-/***********
- * 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_initial, tmgr_trace_t bw_trace,
-      double lat_initial, tmgr_trace_t lat_trace,
-      int initiallyOn, tmgr_trace_t state_trace,
-      e_surf_link_sharing_policy_t policy,
-      xbt_dict_t properties)          override { DIE_IMPOSSIBLE; }
-};
-
-/**********
- * 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;
-};
-
-}
 }
 
 #endif /* NETWORK_CONSTANT_HPP_ */