X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c39f643b5bfb0e99887c209a94e49f841a2daae4..20bb321a5cf8f244e33b5562b9dd1d8fb5d4864a:/src/surf/cpu_ti.hpp

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index e2e9406b86..1361b0ef4b 100644
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -1,3 +1,9 @@
+/* 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"
 #include "trace_mgr_private.h"
 #include "surf/surf_routing.h"
@@ -44,7 +50,7 @@ private:
 };
 
 enum trace_type {
-  
+
   TRACE_FIXED,                /*< Trace fixed, no availability file */
   TRACE_DYNAMIC               /*< Dynamic, availability file disponible */
 };
@@ -71,7 +77,6 @@ public:
   tmgr_trace_t p_powerTrace;
 };
 
-
 /*********
  * Model *
  *********/
@@ -81,13 +86,12 @@ public:
   ~CpuTiModel();
 
   void parseInit(sg_platf_host_cbarg_t host);
-  CpuTiPtr createResource(const char *name,  xbt_dynar_t powerPeak,
+  CpuPtr createResource(const char *name,  xbt_dynar_t powerPeak,
                           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);
-  CpuTiActionPtr createAction(double cost, bool failed);
   double shareResources(double now);
   void updateActionsState(double now, double delta);
   void addTraces();
@@ -117,7 +121,7 @@ public:
 	xbt_dict_t properties) ;
   ~CpuTi();
 
-  void updateState(tmgr_trace_event_t event_type, double value, double date);  
+  void updateState(tmgr_trace_event_t event_type, double value, double date);
   void updateActionsFinishTime(double now);
   bool isUsed();
   void printCpuTiModel();
@@ -125,15 +129,10 @@ public:
   CpuActionPtr sleep(double duration);
   double getAvailableSpeed();
 
-  xbt_dynar_t getWattsRangeList() {THROW_UNIMPLEMENTED;};
-  double getCurrentWattsValue(double /*cpu_load*/) {THROW_UNIMPLEMENTED;};
-  void updateEnergy(double /*cpu_load*/) {THROW_UNIMPLEMENTED;};
-
   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;};
 
   CpuTiTgmrPtr p_availTrace;       /*< Structure with data needed to integrate trace file */
   tmgr_trace_event_t p_stateEvent;       /*< trace file with states events (ON or OFF) */
@@ -160,7 +159,6 @@ class CpuTiAction: public CpuAction {
   friend void CpuTi::updateRemainingAmount(double now);//FIXME
 
 public:
-  CpuTiAction() {};
   CpuTiAction(CpuTiModelPtr model, double cost, bool failed,
   		                 CpuTiPtr cpu);
 
@@ -176,8 +174,6 @@ public:
   void setPriority(double priority);
   double getRemains();
   void setAffinity(CpuPtr /*cpu*/, unsigned long /*mask*/) {};
-  void setBound(double /*bound*/) {};
-  void updateEnergy() {};
 
   CpuTiPtr p_cpu;
   int m_indexHeap;