X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/399e4077a352ec6e0ad4134e5645a29d0d241c88..6211c588d514efac018d071c4304df3f7bace3bd:/src/surf/cpu_cas01.hpp

diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index 779a350e58..685cd4cbc2 100644
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -1,4 +1,10 @@
-#include "cpu.hpp"
+/* 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 "cpu_interface.hpp"
 
 /***********
  * Classes *
@@ -6,11 +12,11 @@
 class CpuCas01Model;
 typedef CpuCas01Model *CpuCas01ModelPtr;
 
-class CpuCas01Lmm;
-typedef CpuCas01Lmm *CpuCas01LmmPtr;
+class CpuCas01;
+typedef CpuCas01 *CpuCas01Ptr;
 
-class CpuCas01ActionLmm;
-typedef CpuCas01ActionLmm *CpuCas01ActionLmmPtr;
+class CpuCas01Action;
+typedef CpuCas01Action *CpuCas01ActionPtr;
 
 /*********
  * Model *
@@ -24,39 +30,59 @@ public:
   void (CpuCas01Model::*updateActionsState)(double now, double delta);
 
   void parseInit(sg_platf_host_cbarg_t host);  
-  CpuCas01LmmPtr createResource(const char *name, double power_peak, double power_scale,
+  CpuPtr createResource(const char *name, xbt_dynar_t power_peak, int pstate,
+		                  double power_scale,
                           tmgr_trace_t power_trace, int core,
                           e_surf_resource_state_t state_initial,
                           tmgr_trace_t state_trace,
                           xbt_dict_t cpu_properties);
   double shareResourcesFull(double now);  
   void addTraces();
+  ActionListPtr p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
 };
 
 /************
  * Resource *
  ************/
-class CpuCas01Lmm : public CpuLmm {
+
+class CpuCas01 : public Cpu {
 public:
-  CpuCas01Lmm(CpuCas01ModelPtr model, const char *name, double powerPeak,
-        double powerScale, tmgr_trace_t powerTrace, int core,
+  CpuCas01(CpuCas01ModelPtr model, const char *name, xbt_dynar_t power_peak,
+        int pstate, double powerScale, tmgr_trace_t powerTrace, int core,
         e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace,
 	xbt_dict_t properties) ;
+  ~CpuCas01();
   void updateState(tmgr_trace_event_t event_type, double value, double date);
-  ActionPtr execute(double size);
-  ActionPtr sleep(double duration);
+  CpuActionPtr execute(double size);
+  CpuActionPtr sleep(double duration);
 
+  double getCurrentPowerPeak();
+  double getPowerPeakAt(int pstate_index);
+  int getNbPstates();
+  void setPowerPeakAt(int pstate_index);
   bool isUsed();
+  void setStateEvent(tmgr_trace_event_t stateEvent);
+  void setPowerEvent(tmgr_trace_event_t stateEvent);
+  xbt_dynar_t getPowerPeakList();
+
+  int getPState();
 
+private:
+  tmgr_trace_event_t p_stateEvent;
   tmgr_trace_event_t p_powerEvent;
+  xbt_dynar_t p_powerPeakList;				/*< List of supported CPU capacities */
+  int m_pstate;								/*< Current pstate (index in the power_peak_list)*/
 };
 
 /**********
  * Action *
  **********/
-class CpuCas01ActionLmm: public CpuActionLmm {
+class CpuCas01Action: public CpuAction {
+  friend CpuActionPtr CpuCas01::execute(double size);
+  friend CpuActionPtr CpuCas01::sleep(double duration);
 public:
-  CpuCas01ActionLmm() {};
-  CpuCas01ActionLmm(ModelPtr model, double cost, bool failed): Action(model, cost, failed), CpuActionLmm(model, cost, failed) {};
+  CpuCas01Action() {};
+  CpuCas01Action(ModelPtr model, double cost, bool failed, double power, lmm_constraint_t constraint);
 
+  ~CpuCas01Action() {};
 };