X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45ba4879c64faca75002be9379e6a7cd3e1d41d6..7097365f75e89b3b266987b2ec70b9dbc82bfded:/src/surf/network_constant.hpp

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index 2dc6681c0f..61e36a52d0 100644
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -7,64 +7,43 @@
 #ifndef NETWORK_CONSTANT_HPP_
 #define NETWORK_CONSTANT_HPP_
 
-#include "network_interface.hpp"
-
-/***********
- * Classes *
- ***********/
-class NetworkConstantModel;
-class NetworkConstantAction;
-
-/*********
- * Model *
- *********/
-class NetworkConstantModel : public NetworkModel {
-public:
-  NetworkConstantModel()  : NetworkModel() { };
-  ~NetworkConstantModel() { }
+#include <xbt/base.h>
 
-  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; }
-};
+#include "network_interface.hpp"
 
-/**********
- * 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;
-};
+namespace simgrid {
+  namespace surf {
+
+    /***********
+     * Classes *
+     ***********/
+
+    class XBT_PRIVATE NetworkConstantModel;
+    class XBT_PRIVATE NetworkConstantAction;
+
+    /*********
+     * 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;
+
+      LinkImpl* createLink(const char* 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_;
+    };
+
+  }
+}
 
 #endif /* NETWORK_CONSTANT_HPP_ */