X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b3677b425b9cc6949c1573d59ac772540cbf4b2..53614cf4c0d54920e9214f6ecc7c1149eb843b20:/src/surf/cpu_ti.hpp diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index 0d9daa6f81..1361b0ef4b 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -50,7 +50,7 @@ private: }; enum trace_type { - + TRACE_FIXED, /*< Trace fixed, no availability file */ TRACE_DYNAMIC /*< Dynamic, availability file disponible */ }; @@ -86,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(); @@ -122,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(); @@ -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,7 +174,6 @@ public: void setPriority(double priority); double getRemains(); void setAffinity(CpuPtr /*cpu*/, unsigned long /*mask*/) {}; - void setBound(double /*bound*/) {}; CpuTiPtr p_cpu; int m_indexHeap;