class CpuTiAction;
typedef CpuTiAction *CpuTiActionPtr;
+typedef boost::intrusive::list<CpuTi> CpuTiList;
+typedef CpuTiList* CpuTiListPtr;
+typedef boost::intrusive::list_base_hook<> cpuTiHook;
+
+struct tiTag;
+typedef boost::intrusive::list<CpuTiAction, boost::intrusive::base_hook<boost::intrusive::list_base_hook<boost::intrusive::tag<tiTag> > > > ActionTiList;
+typedef ActionTiList* ActionTiListPtr;
+typedef boost::intrusive::list_base_hook<boost::intrusive::tag<tiTag> > actionTiHook;
+
/*********
* Trace *
*********/
};
enum trace_type {
-
+
TRACE_FIXED, /*< Trace fixed, no availability file */
TRACE_DYNAMIC /*< Dynamic, availability file disponible */
};
public:
CpuTiModel();
~CpuTiModel();
-
- void parseInit(sg_platf_host_cbarg_t host);
- CpuTiPtr createResource(const char *name, xbt_dynar_t powerPeak,
+ CpuPtr createCpu(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();
ActionListPtr p_runningActionSetThatDoesNotNeedBeingChecked;
- xbt_swag_t p_modifiedCpu;
+ CpuTiListPtr p_modifiedCpu;
xbt_heap_t p_tiActionHeap;
protected:
/************
* Resource *
************/
-class CpuTi : public Cpu {
+class CpuTi : public cpuTiHook, public Cpu {
public:
CpuTi() {};
CpuTi(CpuTiModelPtr model, const char *name, xbt_dynar_t powerPeak,
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();
double getPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
int getNbPstates() {THROW_UNIMPLEMENTED;};
void setPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
+ void modified(bool modified);
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) */
tmgr_trace_event_t p_powerEvent; /*< trace file with availability events */
- xbt_swag_t p_actionSet; /*< set with all actions running on cpu */
- s_xbt_swag_hookup_t p_modifiedCpuHookup; /*< hookup to swag that indicates whether share resources must be recalculated or not */
+ ActionTiListPtr p_actionSet; /*< set with all actions running on cpu */
double m_sumPriority; /*< the sum of actions' priority that are running on cpu */
double m_lastUpdate; /*< last update of actions' remaining amount done */
- int m_pstate; /*< Current pstate (index in the power_peak_list)*/
double current_frequency;
void updateRemainingAmount(double now);
* Action *
**********/
-class CpuTiAction: public CpuAction {
+class CpuTiAction: public actionTiHook, 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,
CpuTiPtr cpu);
CpuTiPtr p_cpu;
int m_indexHeap;
- s_xbt_swag_hookup_t p_cpuListHookup;
int m_suspended;
private:
};