X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/83ff63f9a846dd01995a4bbb8979d2fa909ed34b..25687c41a4e7abbd8c68f56f7172d5830e8fea41:/src/surf/network.hpp?ds=sidebyside

diff --git a/src/surf/network.hpp b/src/surf/network.hpp
index aa21a7efe1..62ae4e4416 100644
--- a/src/surf/network.hpp
+++ b/src/surf/network.hpp
@@ -1,5 +1,7 @@
 #include "surf.hpp"
 #include "xbt/fifo.h"
+#include "xbt/graph.h"
+#include "surf_routing.hpp"
 
 #ifndef SURF_MODEL_NETWORK_H_
 #define SURF_MODEL_NETWORK_H_
@@ -7,51 +9,114 @@
 /***********
  * Classes *
  ***********/
-class NetworkModel;
-typedef NetworkModel *NetworkModelPtr;
+class NetworkCm02Model;
+typedef NetworkCm02Model *NetworkCm02ModelPtr;
 
 class NetworkCm02Link;
 typedef NetworkCm02Link *NetworkCm02LinkPtr;
 
+class NetworkCm02LinkLmm;
+typedef NetworkCm02LinkLmm *NetworkCm02LinkLmmPtr;
+
 class NetworkCm02Action;
 typedef NetworkCm02Action *NetworkCm02ActionPtr;
 
 class NetworkCm02ActionLmm;
 typedef NetworkCm02ActionLmm *NetworkCm02ActionLmmPtr;
 
+/*********
+ * Tools *
+ *********/
+extern NetworkCm02ModelPtr surf_network_model;
+
+void net_define_callbacks(void);
+
 /*********
  * Model *
  *********/
-class NetworkModel : public Model {
+class NetworkCm02Model : public Model {
+private:
+  void initialize();
 public:
-  NetworkModel(string name) : Model(name) {};
-  NetworkCm02LinkPtr createResource(string name);
+  NetworkCm02Model(int i) : Model("network") {
+	f_networkSolve = lmm_solve;
+	m_haveGap = false;
+  };//FIXME: add network clean interface
+  NetworkCm02Model(string name) : Model(name) {
+    this->initialize();
+  }
+  NetworkCm02Model() : Model("network") {
+    this->initialize();
+  }
+  //FIXME:NetworkCm02LinkPtr createResource(string name);
+  NetworkCm02LinkLmmPtr 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);
   void updateActionsStateLazy(double now, double delta);
-  void updateActionsStateFull(double now, double delta);  
-  void gapRemove(ActionLmmPtr action);
-
-  virtual void addTraces() =0;
+  virtual void gapAppend(double size, const NetworkCm02LinkLmmPtr link, NetworkCm02ActionLmmPtr action) {};
+  virtual ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
+		                           double size, double rate);
+  xbt_dynar_t getRoute(RoutingEdgePtr src, RoutingEdgePtr dst); //FIXME: kill field? That is done by the routing nowadays
+  //FIXME: virtual void addTraces() =0;
+  void (*f_networkSolve)(lmm_system_t);
+  virtual double latencyFactor(double size);
+  virtual double bandwidthFactor(double size);
+  virtual double bandwidthConstraint(double rate, double bound, double size);
+  bool m_haveGap;
 };
 
 /************
  * Resource *
  ************/
-class NetworkCm02Link : public Resource {
-public:
-  NetworkCm02Link(NetworkModelPtr model, const char* name, xbt_dict_t properties) : Resource(model, name, properties) {};
 
+class NetworkCm02Link : virtual public Resource {
+public:
+  NetworkCm02Link(){};
+  NetworkCm02Link(NetworkCm02ModelPtr model, const char* name, xbt_dict_t properties) : Resource(model, name, properties) {};
+  virtual double getBandwidth()=0;
+  virtual double getLatency();
+  virtual bool isShared()=0;
   /* Using this object with the public part of
     model does not make sense */
-  double lat_current;
-  tmgr_trace_event_t lat_event;
+  double m_latCurrent;
+  tmgr_trace_event_t p_latEvent;
+};
+
+class NetworkCm02LinkLmm : public ResourceLmm, public NetworkCm02Link {
+public:
+  NetworkCm02LinkLmm(NetworkCm02ModelPtr model, const char* name, xbt_dict_t properties)
+   : ResourceLmm(), NetworkCm02Link(model, name, properties) {};
+  NetworkCm02LinkLmm(NetworkCm02ModelPtr 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,
+                               e_surf_link_sharing_policy_t policy);
+  bool isShared();
+  bool isUsed();
+  double getBandwidth();
+  void updateState(tmgr_trace_event_t event_type, double value, double date);
 };
 
+
 /**********
  * Action *
  **********/
 class NetworkCm02Action : virtual public Action {
 public:
-  NetworkCm02Action(ModelPtr model, double cost, bool failed): Action(model, cost, failed) {};
+  NetworkCm02Action(ModelPtr model, double cost, bool failed)
+ : Action(model, cost, failed) {};
   double m_latency;
   double m_latCurrent;
   double m_weight;
@@ -68,8 +133,12 @@ public:
 
 class NetworkCm02ActionLmm : public ActionLmm, public NetworkCm02Action {
 public:
-  NetworkCm02ActionLmm(ModelPtr model, double cost, bool failed): ActionLmm(model, cost, failed), NetworkCm02Action(model, cost, failed) {};
+  NetworkCm02ActionLmm(ModelPtr model, double cost, bool failed)
+ : Action(model, cost, failed),
+   ActionLmm(model, cost, failed),
+   NetworkCm02Action(model, cost, failed) {};
   void updateRemainingLazy(double now);
+  void recycle();
 };
 
 #endif /* SURF_MODEL_NETWORK_H_ */