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

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index ad400846c6..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. */
@@ -11,62 +10,30 @@
 
 #include "network_interface.hpp"
 
-/***********
- * Classes *
- ***********/
-class XBT_PRIVATE NetworkConstantModel;
-class XBT_PRIVATE NetworkConstantAction;
+namespace simgrid {
+namespace kernel {
+namespace resource {
 
-/*********
- * Model *
- *********/
 class NetworkConstantModel : public NetworkModel {
 public:
-  NetworkConstantModel()  : NetworkModel() { };
-  ~NetworkConstantModel() { }
+  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;
 
-  Action *communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate);
-  double shareResources(double now);
-  void updateActionsState(double now, double delta);
-  bool shareResourcesIsIdempotent() {return true;}
-
-  Link* createLink(const char *name,
-		           double bw_initial,
-				   tmgr_trace_t bw_trace,
-				   double lat_initial,
-				   tmgr_trace_t lat_trace,
-				   e_surf_resource_state_t state_initial,
-				   tmgr_trace_t state_trace,
-				   e_surf_link_sharing_policy_t policy,
-				   xbt_dict_t properties)                  { DIE_IMPOSSIBLE; }
-  void addTraces()                                         { DIE_IMPOSSIBLE; }
-  xbt_dynar_t getRoute(RoutingEdge *src, RoutingEdge *dst) { DIE_IMPOSSIBLE; }
+  LinkImpl* create_link(const std::string& name, double bw, double lat, s4u::Link::SharingPolicy policy) 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();
-  void cancel();
-  void setCategory(const char *category);
-  void suspend();
-  void resume();
-  bool isSuspended();
-  double m_latInit;
-  int m_suspended;
+  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_ */