Restructure surf++ workstation vmworkstation

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

diff --git a/src/surf/workstation_ptask_L07.hpp b/src/surf/workstation_ptask_L07.hpp
index cff5273..d999f1d 100644 (file)
--- 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 *
  *********/
@@ -41,6 +38,7 @@ typedef WorkstationActionLmm *WorkstationActionLmmPtr;*/
 class WorkstationL07Model : public WorkstationModel {
 public:
   WorkstationL07Model();
+  ~WorkstationL07Model();
 
   double shareResources(double now);
   void updateActionsState(double now, double delta);
@@ -55,16 +53,16 @@ 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();
-  CpuL07ModelPtr p_cpuModel;
-  NetworkL07ModelPtr p_networkModel;
+  NetworkModelPtr 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,13 +70,15 @@ public:
                                  tmgr_trace_t state_trace,
                                  xbt_dict_t cpu_properties);
   void addTraces() {DIE_IMPOSSIBLE;};
+
   WorkstationL07ModelPtr p_workstationModel;
 };
 
-class NetworkL07Model : public NetworkCm02Model {
+class NetworkL07Model : public NetworkModel {
 public:
-  NetworkL07Model() : NetworkCm02Model(0) {};
-  ResourcePtr createResource(const char *name,
+  NetworkL07Model() : NetworkModel() {};
+  ~NetworkL07Model() {surf_network_model = NULL;};
+  NetworkLinkPtr createResource(const char *name,
                                                   double bw_initial,
                                                   tmgr_trace_t bw_trace,
                                                   double lat_initial,
@@ -88,10 +88,9 @@ public:
                                                   tmgr_trace_t state_trace,
                                                   e_surf_link_sharing_policy_t
                                                   policy, xbt_dict_t properties);
-  NetworkCm02ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
-                                          double size, double rate);
-  xbt_dynar_t getRoute(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst) {DIE_IMPOSSIBLE;};
-  ActionPtr communicate(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst, double size, double rate) {DIE_IMPOSSIBLE;};
+
+  xbt_dynar_t getRoute(WorkstationPtr /*src*/, WorkstationPtr /*dst*/) {DIE_IMPOSSIBLE;};
+  ActionPtr communicate(RoutingEdgePtr /*src*/, RoutingEdgePtr /*dst*/, double /*size*/, double /*rate*/) {DIE_IMPOSSIBLE;};
   void addTraces() {DIE_IMPOSSIBLE;};
   WorkstationL07ModelPtr p_workstationModel;
 };
@@ -100,33 +99,48 @@ 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();
-  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 {
+class LinkL07 : public NetworkLinkLmm {
 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();
@@ -144,7 +158,7 @@ public:
 class WorkstationL07ActionLmm : public WorkstationActionLmm {
 public:
   WorkstationL07ActionLmm(ModelPtr model, double cost, bool failed)
-  : Action(model, cost, failed), WorkstationActionLmm(model, cost, failed) {};
+  : Action(model, cost, failed), WorkstationActionLmm() {};
  ~WorkstationL07ActionLmm();
 
   void updateBound();
@@ -159,7 +173,7 @@ public:
   double getRemains();
 
   int m_workstationNb;
-  WorkstationCLM03Ptr *p_workstationList;
+  WorkstationPtr *p_workstationList;
   double *p_computationAmount;
   double *p_communicationAmount;
   double m_latency;