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

diff --git a/src/surf/workstation_ptask_L07.hpp b/src/surf/workstation_ptask_L07.hpp
index c195fdf787..19ca9864bc 100644
--- a/src/surf/workstation_ptask_L07.hpp
+++ b/src/surf/workstation_ptask_L07.hpp
@@ -28,9 +28,6 @@ typedef LinkL07 *LinkL07Ptr;
 class WorkstationL07ActionLmm;
 typedef WorkstationL07ActionLmm *WorkstationL07ActionLmmPtr;
 
-/*FIXME:class WorkstationActionLmm;
-typedef WorkstationActionLmm *WorkstationActionLmmPtr;*/
-
 /*********
  * Tools *
  *********/
@@ -41,6 +38,7 @@ typedef WorkstationActionLmm *WorkstationActionLmmPtr;*/
 class WorkstationL07Model : public WorkstationModel {
 public:
   WorkstationL07Model();
+  ~WorkstationL07Model();
 
   double shareResources(double now);
   void updateActionsState(double now, double delta);
@@ -58,13 +56,13 @@ public:
   xbt_dynar_t getRoute(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst);
   ActionPtr communicate(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst, double size, double rate);
   void addTraces();
-  CpuL07ModelPtr p_cpuModel;
   NetworkL07ModelPtr p_networkModel;
 };
 
 class CpuL07Model : public CpuModel {
 public:
   CpuL07Model() : CpuModel("cpuL07") {};
+  ~CpuL07Model() {surf_cpu_model_pm = NULL;};
   ResourcePtr createResource(const char *name, double power_scale,
                                  double power_initial,
                                  tmgr_trace_t power_trace,
@@ -72,12 +70,14 @@ public:
                                  tmgr_trace_t state_trace,
                                  xbt_dict_t cpu_properties);
   void addTraces() {DIE_IMPOSSIBLE;};
+
   WorkstationL07ModelPtr p_workstationModel;
 };
 
 class NetworkL07Model : public NetworkCm02Model {
 public:
   NetworkL07Model() : NetworkCm02Model(0) {};
+  ~NetworkL07Model() {surf_network_model = NULL;};
   ResourcePtr createResource(const char *name,
 		                                   double bw_initial,
 		                                   tmgr_trace_t bw_trace,
@@ -89,8 +89,8 @@ 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;};
+  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,30 +102,45 @@ public:
 class WorkstationL07 : public WorkstationCLM03Lmm {
 public:
   WorkstationL07(WorkstationModelPtr model, const char* name, xbt_dict_t props, RoutingEdgePtr netElm, CpuPtr cpu);
-  bool isUsed();
-  void updateState(tmgr_trace_event_t event_type, double value, double date) {DIE_IMPOSSIBLE;};
+  //bool isUsed();
+  bool isUsed() {DIE_IMPOSSIBLE;};
+  void updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, double /*date*/) {DIE_IMPOSSIBLE;};
   ActionPtr execute(double size);
   ActionPtr sleep(double duration);
   e_surf_resource_state_t getState();
+  double getPowerPeakAt(int pstate_index);
+  int getNbPstates();
+  void setPowerPeakAt(int pstate_index);
+  double getConsumedEnergy();
 };
 
 class CpuL07 : public CpuLmm {
 public:
   CpuL07(CpuL07ModelPtr model, const char* name, xbt_dict_t properties);
-  bool isUsed() {DIE_IMPOSSIBLE;};
+  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;};
+  ActionPtr execute(double /*size*/) {DIE_IMPOSSIBLE;};
+  ActionPtr sleep(double /*duration*/) {DIE_IMPOSSIBLE;};
+
+  double getCurrentPowerPeak() {THROW_UNIMPLEMENTED;};
+  double getPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
+  int getNbPstates() {THROW_UNIMPLEMENTED;};
+  void setPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
+  double getConsumedEnergy() {THROW_UNIMPLEMENTED;};
+
   double m_powerCurrent;
 };
 
 class LinkL07 : public NetworkCm02LinkLmm {
 public:
   LinkL07(NetworkL07ModelPtr model, const char* name, xbt_dict_t props);
-  bool isUsed() {DIE_IMPOSSIBLE;};
+  ~LinkL07(){
+  };
+  bool isUsed();
   void updateState(tmgr_trace_event_t event_type, double value, double date);
   double getBandwidth();
   double getLatency();