Kill models getName() call sites.

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

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index b4d4048..3007837 100644 (file)
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -15,13 +15,7 @@
  * Classes *
  ***********/
 class NetworkCm02Model;
-typedef NetworkCm02Model *NetworkCm02ModelPtr;
-
-class NetworkCm02Link;
-typedef NetworkCm02Link *NetworkCm02LinkPtr;
-
 class NetworkCm02Action;
-typedef NetworkCm02Action *NetworkCm02ActionPtr;
 
 /*********
  * Tools *
@@ -48,27 +42,30 @@ public:
   }
   ~NetworkCm02Model() {
   }
-  NetworkLinkPtr createResource(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);
+  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);
+  void addTraces();
   void updateActionsStateLazy(double now, double delta);
-  ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
+  void updateActionsStateFull(double now, double delta);
+  Action *communicate(RoutingEdge *src, RoutingEdge *dst,
                                           double size, double rate);
+  bool shareResourcesIsIdempotent() {return true;}
 };
 
 /************
  * Resource *
  ************/
 
-class NetworkCm02Link : public NetworkLink {
+class NetworkCm02Link : public Link {
 public:
-  NetworkCm02Link(NetworkCm02ModelPtr model, const char *name, xbt_dict_t props,
+  NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props,
                                   lmm_system_t system,
                                   double constraint_value,
                                   tmgr_history_t history,
@@ -80,6 +77,8 @@ public:
                                   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());
 };
 
 
@@ -88,13 +87,12 @@ public:
  **********/
 
 class NetworkCm02Action : public NetworkAction {
-  friend ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate);
+  friend Action *NetworkCm02Model::communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate);
 
 public:
-  NetworkCm02Action(ModelPtr model, double cost, bool failed)
+  NetworkCm02Action(Model *model, double cost, bool failed)
  : NetworkAction(model, cost, failed) {};
   void updateRemainingLazy(double now);
-  void recycle();
 };
 
 #endif /* SURF_NETWORK_CM02_HPP_ */