-#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"
* Classes *
***********/
class CpuTiTrace;
-typedef CpuTiTrace *CpuTiTracePtr;
-
class CpuTiTgmr;
-typedef CpuTiTgmr *CpuTiTgmrPtr;
-
class CpuTiModel;
-typedef CpuTiModel *CpuTiModelPtr;
-
class CpuTi;
-typedef CpuTi *CpuTiPtr;
-
class CpuTiAction;
-typedef CpuTiAction *CpuTiActionPtr;
+
+typedef boost::intrusive::list<CpuTi> CpuTiList;
+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 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 */
};
double m_lastTime; /*< Integral interval last point (discret time) */
double m_total; /*< Integral total between 0 and last_pointn */
- CpuTiTracePtr p_trace;
+ CpuTiTrace *p_trace;
tmgr_trace_t p_powerTrace;
};
-
/*********
* Model *
*********/
public:
CpuTiModel();
~CpuTiModel();
-
- void parseInit(sg_platf_host_cbarg_t host);
- CpuTiPtr createResource(const char *name, double power_peak, double power_scale,
+ Cpu *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();
+
+ ActionList *p_runningActionSetThatDoesNotNeedBeingChecked;
+ CpuTiList *p_modifiedCpu;
+ xbt_heap_t p_tiActionHeap;
protected:
- void NotifyResourceTurnedOn(ResourcePtr r){};
- void NotifyResourceTurnedOff(ResourcePtr r){};
+ void NotifyResourceTurnedOn(Resource*){};
+ void NotifyResourceTurnedOff(Resource*){};
- void NotifyActionCancel(ActionPtr a){};
- void NotifyActionResume(ActionPtr a){};
- void NotifyActionSuspend(ActionPtr a){};
+ void NotifyActionCancel(Action*){};
+ void NotifyActionResume(Action*){};
+ void NotifyActionSuspend(Action*){};
};
/************
* Resource *
************/
-class CpuTi : public Cpu {
+class CpuTi : public cpuTiHook, public Cpu {
public:
- CpuTi(CpuTiModelPtr model, const char *name, double powerPeak,
- double powerScale, tmgr_trace_t powerTrace, int core,
+ CpuTi() {};
+ CpuTi(CpuTiModel *model, const char *name, xbt_dynar_t powerPeak,
+ 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);
- bool isUsed();
- double getSpeed (double load);
- double getAvailableSpeed ();
- void addTraces();
+ void updateState(tmgr_trace_event_t event_type, double value, double date);
+ void updateActionsFinishTime(double now);
+ bool isUsed();
void printCpuTiModel();
- CpuTiModelPtr getModel();
- CpuActionPtr execute(double size);
- CpuActionPtr sleep(double duration);
- e_surf_resource_state_t getState();
-
- double m_powerPeak; /*< CPU power peak */
- double m_powerScale; /*< Percentage of CPU disponible */
- CpuTiTgmrPtr p_availTrace; /*< Structure with data needed to integrate trace file */
- e_surf_resource_state_t p_stateCurrent; /*< CPU current state (ON or OFF) */
+ CpuAction *execute(double size);
+ CpuAction *sleep(double duration);
+ double getAvailableSpeed();
+
+ double getCurrentPowerPeak() {THROW_UNIMPLEMENTED;};
+ double getPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
+ int getNbPstates() {THROW_UNIMPLEMENTED;};
+ void setPstate(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
+ int getPstate() { THROW_UNIMPLEMENTED;}
+ void modified(bool modified);
+
+ CpuTiTgmr *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 availabitly events */
- xbt_swag_t p_actionSet; /*< set with all actions running on cpu */
- s_xbt_swag_hookup_t p_modifiedCpuHookup; /*< hookup to swag that indicacates whether share resources must be recalculated or not */
+ tmgr_trace_event_t p_powerEvent; /*< trace file with availability events */
+ ActionTiList *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 */
+
+ double current_frequency;
+
void updateRemainingAmount(double now);
};
/**********
* Action *
**********/
-class CpuTiAction: public CpuAction {
+
+class CpuTiAction: public actionTiHook, public CpuAction {
+ friend CpuAction *CpuTi::execute(double size);
+ friend CpuAction *CpuTi::sleep(double duration);
+ friend void CpuTi::updateActionsFinishTime(double now);//FIXME
+ friend void CpuTi::updateRemainingAmount(double now);//FIXME
+
public:
- CpuTiAction(CpuTiModelPtr model, double cost, bool failed): CpuAction(model, cost, failed) {};
+ CpuTiAction(CpuTiModel *model, double cost, bool failed,
+ CpuTi *cpu);
void setState(e_surf_action_state_t state);
int unref();
void cancel();
- void recycle();
void updateIndexHeap(int i);
void suspend();
void resume();
void setMaxDuration(double duration);
void setPriority(double priority);
double getRemains();
- CpuTiPtr p_cpu;
- int m_indexHeap;
+ void setAffinity(Cpu */*cpu*/, unsigned long /*mask*/) {};
+ CpuTi *p_cpu;
+ int m_indexHeap;
+ int m_suspended;
private:
};
