-/* Copyright (c) 2013-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2018. 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_ti.hpp"
-#include "xbt/heap.h"
+#include "src/surf/surf_interface.hpp"
#include "src/surf/trace_mgr.hpp"
+#include "surf/surf.hpp"
#ifndef SURF_MODEL_CPUTI_H_
#define SURF_MODEL_CPUTI_H_
double integral = 0;
double time = 0;
int i = 0;
- nbPoints_ = speedTrace->event_list.size() + 1;
- timePoints_ = new double[nbPoints_];
- integral_ = new double[nbPoints_];
+ nb_points_ = speedTrace->event_list.size() + 1;
+ time_points_ = new double[nb_points_];
+ integral_ = new double[nb_points_];
for (auto const& val : speedTrace->event_list) {
- timePoints_[i] = time;
+ time_points_[i] = time;
integral_[i] = integral;
integral += val.date_ * val.value_;
time += val.date_;
i++;
}
- timePoints_[i] = time;
+ time_points_[i] = time;
integral_[i] = integral;
}
CpuTiTrace::~CpuTiTrace()
{
- delete [] timePoints_;
+ delete[] time_points_;
delete [] integral_;
}
-CpuTiTgmr::~CpuTiTgmr()
+CpuTiTmgr::~CpuTiTmgr()
{
- if (trace_)
- delete trace_;
+ delete trace_;
}
/**
* \param b End of interval
* \return the integrate value. -1 if an error occurs.
*/
-double CpuTiTgmr::integrate(double a, double b)
+double CpuTiTmgr::integrate(double a, double b)
{
int a_index;
return ((b - a) * value_);
}
- if (fabs(ceil(a / lastTime_) - a / lastTime_) < EPSILON)
- a_index = 1 + static_cast<int>(ceil(a / lastTime_));
+ if (fabs(ceil(a / last_time_) - a / last_time_) < EPSILON)
+ a_index = 1 + static_cast<int>(ceil(a / last_time_));
else
- a_index = static_cast<int> (ceil(a / lastTime_));
+ a_index = static_cast<int>(ceil(a / last_time_));
- int b_index = static_cast<int> (floor(b / lastTime_));
+ int b_index = static_cast<int>(floor(b / last_time_));
if (a_index > b_index) { /* Same chunk */
- return trace_->integrateSimple(a - (a_index - 1) * lastTime_, b - (b_index) * lastTime_);
+ return trace_->integrate_simple(a - (a_index - 1) * last_time_, b - (b_index)*last_time_);
}
- double first_chunk = trace_->integrateSimple(a - (a_index - 1) * lastTime_, lastTime_);
+ double first_chunk = trace_->integrate_simple(a - (a_index - 1) * last_time_, last_time_);
double middle_chunk = (b_index - a_index) * total_;
- double last_chunk = trace_->integrateSimple(0.0, b - (b_index) * lastTime_);
+ double last_chunk = trace_->integrate_simple(0.0, b - (b_index)*last_time_);
XBT_DEBUG("first_chunk=%.2f middle_chunk=%.2f last_chunk=%.2f\n", first_chunk, middle_chunk, last_chunk);
* \param a Initial point
* \param b Final point
*/
-double CpuTiTrace::integrateSimple(double a, double b)
+double CpuTiTrace::integrate_simple(double a, double b)
{
- return integrateSimplePoint(b) - integrateSimplePoint(a);
+ return integrate_simple_point(b) - integrate_simple_point(a);
}
/**
* \brief Auxiliary function to compute the integral at point a.
* \param a point
*/
-double CpuTiTrace::integrateSimplePoint(double a)
+double CpuTiTrace::integrate_simple_point(double a)
{
double integral = 0;
double a_aux = a;
- int ind = binarySearch(timePoints_, a, 0, nbPoints_ - 1);
+ int ind = binary_search(time_points_, a, 0, nb_points_ - 1);
integral += integral_[ind];
- XBT_DEBUG("a %f ind %d integral %f ind + 1 %f ind %f time +1 %f time %f",
- a, ind, integral, integral_[ind + 1], integral_[ind], timePoints_[ind + 1], timePoints_[ind]);
- double_update(&a_aux, timePoints_[ind], sg_maxmin_precision*sg_surf_precision);
+ XBT_DEBUG("a %f ind %d integral %f ind + 1 %f ind %f time +1 %f time %f", a, ind, integral, integral_[ind + 1],
+ integral_[ind], time_points_[ind + 1], time_points_[ind]);
+ double_update(&a_aux, time_points_[ind], sg_maxmin_precision * sg_surf_precision);
if (a_aux > 0)
- integral += ((integral_[ind + 1] - integral_[ind]) / (timePoints_[ind + 1] - timePoints_[ind])) *
- (a - timePoints_[ind]);
+ integral +=
+ ((integral_[ind + 1] - integral_[ind]) / (time_points_[ind + 1] - time_points_[ind])) * (a - time_points_[ind]);
XBT_DEBUG("Integral a %f = %f", a, integral);
return integral;
* \param amount Amount to be executed
* \return End time
*/
-double CpuTiTgmr::solve(double a, double amount)
+double CpuTiTmgr::solve(double a, double amount)
{
/* Fix very small negative numbers */
if ((a < 0.0) && (a > -EPSILON)) {
/* Reduce the problem to one where amount <= trace_total */
int quotient = static_cast<int>(floor(amount / total_));
double reduced_amount = (total_) * ((amount / total_) - floor(amount / total_));
- double reduced_a = a - (lastTime_) * static_cast<int>(floor(a / lastTime_));
+ double reduced_a = a - (last_time_) * static_cast<int>(floor(a / last_time_));
XBT_DEBUG("Quotient: %d reduced_amount: %f reduced_a: %f", quotient, reduced_amount, reduced_a);
/* Now solve for new_amount which is <= trace_total */
- double reduced_b = solveSomewhatSimple(reduced_a, reduced_amount);
+ double reduced_b;
+ XBT_DEBUG("Solve integral: [%.2f, amount=%.2f]", reduced_a, reduced_amount);
+ double amount_till_end = integrate(reduced_a, last_time_);
-/* Re-map to the original b and amount */
- double b = (lastTime_) * static_cast<int>(floor(a / lastTime_)) + (quotient * lastTime_) + reduced_b;
- return b;
-}
-
-/**
-* \brief Auxiliary function to solve integral
-*
-* Here, amount is <= trace->total
-* and a <=trace->last_time
-*
-*/
-double CpuTiTgmr::solveSomewhatSimple(double a, double amount)
-{
- double b;
-
- XBT_DEBUG("Solve integral: [%.2f, amount=%.2f]", a, amount);
- double amount_till_end = integrate(a, lastTime_);
-
- if (amount_till_end > amount) {
- b = trace_->solveSimple(a, amount);
+ if (amount_till_end > reduced_amount) {
+ reduced_b = trace_->solve_simple(reduced_a, reduced_amount);
} else {
- b = lastTime_ + trace_->solveSimple(0.0, amount - amount_till_end);
+ reduced_b = last_time_ + trace_->solve_simple(0.0, reduced_amount - amount_till_end);
}
- return b;
+
+ /* Re-map to the original b and amount */
+ return (last_time_) * static_cast<int>(floor(a / last_time_)) + (quotient * last_time_) + reduced_b;
}
/**
* \param amount Amount of flops
* \return The date when amount is available.
*/
-double CpuTiTrace::solveSimple(double a, double amount)
+double CpuTiTrace::solve_simple(double a, double amount)
{
- double integral_a = integrateSimplePoint(a);
- int ind = binarySearch(integral_, integral_a + amount, 0, nbPoints_ - 1);
- double time = timePoints_[ind];
+ double integral_a = integrate_simple_point(a);
+ int ind = binary_search(integral_, integral_a + amount, 0, nb_points_ - 1);
+ double time = time_points_[ind];
time += (integral_a + amount - integral_[ind]) /
- ((integral_[ind + 1] - integral_[ind]) / (timePoints_[ind + 1] - timePoints_[ind]));
+ ((integral_[ind + 1] - integral_[ind]) / (time_points_[ind + 1] - time_points_[ind]));
return time;
}
* \param a Time
* \return CPU speed scale
*/
-double CpuTiTgmr::getPowerScale(double a)
+double CpuTiTmgr::get_power_scale(double a)
{
- double reduced_a = a - floor(a / lastTime_) * lastTime_;
- int point = trace_->binarySearch(trace_->timePoints_, reduced_a, 0, trace_->nbPoints_ - 1);
- trace_mgr::DatedValue val = speedTrace_->event_list.at(point);
+ double reduced_a = a - floor(a / last_time_) * last_time_;
+ int point = trace_->binary_search(trace_->time_points_, reduced_a, 0, trace_->nb_points_ - 1);
+ trace_mgr::DatedValue val = speed_trace_->event_list.at(point);
return val.value_;
}
/**
-* \brief Creates a new integration trace from a tmgr_trace_t
-*
-* \param speedTrace CPU availability trace
-* \param value Percentage of CPU speed available (useful to fixed tracing)
-* \return Integration trace structure
-*/
-CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, double value) :
- speedTrace_(speedTrace)
+ * \brief Creates a new integration trace from a tmgr_trace_t
+ *
+ * \param speed_trace CPU availability trace
+ * \param value Percentage of CPU speed available (useful to fixed tracing)
+ * \return Integration trace structure
+ */
+CpuTiTmgr::CpuTiTmgr(tmgr_trace_t speed_trace, double value) : speed_trace_(speed_trace)
{
double total_time = 0.0;
trace_ = 0;
-/* no availability file, fixed trace */
- if (not speedTrace) {
+ /* no availability file, fixed trace */
+ if (not speed_trace) {
type_ = TRACE_FIXED;
value_ = value;
XBT_DEBUG("No availability trace. Constant value = %f", value);
}
/* only one point available, fixed trace */
- if (speedTrace->event_list.size() == 1) {
- trace_mgr::DatedValue val = speedTrace->event_list.front();
- type_ = TRACE_FIXED;
- value_ = val.value_;
+ if (speed_trace->event_list.size() == 1) {
+ type_ = TRACE_FIXED;
+ value_ = speed_trace->event_list.front().value_;
return;
}
type_ = TRACE_DYNAMIC;
/* count the total time of trace file */
- for (auto const& val : speedTrace->event_list)
+ for (auto const& val : speed_trace->event_list)
total_time += val.date_;
- trace_ = new CpuTiTrace(speedTrace);
- lastTime_ = total_time;
- total_ = trace_->integrateSimple(0, total_time);
+ trace_ = new CpuTiTrace(speed_trace);
+ last_time_ = total_time;
+ total_ = trace_->integrate_simple(0, total_time);
- XBT_DEBUG("Total integral %f, last_time %f ", total_, lastTime_);
+ XBT_DEBUG("Total integral %f, last_time %f ", total_, last_time_);
}
/**
* \param high Upper bound to search in array
* \return Index of point
*/
-int CpuTiTrace::binarySearch(double *array, double a, int low, int high)
+int CpuTiTrace::binary_search(double* array, double a, int low, int high)
{
xbt_assert(low < high, "Wrong parameters: low (%d) should be smaller than high (%d)", low, high);
namespace simgrid {
namespace surf {
-CpuTiModel::CpuTiModel() : CpuModel()
-{
- runningActionSetThatDoesNotNeedBeingChecked_ = new ActionList();
-
- modifiedCpu_ = new CpuTiList();
-}
-
CpuTiModel::~CpuTiModel()
{
surf_cpu_model_pm = nullptr;
- delete runningActionSetThatDoesNotNeedBeingChecked_;
- delete modifiedCpu_;
}
-Cpu *CpuTiModel::createCpu(simgrid::s4u::Host *host, std::vector<double>* speedPerPstate, int core)
+Cpu* CpuTiModel::create_cpu(simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core)
{
- return new CpuTi(this, host, speedPerPstate, core);
+ return new CpuTi(this, host, speed_per_pstate, core);
}
-double CpuTiModel::nextOccuringEvent(double now)
+double CpuTiModel::next_occuring_event(double now)
{
double min_action_duration = -1;
-/* iterates over modified cpus to update share resources */
- CpuTiList::iterator itend(modifiedCpu_->end());
- CpuTiList::iterator it(modifiedCpu_->begin());
- while (it != itend) {
- CpuTi *ti = &*it;
- ++it;
- ti->updateActionsFinishTime(now);
+ /* iterates over modified cpus to update share resources */
+ for (auto it = std::begin(modified_cpus_); it != std::end(modified_cpus_);) {
+ CpuTi& cpu = *it;
+ ++it; // increment iterator here since the following call to ti.update_actions_finish_time() may invalidate it
+ cpu.update_actions_finish_time(now);
}
-/* get the min next event if heap not empty */
- if (xbt_heap_size(getActionHeap()) > 0)
- min_action_duration = xbt_heap_maxkey(getActionHeap()) - now;
+ /* get the min next event if heap not empty */
+ if (not get_action_heap().empty())
+ min_action_duration = get_action_heap().top_date() - now;
XBT_DEBUG("Share resources, min next event date: %f", min_action_duration);
return min_action_duration;
}
-void CpuTiModel::updateActionsState(double now, double /*delta*/)
+void CpuTiModel::update_actions_state(double now, double /*delta*/)
{
- while ((xbt_heap_size(getActionHeap()) > 0) && (xbt_heap_maxkey(getActionHeap()) <= now)) {
- CpuTiAction* action = static_cast<CpuTiAction*>(xbt_heap_pop(getActionHeap()));
+ while (not get_action_heap().empty() && double_equals(get_action_heap().top_date(), now, sg_surf_precision)) {
+ CpuTiAction* action = static_cast<CpuTiAction*>(get_action_heap().pop());
XBT_DEBUG("Action %p: finish", action);
- action->finish(Action::State::done);
- /* set the remains to 0 due to precision problems when updating the remaining amount */
- action->setRemains(0);
+ action->finish(kernel::resource::Action::State::FINISHED);
/* update remaining amount of all actions */
- action->cpu_->updateRemainingAmount(surf_get_clock());
+ action->cpu_->update_remaining_amount(surf_get_clock());
}
}
CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core)
: Cpu(model, host, speedPerPstate, core)
{
- xbt_assert(core==1,"Multi-core not handled by this model yet");
- coresAmount_ = core;
-
- actionSet_ = new ActionTiList();
+ xbt_assert(core == 1, "Multi-core not handled by this model yet");
speed_.peak = speedPerPstate->front();
XBT_DEBUG("CPU create: peak=%f", speed_.peak);
- speedIntegratedTrace_ = new CpuTiTgmr(nullptr, 1/*scale*/);
+ speed_integrated_trace_ = new CpuTiTmgr(nullptr, 1 /*scale*/);
}
CpuTi::~CpuTi()
{
- modified(false);
- delete speedIntegratedTrace_;
- delete actionSet_;
+ set_modified(false);
+ delete speed_integrated_trace_;
}
-void CpuTi::setSpeedTrace(tmgr_trace_t trace)
+void CpuTi::set_speed_trace(tmgr_trace_t trace)
{
- if (speedIntegratedTrace_)
- delete speedIntegratedTrace_;
-
- speedIntegratedTrace_ = new CpuTiTgmr(trace, speed_.scale);
+ delete speed_integrated_trace_;
+ speed_integrated_trace_ = new CpuTiTmgr(trace, speed_.scale);
/* add a fake trace event if periodicity == 0 */
if (trace && trace->event_list.size() > 1) {
void CpuTi::apply_event(tmgr_trace_event_t event, double value)
{
if (event == speed_.event) {
- tmgr_trace_t speedTrace;
- CpuTiTgmr *trace;
-
XBT_DEBUG("Finish trace date: value %f", value);
- /* update remaining of actions and put in modified cpu swag */
- updateRemainingAmount(surf_get_clock());
+ /* update remaining of actions and put in modified cpu list */
+ update_remaining_amount(surf_get_clock());
- modified(true);
+ set_modified(true);
- speedTrace = speedIntegratedTrace_->speedTrace_;
+ tmgr_trace_t speedTrace = speed_integrated_trace_->speed_trace_;
trace_mgr::DatedValue val = speedTrace->event_list.back();
- delete speedIntegratedTrace_;
+ delete speed_integrated_trace_;
speed_.scale = val.value_;
- trace = new CpuTiTgmr(TRACE_FIXED, val.value_);
+ CpuTiTmgr* trace = new CpuTiTmgr(TRACE_FIXED, val.value_);
XBT_DEBUG("value %f", val.value_);
- speedIntegratedTrace_ = trace;
+ speed_integrated_trace_ = trace;
tmgr_trace_event_unref(&speed_.event);
- } else if (event == stateEvent_) {
+ } else if (event == state_event_) {
if (value > 0) {
- if(isOff())
- host_that_restart.push_back(getHost());
- turnOn();
+ if (is_off())
+ host_that_restart.push_back(get_host());
+ turn_on();
} else {
- turnOff();
+ turn_off();
double date = surf_get_clock();
/* put all action running on cpu to failed */
- ActionTiList::iterator itend(actionSet_->end());
- for (ActionTiList::iterator it(actionSet_->begin()); it != itend; ++it) {
- CpuTiAction *action = &*it;
- if (action->getState() == Action::State::running
- || action->getState() == Action::State::ready
- || action->getState() == Action::State::not_in_the_system) {
- action->setFinishTime(date);
- action->setState(Action::State::failed);
- if (action->getIndexHeap() >= 0) {
- CpuTiAction* heap_act =
- static_cast<CpuTiAction*>(xbt_heap_remove(model()->getActionHeap(), action->getIndexHeap()));
- if (heap_act != action)
- DIE_IMPOSSIBLE;
- }
+ for (CpuTiAction& action : action_set_) {
+ if (action.get_state() == kernel::resource::Action::State::INITED ||
+ action.get_state() == kernel::resource::Action::State::STARTED ||
+ action.get_state() == kernel::resource::Action::State::IGNORED) {
+ action.set_finish_time(date);
+ action.set_state(kernel::resource::Action::State::FAILED);
+ get_model()->get_action_heap().remove(&action);
}
}
}
- tmgr_trace_event_unref(&stateEvent_);
+ tmgr_trace_event_unref(&state_event_);
} else {
xbt_die("Unknown event!\n");
}
}
-void CpuTi::updateActionsFinishTime(double now)
+/** Update the actions that are running on this CPU (which was modified recently) */
+void CpuTi::update_actions_finish_time(double now)
{
- CpuTiAction *action;
- double sum_priority = 0.0;
- double total_area;
-
/* update remaining amount of actions */
- updateRemainingAmount(now);
+ update_remaining_amount(now);
- ActionTiList::iterator itend(actionSet_->end());
- for (ActionTiList::iterator it(actionSet_->begin()); it != itend; ++it) {
- action = &*it;
+ /* Compute the sum of priorities for the actions running on that CPU */
+ sum_priority_ = 0.0;
+ for (CpuTiAction const& action : action_set_) {
/* action not running, skip it */
- if (action->getStateSet() != surf_cpu_model_pm->getRunningActionSet())
+ if (action.get_state_set() != surf_cpu_model_pm->get_started_action_set())
continue;
/* bogus priority, skip it */
- if (action->getPriority() <= 0)
+ if (action.get_priority() <= 0)
continue;
/* action suspended, skip it */
- if (action->suspended_ != 0)
+ if (action.suspended_ != kernel::resource::Action::SuspendStates::not_suspended)
continue;
- sum_priority += 1.0 / action->getPriority();
+ sum_priority_ += 1.0 / action.get_priority();
}
- sumPriority_ = sum_priority;
- for (ActionTiList::iterator it(actionSet_->begin()); it != itend; ++it) {
- action = &*it;
+ for (CpuTiAction& action : action_set_) {
double min_finish = -1;
/* action not running, skip it */
- if (action->getStateSet() != surf_cpu_model_pm->getRunningActionSet())
+ if (action.get_state_set() != surf_cpu_model_pm->get_started_action_set())
continue;
/* verify if the action is really running on cpu */
- if (action->suspended_ == 0 && action->getPriority() > 0) {
+ if (action.suspended_ == kernel::resource::Action::SuspendStates::not_suspended && action.get_priority() > 0) {
/* total area needed to finish the action. Used in trace integration */
- total_area = (action->getRemains()) * sum_priority * action->getPriority();
-
- total_area /= speed_.peak;
+ double total_area = (action.get_remains() * sum_priority_ * action.get_priority()) / speed_.peak;
- action->setFinishTime(speedIntegratedTrace_->solve(now, total_area));
+ action.set_finish_time(speed_integrated_trace_->solve(now, total_area));
/* verify which event will happen before (max_duration or finish time) */
- if (action->getMaxDuration() > NO_MAX_DURATION &&
- action->getStartTime() + action->getMaxDuration() < action->getFinishTime())
- min_finish = action->getStartTime() + action->getMaxDuration();
+ if (action.get_max_duration() > NO_MAX_DURATION &&
+ action.get_start_time() + action.get_max_duration() < action.get_finish_time())
+ min_finish = action.get_start_time() + action.get_max_duration();
else
- min_finish = action->getFinishTime();
+ min_finish = action.get_finish_time();
} else {
/* put the max duration time on heap */
- if (action->getMaxDuration() > NO_MAX_DURATION)
- min_finish = action->getStartTime() + action->getMaxDuration();
+ if (action.get_max_duration() > NO_MAX_DURATION)
+ min_finish = action.get_start_time() + action.get_max_duration();
}
/* add in action heap */
- XBT_DEBUG("action(%p) index %d", action, action->getIndexHeap());
- if (action->getIndexHeap() >= 0) {
- CpuTiAction* heap_act =
- static_cast<CpuTiAction*>(xbt_heap_remove(model()->getActionHeap(), action->getIndexHeap()));
- if (heap_act != action)
- DIE_IMPOSSIBLE;
- }
if (min_finish > NO_MAX_DURATION)
- xbt_heap_push(model()->getActionHeap(), action, min_finish);
+ get_model()->get_action_heap().update(&action, min_finish, kernel::resource::ActionHeap::Type::unset);
+ else
+ get_model()->get_action_heap().remove(&action);
- XBT_DEBUG("Update finish time: Cpu(%s) Action: %p, Start Time: %f Finish Time: %f Max duration %f", getCname(),
- action, action->getStartTime(), action->getFinishTime(), action->getMaxDuration());
+ XBT_DEBUG("Update finish time: Cpu(%s) Action: %p, Start Time: %f Finish Time: %f Max duration %f", get_cname(),
+ &action, action.get_start_time(), action.get_finish_time(), action.get_max_duration());
}
/* remove from modified cpu */
- modified(false);
+ set_modified(false);
}
-bool CpuTi::isUsed()
+bool CpuTi::is_used()
{
- return not actionSet_->empty();
+ return not action_set_.empty();
}
-double CpuTi::getAvailableSpeed()
+double CpuTi::get_speed_ratio()
{
- speed_.scale = speedIntegratedTrace_->getPowerScale(surf_get_clock());
- return Cpu::getAvailableSpeed();
+ speed_.scale = speed_integrated_trace_->get_power_scale(surf_get_clock());
+ return Cpu::get_speed_ratio();
}
/** @brief Update the remaining amount of actions */
-void CpuTi::updateRemainingAmount(double now)
+void CpuTi::update_remaining_amount(double now)
{
/* already updated */
- if (lastUpdate_ >= now)
+ if (last_update_ >= now)
return;
/* compute the integration area */
- double area_total = speedIntegratedTrace_->integrate(lastUpdate_, now) * speed_.peak;
- XBT_DEBUG("Flops total: %f, Last update %f", area_total, lastUpdate_);
- ActionTiList::iterator itend(actionSet_->end());
- for (ActionTiList::iterator it(actionSet_->begin()); it != itend; ++it) {
- CpuTiAction *action = &*it;
+ double area_total = speed_integrated_trace_->integrate(last_update_, now) * speed_.peak;
+ XBT_DEBUG("Flops total: %f, Last update %f", area_total, last_update_);
+ for (CpuTiAction& action : action_set_) {
/* action not running, skip it */
- if (action->getStateSet() != model()->getRunningActionSet())
+ if (action.get_state_set() != get_model()->get_started_action_set())
continue;
/* bogus priority, skip it */
- if (action->getPriority() <= 0)
+ if (action.get_priority() <= 0)
continue;
/* action suspended, skip it */
- if (action->suspended_ != 0)
+ if (action.suspended_ != kernel::resource::Action::SuspendStates::not_suspended)
continue;
/* action don't need update */
- if (action->getStartTime() >= now)
+ if (action.get_start_time() >= now)
continue;
/* skip action that are finishing now */
- if (action->getFinishTime() >= 0 && action->getFinishTime() <= now)
+ if (action.get_finish_time() >= 0 && action.get_finish_time() <= now)
continue;
/* update remaining */
- action->updateRemains(area_total / (sumPriority_ * action->getPriority()));
- XBT_DEBUG("Update remaining action(%p) remaining %f", action, action->getRemainsNoUpdate());
+ action.update_remains(area_total / (sum_priority_ * action.get_priority()));
+ XBT_DEBUG("Update remaining action(%p) remaining %f", &action, action.get_remains_no_update());
}
- lastUpdate_ = now;
+ last_update_ = now;
}
CpuAction *CpuTi::execution_start(double size)
{
- XBT_IN("(%s,%g)", getCname(), size);
- CpuTiAction* action = new CpuTiAction(static_cast<CpuTiModel*>(model()), size, isOff(), this);
+ XBT_IN("(%s,%g)", get_cname(), size);
+ CpuTiAction* action = new CpuTiAction(this, size);
- actionSet_->push_back(*action);
+ action_set_.push_back(*action); // Actually start the action
XBT_OUT();
return action;
CpuAction *CpuTi::sleep(double duration)
{
if (duration > 0)
- duration = MAX(duration, sg_surf_precision);
-
- XBT_IN("(%s,%g)", getCname(), duration);
- CpuTiAction* action = new CpuTiAction(static_cast<CpuTiModel*>(model()), 1.0, isOff(), this);
-
- action->setMaxDuration(duration);
- action->suspended_ = 2;
- if (duration == NO_MAX_DURATION) {
- /* Move to the *end* of the corresponding action set. This convention
- is used to speed up update_resource_state */
- action->getStateSet()->erase(action->getStateSet()->iterator_to(*action));
- action->stateSet_ = static_cast<CpuTiModel*>(model())->runningActionSetThatDoesNotNeedBeingChecked_;
- action->getStateSet()->push_back(*action);
- }
+ duration = std::max(duration, sg_surf_precision);
+
+ XBT_IN("(%s,%g)", get_cname(), duration);
+ CpuTiAction* action = new CpuTiAction(this, 1.0);
- actionSet_->push_back(*action);
+ action->set_max_duration(duration);
+ action->suspended_ = kernel::resource::Action::SuspendStates::sleeping;
+ if (duration < 0) // NO_MAX_DURATION
+ action->set_state(simgrid::kernel::resource::Action::State::IGNORED);
+
+ action_set_.push_back(*action);
XBT_OUT();
return action;
}
-void CpuTi::modified(bool modified){
- CpuTiList* modifiedCpu = static_cast<CpuTiModel*>(model())->modifiedCpu_;
+void CpuTi::set_modified(bool modified)
+{
+ CpuTiList& modified_cpus = static_cast<CpuTiModel*>(get_model())->modified_cpus_;
if (modified) {
if (not cpu_ti_hook.is_linked()) {
- modifiedCpu->push_back(*this);
+ modified_cpus.push_back(*this);
}
} else {
- if (cpu_ti_hook.is_linked()) {
- modifiedCpu->erase(modifiedCpu->iterator_to(*this));
- }
+ if (cpu_ti_hook.is_linked())
+ simgrid::xbt::intrusive_erase(modified_cpus, *this);
}
}
* Action *
**********/
-CpuTiAction::CpuTiAction(CpuTiModel *model_, double cost, bool failed, CpuTi *cpu)
- : CpuAction(model_, cost, failed)
- , cpu_(cpu)
+CpuTiAction::CpuTiAction(CpuTi* cpu, double cost) : CpuAction(cpu->get_model(), cost, cpu->is_off()), cpu_(cpu)
{
- updateIndexHeap(-1);
- cpu_->modified(true);
+ cpu_->set_modified(true);
}
-
-void CpuTiAction::setState(Action::State state)
+CpuTiAction::~CpuTiAction()
{
- CpuAction::setState(state);
- cpu_->modified(true);
+ /* remove from action_set */
+ if (action_ti_hook.is_linked())
+ simgrid::xbt::intrusive_erase(cpu_->action_set_, *this);
+ /* remove from heap */
+ get_model()->get_action_heap().remove(this);
+ cpu_->set_modified(true);
}
-int CpuTiAction::unref()
+void CpuTiAction::set_state(Action::State state)
{
- refcount_--;
- if (not refcount_) {
- if (action_hook.is_linked())
- getStateSet()->erase(getStateSet()->iterator_to(*this));
- /* remove from action_set */
- if (action_ti_hook.is_linked())
- cpu_->actionSet_->erase(cpu_->actionSet_->iterator_to(*this));
- /* remove from heap */
- xbt_heap_remove(getModel()->getActionHeap(), getIndexHeap());
- cpu_->modified(true);
- delete this;
- return 1;
- }
- return 0;
+ CpuAction::set_state(state);
+ cpu_->set_modified(true);
}
void CpuTiAction::cancel()
{
- this->setState(Action::State::failed);
- xbt_heap_remove(getModel()->getActionHeap(), getIndexHeap());
- cpu_->modified(true);
+ this->set_state(Action::State::FAILED);
+ get_model()->get_action_heap().remove(this);
+ cpu_->set_modified(true);
}
void CpuTiAction::suspend()
{
XBT_IN("(%p)", this);
- if (suspended_ != 2) {
- suspended_ = 1;
- xbt_heap_remove(getModel()->getActionHeap(), getIndexHeap());
- cpu_->modified(true);
+ if (suspended_ != Action::SuspendStates::sleeping) {
+ suspended_ = Action::SuspendStates::suspended;
+ get_model()->get_action_heap().remove(this);
+ cpu_->set_modified(true);
}
XBT_OUT();
}
void CpuTiAction::resume()
{
XBT_IN("(%p)", this);
- if (suspended_ != 2) {
- suspended_ = 0;
- cpu_->modified(true);
+ if (suspended_ != Action::SuspendStates::sleeping) {
+ suspended_ = Action::SuspendStates::not_suspended;
+ cpu_->set_modified(true);
}
XBT_OUT();
}
-void CpuTiAction::setMaxDuration(double duration)
+void CpuTiAction::set_max_duration(double duration)
{
double min_finish;
XBT_IN("(%p,%g)", this, duration);
- Action::setMaxDuration(duration);
+ Action::set_max_duration(duration);
if (duration >= 0)
- min_finish = (getStartTime() + getMaxDuration()) < getFinishTime() ?
- (getStartTime() + getMaxDuration()) : getFinishTime();
+ min_finish = (get_start_time() + get_max_duration()) < get_finish_time() ? (get_start_time() + get_max_duration())
+ : get_finish_time();
else
- min_finish = getFinishTime();
+ min_finish = get_finish_time();
-/* add in action heap */
- if (getIndexHeap() >= 0) {
- CpuTiAction* heap_act = static_cast<CpuTiAction*>(xbt_heap_remove(getModel()->getActionHeap(), getIndexHeap()));
- if (heap_act != this)
- DIE_IMPOSSIBLE;
- }
- xbt_heap_push(getModel()->getActionHeap(), this, min_finish);
+ /* add in action heap */
+ get_model()->get_action_heap().update(this, min_finish, kernel::resource::ActionHeap::Type::unset);
XBT_OUT();
}
-void CpuTiAction::setSharingWeight(double priority)
+void CpuTiAction::set_priority(double priority)
{
XBT_IN("(%p,%g)", this, priority);
- setSharingWeightNoUpdate(priority);
- cpu_->modified(true);
+ set_priority_no_update(priority);
+ cpu_->set_modified(true);
XBT_OUT();
}
-double CpuTiAction::getRemains()
+double CpuTiAction::get_remains()
{
XBT_IN("(%p)", this);
- cpu_->updateRemainingAmount(surf_get_clock());
+ cpu_->update_remaining_amount(surf_get_clock());
XBT_OUT();
- return getRemainsNoUpdate();
+ return get_remains_no_update();
}
}
