X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/129188ec404d7b0aa0bacafd9e2a8d26ed37183a..3715b2a421abd8357f41fb2be3c25a351f1af8cb:/src/surf/network_cm02.hpp

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index fe939b68a0..300783755b 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -1,3 +1,9 @@
+/* Copyright (c) 2013-2014. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
 #include "network_interface.hpp"
 #include "xbt/fifo.h"
 #include "xbt/graph.h"
@@ -9,13 +15,7 @@
  * Classes *
  ***********/
 class NetworkCm02Model;
-typedef NetworkCm02Model *NetworkCm02ModelPtr;
-
-class NetworkCm02LinkLmm;
-typedef NetworkCm02LinkLmm *NetworkCm02LinkLmmPtr;
-
-class NetworkCm02ActionLmm;
-typedef NetworkCm02ActionLmm *NetworkCm02ActionLmmPtr;
+class NetworkCm02Action;
 
 /*********
  * Tools *
@@ -34,7 +34,7 @@ public:
 	f_networkSolve = lmm_solve;
 	m_haveGap = false;
   };//FIXME: add network clean interface
-  NetworkCm02Model(string name) : NetworkModel(name) {
+  NetworkCm02Model(const char *name) : NetworkModel(name) {
     this->initialize();
   }
   NetworkCm02Model() : NetworkModel("network") {
@@ -42,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 NetworkCm02LinkLmm : public NetworkLinkLmm {
+class NetworkCm02Link : public Link {
 public:
-  NetworkCm02LinkLmm(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,
@@ -74,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());
 };
 
 
@@ -81,12 +86,13 @@ public:
  * Action *
  **********/
 
-class NetworkCm02ActionLmm : public NetworkActionLmm {
+class NetworkCm02Action : public NetworkAction {
+  friend Action *NetworkCm02Model::communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate);
+
 public:
-  NetworkCm02ActionLmm(ModelPtr model, double cost, bool failed)
- : Action(model, cost, failed) {};
+  NetworkCm02Action(Model *model, double cost, bool failed)
+ : NetworkAction(model, cost, failed) {};
   void updateRemainingLazy(double now);
-  void recycle();
 };
 
 #endif /* SURF_NETWORK_CM02_HPP_ */