rename next_occuring_event() into nextOccuringEvent()

[simgrid.git] / src / surf / network_constant.hpp

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index c3c23f0..7a8644d 100644 (file)
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -27,19 +27,14 @@ namespace simgrid {
     class NetworkConstantModel : public NetworkModel {
     public:
       NetworkConstantModel()  : NetworkModel() { };
-      ~NetworkConstantModel() { }
+      ~NetworkConstantModel() override;
 
-      Action *communicate(NetCard *src, NetCard *dst, double size, double rate) override;
-      double next_occuring_event(double now) override;
+      Action *communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *dst, double size, double rate) override;
+      double nextOccuringEvent(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,
-          e_surf_link_sharing_policy_t policy,
-          xbt_dict_t properties)          override { DIE_IMPOSSIBLE; }
+      Link* createLink(const char *name, double bw, double lat, e_surf_link_sharing_policy_t policy, xbt_dict_t properties) override;
     };
 
     /**********
@@ -47,20 +42,9 @@ namespace simgrid {
      **********/
     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;
+      NetworkConstantAction(NetworkConstantModel *model_, double size, double latency);
+      ~NetworkConstantAction();
+      double initialLatency_;
     };
 
   }