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
Change MSG_file_unlink() return type
[simgrid.git]
/
src
/
surf
/
cpu_ti.hpp
diff --git
a/src/surf/cpu_ti.hpp
b/src/surf/cpu_ti.hpp
index
e2e9406
..
b44ff97
100644
(file)
--- a/
src/surf/cpu_ti.hpp
+++ b/
src/surf/cpu_ti.hpp
@@
-1,3
+1,9
@@
+/* 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"
#include "cpu_interface.hpp"
#include "trace_mgr_private.h"
#include "surf/surf_routing.h"
@@
-71,7
+77,6
@@
public:
tmgr_trace_t p_powerTrace;
};
tmgr_trace_t p_powerTrace;
};
-
/*********
* Model *
*********/
/*********
* Model *
*********/
@@
-87,7
+92,6
@@
public:
e_surf_resource_state_t state_initial,
tmgr_trace_t state_trace,
xbt_dict_t cpu_properties);
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();
double shareResources(double now);
void updateActionsState(double now, double delta);
void addTraces();
@@
-125,15
+129,10
@@
public:
CpuActionPtr sleep(double duration);
double getAvailableSpeed();
CpuActionPtr sleep(double duration);
double getAvailableSpeed();
- xbt_dynar_t getWattsRangeList() {THROW_UNIMPLEMENTED;};
- double getCurrentWattsValue(double /*cpu_load*/) {THROW_UNIMPLEMENTED;};
- void updateEnergy(double /*cpu_load*/) {THROW_UNIMPLEMENTED;};
-
double getCurrentPowerPeak() {THROW_UNIMPLEMENTED;};
double getPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
int getNbPstates() {THROW_UNIMPLEMENTED;};
void setPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
double getCurrentPowerPeak() {THROW_UNIMPLEMENTED;};
double getPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
int getNbPstates() {THROW_UNIMPLEMENTED;};
void setPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
- double getConsumedEnergy() {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) */
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) */
@@
-176,8
+175,6
@@
public:
void setPriority(double priority);
double getRemains();
void setAffinity(CpuPtr /*cpu*/, unsigned long /*mask*/) {};
void setPriority(double priority);
double getRemains();
void setAffinity(CpuPtr /*cpu*/, unsigned long /*mask*/) {};
- void setBound(double /*bound*/) {};
- void updateEnergy() {};
CpuTiPtr p_cpu;
int m_indexHeap;
CpuTiPtr p_cpu;
int m_indexHeap;