-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-2017. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include <xbt/dynar.h>
#include "cpu_interface.hpp"
-#include "plugins/energy.hpp"
#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
action->getLastUpdate(), now - action->getLastUpdate());
}
- action->finish();
+ action->finish(Action::State::done);
XBT_CDEBUG(surf_kernel, "Action %p finished", action);
/* set the remains to 0 due to precision problems when updating the remaining amount */
action->setRemains(0);
- action->setState(Action::State::done);
}
if (TRACE_is_enabled()) {
//defining the last timestamp that we can safely dump to trace file
//without losing the event ascending order (considering all CPU's)
double smaller = -1;
ActionList *actionSet = getRunningActionSet();
- for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end())
- ; it != itend ; ++it) {
+ ActionList::iterator it(actionSet->begin());
+ ActionList::iterator itend(actionSet->end());
+ for (; it != itend; ++it) {
CpuAction *action = static_cast<CpuAction*>(&*it);
- if (smaller < 0) {
- smaller = action->getLastUpdate();
- continue;
- }
- if (action->getLastUpdate() < smaller) {
- smaller = action->getLastUpdate();
- }
+ if (smaller < 0 || action->getLastUpdate() < smaller)
+ smaller = action->getLastUpdate();
}
if (smaller > 0) {
TRACE_last_timestamp_to_dump = smaller;
{
CpuAction *action = nullptr;
ActionList *running_actions = getRunningActionSet();
-
- for(ActionList::iterator it(running_actions->begin()), itNext=it, itend(running_actions->end())
- ; it != itend ; it=itNext) {
+ ActionList::iterator it(running_actions->begin());
+ ActionList::iterator itNext = it;
+ ActionList::iterator itend(running_actions->end());
+ for (; it != itend; it = itNext) {
++itNext;
action = static_cast<CpuAction*>(&*it);
if (TRACE_is_enabled()) {
action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
-
if (action->getMaxDuration() != NO_MAX_DURATION)
action->updateMaxDuration(delta);
-
- if ((action->getRemainsNoUpdate() <= 0) &&
- (lmm_get_variable_weight(action->getVariable()) > 0)) {
- action->finish();
- action->setState(Action::State::done);
- } else if ((action->getMaxDuration() != NO_MAX_DURATION) &&
- (action->getMaxDuration() <= 0)) {
- action->finish();
- action->setState(Action::State::done);
+ if (((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) ||
+ ((action->getMaxDuration() != NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) {
+ action->finish(Action::State::done);
}
}
}
Cpu::Cpu(Model* model, simgrid::s4u::Host* host, lmm_constraint_t constraint, std::vector<double>* speedPerPstate,
int core)
- : Resource(model, host->cname(), constraint), coresAmount_(core), host_(host)
+ : Resource(model, host->getCname(), constraint), coresAmount_(core), host_(host)
{
- xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->cname());
+ xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->getCname());
speed_.peak = speedPerPstate->front();
speed_.scale = 1;
host->pimpl_cpu = this;
- xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->cname());
+ xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->getCname());
// Copy the power peak array:
- for (double value : *speedPerPstate) {
+ for (double const& value : *speedPerPstate) {
speedPerPstate_.push_back(value);
}
-
- xbt_assert(model == surf_cpu_model_pm || core==1, "Currently, VM cannot be multicore");
}
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();
void Cpu::onSpeedChange() {
TRACE_surf_host_set_speed(surf_get_clock(), cname(), coresAmount_ * speed_.scale * speed_.peak);
+ s4u::Host::onSpeedChange(*host_);
}
int Cpu::coreCount()
void Cpu::setStateTrace(tmgr_trace_t trace)
{
- xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->cname());
+ xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->getCname());
- 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)
{
- xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->cname());
+ xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->getCname());
- speed_.event = future_evt_set->add_trace(trace, 0.0, this);
+ speed_.event = future_evt_set->add_trace(trace, this);
}
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);
