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
move all inst declarations into their namespace
[simgrid.git]
/
src
/
surf
/
cpu_interface.cpp
diff --git
a/src/surf/cpu_interface.cpp
b/src/surf/cpu_interface.cpp
index
6c724d2
..
026fcbb
100644
(file)
--- a/
src/surf/cpu_interface.cpp
+++ b/
src/surf/cpu_interface.cpp
@@
-54,7
+54,7
@@
void CpuModel::updateActionsStateLazy(double now, double /*delta*/)
smaller = action->getLastUpdate();
}
if (smaller > 0) {
smaller = action->getLastUpdate();
}
if (smaller > 0) {
- TRACE_last_timestamp_to_dump = smaller;
+
simgrid::instr::
TRACE_last_timestamp_to_dump = smaller;
}
}
}
}
}
}
@@
-74,7
+74,7
@@
void CpuModel::updateActionsStateFull(double now, double delta)
TRACE_surf_host_set_utilization(cpu->cname(), action->getCategory(), lmm_variable_getvalue(action->getVariable()),
now - delta, delta);
TRACE_surf_host_set_utilization(cpu->cname(), action->getCategory(), lmm_variable_getvalue(action->getVariable()),
now - delta, delta);
- TRACE_last_timestamp_to_dump = now - delta;
+
simgrid::instr::
TRACE_last_timestamp_to_dump = now - delta;
}
action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
}
action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
@@
-100,31
+100,23
@@
Cpu::Cpu(Model *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPs
Cpu::Cpu(Model* model, simgrid::s4u::Host* host, lmm_constraint_t constraint, std::vector<double>* speedPerPstate,
int core)
Cpu::Cpu(Model* model, simgrid::s4u::Host* host, lmm_constraint_t constraint, std::vector<double>* speedPerPstate,
int core)
- : Resource(model, host->
c
name(), constraint), coresAmount_(core), host_(host)
+ : Resource(model, host->
getC
name(), constraint), coresAmount_(core), host_(host)
{
{
- xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->
c
name());
+ xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->
getC
name());
speed_.peak = speedPerPstate->front();
speed_.scale = 1;
host->pimpl_cpu = this;
speed_.peak = speedPerPstate->front();
speed_.scale = 1;
host->pimpl_cpu = this;
- xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->
c
name());
+ xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->
getC
name());
// Copy the power peak array:
// Copy the power peak array:
- for (double value : *speedPerPstate) {
+ for (double
const&
value : *speedPerPstate) {
speedPerPstate_.push_back(value);
}
speedPerPstate_.push_back(value);
}
-
- xbt_assert(model == surf_cpu_model_pm || core==1, "Currently, VM cannot be multicore");
}
Cpu::~Cpu() = default;
}
Cpu::~Cpu() = default;
-/** @brief The amount of flop per second that this CPU can compute at its current DVFS level */
-double Cpu::getPstateSpeedCurrent()
-{
- return speed_.peak;
-}
-
int Cpu::getNbPStates()
{
return speedPerPstate_.size();
int Cpu::getNbPStates()
{
return speedPerPstate_.size();
@@
-178,15
+170,15
@@
int Cpu::coreCount()
void Cpu::setStateTrace(tmgr_trace_t trace)
{
void Cpu::setStateTrace(tmgr_trace_t trace)
{
- xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->
c
name());
+ xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->
getC
name());
- stateEvent_ = future_evt_set->add_trace(trace,
0.0,
this);
+ stateEvent_ = future_evt_set->add_trace(trace, this);
}
void Cpu::setSpeedTrace(tmgr_trace_t trace)
{
}
void Cpu::setSpeedTrace(tmgr_trace_t trace)
{
- xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->
c
name());
+ xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->
getC
name());
- speed_.event = future_evt_set->add_trace(trace,
0.0,
this);
+ speed_.event = future_evt_set->add_trace(trace, this);
}
}
@@
-218,6
+210,18
@@
void CpuAction::updateRemainingLazy(double now)
simgrid::xbt::signal<void(simgrid::surf::CpuAction*, Action::State)> CpuAction::onStateChange;
simgrid::xbt::signal<void(simgrid::surf::CpuAction*, Action::State)> CpuAction::onStateChange;
+void CpuAction::suspend(){
+ Action::State previous = getState();
+ onStateChange(this, previous);
+ Action::suspend();
+}
+
+void CpuAction::resume(){
+ Action::State previous = getState();
+ onStateChange(this, previous);
+ Action::resume();
+}
+
void CpuAction::setState(Action::State state){
Action::State previous = getState();
Action::setState(state);
void CpuAction::setState(Action::State state){
Action::State previous = getState();
Action::setState(state);