A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #59 from fabienchaix/master
[simgrid.git]
/
src
/
surf
/
cpu_ti.hpp
diff --git
a/src/surf/cpu_ti.hpp
b/src/surf/cpu_ti.hpp
index
d8df612
..
a9820c4
100644
(file)
--- a/
src/surf/cpu_ti.hpp
+++ b/
src/surf/cpu_ti.hpp
@@
-6,8
+6,8
@@
#include <xbt/base.h>
#include <xbt/base.h>
-#include "cpu_interface.hpp"
-#include "
trace_mgr_private.h
"
+#include "
src/surf/
cpu_interface.hpp"
+#include "
src/surf/trace_mgr.hpp
"
#include "surf/surf_routing.h"
/* Epsilon */
#include "surf/surf_routing.h"
/* Epsilon */
@@
-113,23
+113,23
@@
typedef boost::intrusive::list<
************/
class CpuTi : public Cpu {
public:
************/
class CpuTi : public Cpu {
public:
- CpuTi(CpuTiModel *model, simgrid::Host *host, xbt_dynar_t speedPeak,
+ CpuTi(CpuTiModel *model, simgrid::
s4u::
Host *host, xbt_dynar_t speedPeak,
int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
int initiallyOn, tmgr_trace_t stateTrace) ;
~CpuTi();
int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
int initiallyOn, tmgr_trace_t stateTrace) ;
~CpuTi();
- void updateState(tmgr_trace_event_t event_type, double value, double date) override;
+ void set_speed_trace(tmgr_trace_t trace);
+
+ void updateState(tmgr_trace_iterator_t event_type, double value, double date) override;
void updateActionsFinishTime(double now);
bool isUsed() override;
void updateActionsFinishTime(double now);
bool isUsed() override;
- CpuAction *execut
e
(double size) override;
+ CpuAction *execut
ion_start
(double size) override;
CpuAction *sleep(double duration) override;
double getAvailableSpeed() override;
void modified(bool modified);
CpuTiTgmr *p_availTrace; /*< Structure with data needed to integrate trace file */
CpuAction *sleep(double duration) override;
double getAvailableSpeed() override;
void modified(bool modified);
CpuTiTgmr *p_availTrace; /*< Structure with data needed to integrate trace file */
- tmgr_trace_event_t p_stateEvent = NULL; /*< trace file with states events (ON or OFF) */
- tmgr_trace_event_t p_speedEvent = NULL; /*< 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 = 0; /*< last update of actions' remaining amount done */
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 = 0; /*< last update of actions' remaining amount done */
@@
-152,11
+152,11
@@
class CpuTiModel : public CpuModel {
public:
CpuTiModel();
~CpuTiModel();
public:
CpuTiModel();
~CpuTiModel();
- Cpu *createCpu(simgrid::Host *host, xbt_dynar_t speedPeak,
+ Cpu *createCpu(simgrid::
s4u::
Host *host, xbt_dynar_t speedPeak,
int pstate, double speedScale,
tmgr_trace_t speedTrace, int core,
int initiallyOn,
int pstate, double speedScale,
tmgr_trace_t speedTrace, int core,
int initiallyOn,
- tmgr_trace_t state_trace);
+ tmgr_trace_t state_trace)
override
;
double shareResources(double now) override;
void updateActionsState(double now, double delta) override;
void addTraces() override;
double shareResources(double now) override;
void updateActionsState(double now, double delta) override;
void addTraces() override;