sanitize surf API: s/shareResources/next_occuring_event/

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

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index dc691d0..61e8b1c 100644 (file)
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -13,13 +13,22 @@
 #include "xbt/fifo.h"
 #include "xbt/graph.h"
 
+
+
 /***********
  * Classes *
  ***********/
+
+namespace simgrid {
+namespace surf {
+
 class XBT_PRIVATE NetworkCm02Model;
 class XBT_PRIVATE NetworkCm02Action;
 class XBT_PRIVATE NetworkSmpiModel;
 
+}
+}
+
 /*********
  * Tools *
  *********/
@@ -29,29 +38,31 @@ XBT_PRIVATE void net_define_callbacks(void);
 /*********
  * Model *
  *********/
+
+namespace simgrid {
+namespace surf {
+
 class NetworkCm02Model : public NetworkModel {
-private:
-  void initialize();
 public:
-  NetworkCm02Model(int /*i*/) : NetworkModel() {};
   NetworkCm02Model();
   ~NetworkCm02Model() { }
   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) override;
-  void addTraces();
-  void updateActionsStateLazy(double now, double delta);
-  void updateActionsStateFull(double now, double delta);
-  Action *communicate(RoutingEdge *src, RoutingEdge *dst,
-                                          double size, double rate);
-  bool shareResourcesIsIdempotent() {return true;}
+      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;
+  void addTraces() override;
+  void updateActionsStateLazy(double now, double delta) override;
+  void updateActionsStateFull(double now, double delta) override;
+  Action *communicate(NetCard *src, NetCard *dst,
+                               double size, double rate) override;
+  bool next_occuring_event_isIdempotent() override {return true;}
   virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
+protected:
   bool m_haveGap = false;
 };
 
@@ -62,19 +73,18 @@ public:
 class NetworkCm02Link : public Link {
 public:
   NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props,
-                                  lmm_system_t system,
-                                  double constraint_value,
-                                  tmgr_history_t history,
-                                  e_surf_resource_state_t state_init,
-                                  tmgr_trace_t state_trace,
-                                  double metric_peak,
-                                  tmgr_trace_t metric_trace,
-                                  double lat_initial,
-                                  tmgr_trace_t lat_trace,
+                             lmm_system_t system,
+                             double constraint_value,
+                             int initiallyOn,
+                             tmgr_trace_t state_trace,
+                             double metric_peak,
+                             tmgr_trace_t metric_trace,
+                             double lat_initial,
+                             tmgr_trace_t lat_trace,
                                e_surf_link_sharing_policy_t policy);
-  void updateState(tmgr_trace_event_t event_type, double value, double date);
-  void updateBandwidth(double value, double date=surf_get_clock());
-  void updateLatency(double value, double date=surf_get_clock());
+  void updateState(tmgr_trace_iterator_t event_type, double value) override;
+  void updateBandwidth(double value) override;
+  void updateLatency(double value) override;
   virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
 
 
@@ -85,7 +95,7 @@ public:
  * Action *
  **********/
 class NetworkCm02Action : public NetworkAction {
-  friend Action *NetworkCm02Model::communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate);
+  friend Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, double rate);
   friend NetworkSmpiModel;
 
 public:
@@ -96,4 +106,7 @@ protected:
   double m_senderGap;
 };
 
+}
+}
+
 #endif /* SURF_NETWORK_CM02_HPP_ */