XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, "Logging specific to the SURF cpu module");
-void_f_void_t surf_cpu_model_init_preparse = nullptr;
-
simgrid::surf::CpuModel *surf_cpu_model_pm;
simgrid::surf::CpuModel *surf_cpu_model_vm;
namespace simgrid {
namespace surf {
-/*************
- * Callbacks *
- *************/
-
-simgrid::xbt::signal<void(CpuAction*, Action::State, Action::State)> cpuActionStateChangedCallbacks;
-
/*********
* Model *
*********/
-CpuModel::~CpuModel() {}
-
void CpuModel::updateActionsStateLazy(double now, double /*delta*/)
{
- CpuAction *action;
while ((xbt_heap_size(getActionHeap()) > 0)
&& (double_equals(xbt_heap_maxkey(getActionHeap()), now, sg_surf_precision))) {
- action = static_cast<CpuAction*>(xbt_heap_pop(getActionHeap()));
+
+ CpuAction *action = static_cast<CpuAction*>(xbt_heap_pop(getActionHeap()));
XBT_CDEBUG(surf_kernel, "Something happened to action %p", action);
if (TRACE_is_enabled()) {
Cpu *cpu = static_cast<Cpu*>(lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0)));
/* set the remains to 0 due to precision problems when updating the remaining amount */
action->setRemains(0);
action->setState(Action::State::done);
- action->heapRemove(getActionHeap()); //FIXME: strange call since action was already popped
}
if (TRACE_is_enabled()) {
//defining the last timestamp that we can safely dump to trace file
ActionList *actionSet = getRunningActionSet();
for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end())
; it != itend ; ++it) {
- action = static_cast<CpuAction*>(&*it);
+ CpuAction *action = static_cast<CpuAction*>(&*it);
if (smaller < 0) {
smaller = action->getLastUpdate();
continue;
TRACE_last_timestamp_to_dump = smaller;
}
}
- return;
}
void CpuModel::updateActionsStateFull(double now, double delta)
}
}
-bool CpuModel::next_occuring_event_isIdempotent()
-{
- return true;
-}
-
/************
* Resource *
************/
-Cpu::Cpu(Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core)
+Cpu::Cpu(Model *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core)
: Cpu(model, host, nullptr/*constraint*/, speedPerPstate, core)
{
}
-Cpu::Cpu(Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint,
- xbt_dynar_t speedPerPstate, int core)
- : Resource(model, host->name().c_str(), constraint)
- , coresAmount_(core)
- , host_(host)
+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)
{
- xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->name().c_str());
+ xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->cname());
- speed_.peak = xbt_dynar_get_as(speedPerPstate, 0/*pstate*/, double);
+ speed_.peak = speedPerPstate->front();
speed_.scale = 1;
host->pimpl_cpu = this;
- xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->name().c_str());
+ xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->cname());
// Copy the power peak array:
- speedPerPstate_ = xbt_dynar_new(sizeof(double), nullptr);
- unsigned long n = xbt_dynar_length(speedPerPstate);
- for (unsigned long i = 0; i != n; ++i) {
- double value = xbt_dynar_get_as(speedPerPstate, i, double);
- xbt_dynar_push(speedPerPstate_, &value);
+ for (double value : *speedPerPstate) {
+ speedPerPstate_.push_back(value);
}
xbt_assert(model == surf_cpu_model_pm || core==1, "Currently, VM cannot be multicore");
}
-Cpu::~Cpu()
-{
- xbt_dynar_free(&speedPerPstate_);
-}
+Cpu::~Cpu() = default;
double Cpu::getPstateSpeedCurrent()
{
int Cpu::getNbPStates()
{
- return xbt_dynar_length(speedPerPstate_);
+ return speedPerPstate_.size();
}
void Cpu::setPState(int pstate_index)
{
- xbt_dynar_t plist = speedPerPstate_;
- xbt_assert(pstate_index <= (int)xbt_dynar_length(plist),
- "Invalid parameters for CPU %s (pstate %d > length of pstates %d)", getName(), pstate_index, (int)xbt_dynar_length(plist));
+ xbt_assert(pstate_index <= static_cast<int>(speedPerPstate_.size()),
+ "Invalid parameters for CPU %s (pstate %d > length of pstates %d)", getName(), pstate_index,
+ static_cast<int>(speedPerPstate_.size()));
- double new_peak_speed = xbt_dynar_get_as(plist, pstate_index, double);
+ double new_peak_speed = speedPerPstate_[pstate_index];
pstate_ = pstate_index;
speed_.peak = new_peak_speed;
double Cpu::getPstateSpeed(int pstate_index)
{
- xbt_dynar_t plist = speedPerPstate_;
- xbt_assert((pstate_index <= (int)xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)");
+ xbt_assert((pstate_index <= static_cast<int>(speedPerPstate_.size())), "Invalid parameters (pstate index out of bounds)");
- return xbt_dynar_get_as(plist, pstate_index, double);
+ return speedPerPstate_[pstate_index];
}
double Cpu::getSpeed(double load)
TRACE_surf_host_set_speed(surf_get_clock(), getName(), coresAmount_ * speed_.scale * speed_.peak);
}
-
-int Cpu::getCore()
+int Cpu::coreCount()
{
return coresAmount_;
}
void Cpu::setStateTrace(tmgr_trace_t trace)
{
- xbt_assert(stateEvent_==nullptr,"Cannot set a second state trace to Host %s", host_->name().c_str());
+ xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->cname());
stateEvent_ = future_evt_set->add_trace(trace, 0.0, this);
}
void Cpu::setSpeedTrace(tmgr_trace_t trace)
{
- xbt_assert(speed_.event==nullptr,"Cannot set a second speed trace to Host %s", host_->name().c_str());
+ xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->cname());
speed_.event = future_evt_set->add_trace(trace, 0.0, this);
}
