X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c1cefafb4bbcb85e9285d9172d12feefee4d4b18..d80775dbeabda8f0e1885204acdb812b38f40ee4:/src/surf/workstation_ptask_L07.hpp

diff --git a/src/surf/workstation_ptask_L07.hpp b/src/surf/workstation_ptask_L07.hpp
index 043404a8af..1c7cf5030d 100644
--- a/src/surf/workstation_ptask_L07.hpp
+++ b/src/surf/workstation_ptask_L07.hpp
@@ -1,4 +1,4 @@
-#include "workstation.hpp"
+#include "workstation_interface.hpp"
 
 #ifndef WORKSTATION_L07_HPP_
 #define WORKSTATION_L07_HPP_
@@ -28,9 +28,6 @@ typedef LinkL07 *LinkL07Ptr;
 class WorkstationL07ActionLmm;
 typedef WorkstationL07ActionLmm *WorkstationL07ActionLmmPtr;
 
-/*FIXME:class WorkstationActionLmm;
-typedef WorkstationActionLmm *WorkstationActionLmmPtr;*/
-
 /*********
  * Tools *
  *********/
@@ -56,10 +53,10 @@ public:
                                         double *computation_amount,
                                         double *communication_amount,
                                         double rate);
-  xbt_dynar_t getRoute(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst);
-  ActionPtr communicate(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst, double size, double rate);
+  xbt_dynar_t getRoute(WorkstationPtr src, WorkstationPtr dst);
+  ActionPtr communicate(WorkstationPtr src, WorkstationPtr dst, double size, double rate);
   void addTraces();
-  NetworkL07ModelPtr p_networkModel;
+  NetworkModelPtr p_networkModel;
 };
 
 class CpuL07Model : public CpuModel {
@@ -77,11 +74,11 @@ public:
   WorkstationL07ModelPtr p_workstationModel;
 };
 
-class NetworkL07Model : public NetworkCm02Model {
+class NetworkL07Model : public NetworkModel {
 public:
-  NetworkL07Model() : NetworkCm02Model(0) {};
+  NetworkL07Model() : NetworkModel() {};
   ~NetworkL07Model() {surf_network_model = NULL;};
-  ResourcePtr createResource(const char *name,
+  NetworkLinkPtr createResource(const char *name,
 		                                   double bw_initial,
 		                                   tmgr_trace_t bw_trace,
 		                                   double lat_initial,
@@ -92,7 +89,6 @@ public:
 		                                   e_surf_link_sharing_policy_t
 		                                   policy, xbt_dict_t properties);
 
-  xbt_dynar_t getRoute(WorkstationCLM03Ptr /*src*/, WorkstationCLM03Ptr /*dst*/) {DIE_IMPOSSIBLE;};
   ActionPtr communicate(RoutingEdgePtr /*src*/, RoutingEdgePtr /*dst*/, double /*size*/, double /*rate*/) {DIE_IMPOSSIBLE;};
   void addTraces() {DIE_IMPOSSIBLE;};
   WorkstationL07ModelPtr p_workstationModel;
@@ -102,7 +98,7 @@ public:
  * Resource *
  ************/
 
-class WorkstationL07 : public WorkstationCLM03Lmm {
+class WorkstationL07 : public WorkstationLmm {
 public:
   WorkstationL07(WorkstationModelPtr model, const char* name, xbt_dict_t props, RoutingEdgePtr netElm, CpuPtr cpu);
   //bool isUsed();
@@ -119,15 +115,22 @@ public:
 
 class CpuL07 : public CpuLmm {
 public:
-  CpuL07(CpuL07ModelPtr model, const char* name, xbt_dict_t properties);
+  s_surf_metric_t p_power;
+  tmgr_trace_event_t p_stateEvent;
+
+public:
+  CpuL07(CpuL07ModelPtr model, const char* name, xbt_dict_t properties,
+		 double power_scale,
+		 double power_initial, tmgr_trace_t power_trace,
+		 e_surf_resource_state_t state_initial, tmgr_trace_t state_trace);
   bool isUsed();
   //bool isUsed() {DIE_IMPOSSIBLE;};
   void updateState(tmgr_trace_event_t event_type, double value, double date);
   e_surf_resource_state_t getState();
   double getSpeed(double load);
   double getAvailableSpeed();
-  ActionPtr execute(double /*size*/) {DIE_IMPOSSIBLE;};
-  ActionPtr sleep(double /*duration*/) {DIE_IMPOSSIBLE;};
+  CpuActionPtr execute(double /*size*/) {DIE_IMPOSSIBLE;};
+  CpuActionPtr sleep(double /*duration*/) {DIE_IMPOSSIBLE;};
 
   double getCurrentPowerPeak() {THROW_UNIMPLEMENTED;};
   double getPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
@@ -138,9 +141,17 @@ public:
   double m_powerCurrent;
 };
 
-class LinkL07 : public NetworkCm02LinkLmm {
+class LinkL07 : public NetworkLinkLmm {
 public:
-  LinkL07(NetworkL07ModelPtr model, const char* name, xbt_dict_t props);
+  LinkL07(NetworkL07ModelPtr model, const char* name, xbt_dict_t props,
+		  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);
   ~LinkL07(){
   };
   bool isUsed();
@@ -159,9 +170,17 @@ public:
  * Action *
  **********/
 class WorkstationL07ActionLmm : public WorkstationActionLmm {
+  friend ActionPtr WorkstationL07::execute(double size);
+  friend ActionPtr WorkstationL07::sleep(double duration);
+  friend ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb,
+                                                     void **workstation_list,
+                                                   double
+                                                   *computation_amount, double
+                                                   *communication_amount,
+                                                   double rate);
 public:
   WorkstationL07ActionLmm(ModelPtr model, double cost, bool failed)
-  : Action(model, cost, failed), WorkstationActionLmm(model, cost, failed) {};
+  : Action(model, cost, failed), WorkstationActionLmm() {};
  ~WorkstationL07ActionLmm();
 
   void updateBound();
@@ -176,7 +195,7 @@ public:
   double getRemains();
 
   int m_workstationNb;
-  WorkstationCLM03Ptr *p_workstationList;
+  WorkstationPtr *p_workstationList;
   double *p_computationAmount;
   double *p_communicationAmount;
   double m_latency;