X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a243b4c3535f516d05259cac06963c422d4aadc0..0b83205608b7fc3e935b970509a08e381ad1dffe:/src/surf/cpu_ti.hpp

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index cccac330f7..4e1ac71e1b 100644
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.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"
 #include "trace_mgr_private.h"
 #include "surf/surf_routing.h"
 
@@ -71,7 +77,6 @@ public:
   tmgr_trace_t p_powerTrace;
 };
 
-
 /*********
  * Model *
  *********/
@@ -92,13 +97,17 @@ public:
   void updateActionsState(double now, double delta);
   void addTraces();
 
+  ActionListPtr p_runningActionSetThatDoesNotNeedBeingChecked;
+  xbt_swag_t p_modifiedCpu;
+  xbt_heap_t p_tiActionHeap;
+
 protected:
-  void NotifyResourceTurnedOn(ResourcePtr r){};
-  void NotifyResourceTurnedOff(ResourcePtr r){};
+  void NotifyResourceTurnedOn(ResourcePtr){};
+  void NotifyResourceTurnedOff(ResourcePtr){};
 
-  void NotifyActionCancel(ActionPtr a){};
-  void NotifyActionResume(ActionPtr a){};
-  void NotifyActionSuspend(ActionPtr a){};
+  void NotifyActionCancel(ActionPtr){};
+  void NotifyActionResume(ActionPtr){};
+  void NotifyActionSuspend(ActionPtr){};
 };
 
 /************
@@ -111,26 +120,20 @@ public:
         int pstate, double powerScale, tmgr_trace_t powerTrace, int core,
         e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace,
 	xbt_dict_t properties) ;
-  ~CpuTi() {};
+  ~CpuTi();
 
   void updateState(tmgr_trace_event_t event_type, double value, double date);  
-  void updateActionFinishDate(double now);
+  void updateActionsFinishTime(double now);
   bool isUsed();
   void printCpuTiModel();
   CpuActionPtr execute(double size);
-  CpuTiActionPtr _execute(double size);
   CpuActionPtr sleep(double duration);
   double getAvailableSpeed();
 
-  xbt_dynar_t getWattsRangeList() {};
-  double getCurrentWattsValue(double cpu_load) {};
-  void updateEnergy(double cpu_load) {};
-
-  double getCurrentPowerPeak() {};
-  double getPowerPeakAt(int pstate_index) {};
-  int getNbPstates() {};
-  void setPowerPeakAt(int pstate_index) {};
-  double getConsumedEnergy() {};
+  double getCurrentPowerPeak() {THROW_UNIMPLEMENTED;};
+  double getPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
+  int getNbPstates() {THROW_UNIMPLEMENTED;};
+  void setPowerPeakAt(int /*pstate_index*/) {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) */
@@ -151,13 +154,15 @@ public:
  **********/
 
 class CpuTiAction: public CpuAction {
+  friend CpuActionPtr CpuTi::execute(double size);
+  friend CpuActionPtr CpuTi::sleep(double duration);
+  friend void CpuTi::updateActionsFinishTime(double now);//FIXME
+  friend void CpuTi::updateRemainingAmount(double now);//FIXME
+
 public:
   CpuTiAction() {};
-  CpuTiAction(CpuTiModelPtr model, double cost, bool failed)
-  : Action(model, cost, failed), CpuAction(model, cost, failed) {
-	p_cpuListHookup.next = 0;
-	p_cpuListHookup.prev = 0;
-  };
+  CpuTiAction(CpuTiModelPtr model, double cost, bool failed,
+  		                 CpuTiPtr cpu);
 
   void setState(e_surf_action_state_t state);
   int unref();
@@ -170,6 +175,8 @@ public:
   void setMaxDuration(double duration);
   void setPriority(double priority);
   double getRemains();
+  void setAffinity(CpuPtr /*cpu*/, unsigned long /*mask*/) {};
+
   CpuTiPtr p_cpu;
   int m_indexHeap;
   s_xbt_swag_hookup_t p_cpuListHookup;