X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/16bbb8a8212497d9c44c81333ed2c0e689e0c5af..29cedcb0af274d0dd82224451767e8d01162d734:/src/surf/network_constant.hpp

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index 9ff6964354..214993de62 100644
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -12,63 +12,53 @@
 #include "network_interface.hpp"
 
 namespace simgrid {
-namespace surf {
+  namespace surf {
 
-/***********
- * Classes *
- ***********/
- 
-class XBT_PRIVATE NetworkConstantModel;
-class XBT_PRIVATE NetworkConstantAction;
+    /***********
+     * Classes *
+     ***********/
 
-/*********
- * Model *
- *********/
-class NetworkConstantModel : public NetworkModel {
-public:
-  NetworkConstantModel()  : NetworkModel() { };
-  ~NetworkConstantModel() { }
+    class XBT_PRIVATE NetworkConstantModel;
+    class XBT_PRIVATE NetworkConstantAction;
 
-  Action *communicate(NetCard *src, NetCard *dst, double size, double rate) override;
-  double shareResources(double now) override;
-  void updateActionsState(double now, double delta) override;
-  bool shareResourcesIsIdempotent() override {return true;}
+    /*********
+     * Model *
+     *********/
+    class NetworkConstantModel : public NetworkModel {
+    public:
+      NetworkConstantModel()  : NetworkModel() { };
+      ~NetworkConstantModel() { }
 
-  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; }
-  void addTraces()                    override { DIE_IMPOSSIBLE; }
-};
+      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;
 
-/**********
- * 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;
-};
+      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)
+    {
+        latency_ = latency;
+        if (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_ */