-/* 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
nbPoints_ = speedTrace->event_list.size() + 1;
timePoints_ = new double[nbPoints_];
integral_ = new double[nbPoints_];
- for (auto val : speedTrace->event_list) {
+ for (auto const& val : speedTrace->event_list) {
timePoints_[i] = time;
integral_[i] = integral;
- integral += val.delta * val.value;
- time += val.delta;
+ integral += val.date_ * val.value_;
+ time += val.date_;
i++;
}
timePoints_[i] = time;
{
double reduced_a = a - floor(a / lastTime_) * lastTime_;
int point = trace_->binarySearch(trace_->timePoints_, reduced_a, 0, trace_->nbPoints_ - 1);
- s_tmgr_event_t val = speedTrace_->event_list.at(point);
- return val.value;
+ trace_mgr::DatedValue val = speedTrace_->event_list.at(point);
+ return val.value_;
}
/**
trace_ = 0;
/* no availability file, fixed trace */
- if (!speedTrace) {
+ if (not speedTrace) {
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) {
- s_tmgr_event_t val = speedTrace->event_list.front();
+ trace_mgr::DatedValue val = speedTrace->event_list.front();
type_ = TRACE_FIXED;
- value_ = val.value;
+ value_ = val.value_;
return;
}
type_ = TRACE_DYNAMIC;
/* count the total time of trace file */
- for (auto val : speedTrace->event_list)
- total_time += val.delta;
+ for (auto const& val : speedTrace->event_list)
+ total_time += val.date_;
trace_ = new CpuTiTrace(speedTrace);
lastTime_ = total_time;
{
xbt_assert(low < high, "Wrong parameters: low (%d) should be smaller than high (%d)", low, high);
- int mid;
do {
- mid = low + (high - low) / 2;
+ int mid = low + (high - low) / 2;
XBT_DEBUG("a %f low %d high %d mid %d value %f", a, low, high, mid, array[mid]);
if (array[mid] > a)
void surf_cpu_model_init_ti()
{
- xbt_assert(!surf_cpu_model_pm,"CPU model already initialized. This should not happen.");
- xbt_assert(!surf_cpu_model_vm,"CPU model already initialized. This should not happen.");
+ xbt_assert(not surf_cpu_model_pm, "CPU model already initialized. This should not happen.");
+ xbt_assert(not surf_cpu_model_vm, "CPU model already initialized. This should not happen.");
surf_cpu_model_pm = new simgrid::surf::CpuTiModel();
all_existing_models->push_back(surf_cpu_model_pm);
while ((xbt_heap_size(tiActionHeap_) > 0) && (xbt_heap_maxkey(tiActionHeap_) <= now)) {
CpuTiAction *action = static_cast<CpuTiAction*>(xbt_heap_pop(tiActionHeap_));
XBT_DEBUG("Action %p: finish", action);
- action->finish();
+ action->finish(Action::State::done);
/* set the remains to 0 due to precision problems when updating the remaining amount */
action->setRemains(0);
- action->setState(Action::State::done);
/* update remaining amount of all actions */
action->cpu_->updateRemainingAmount(surf_get_clock());
}
/* add a fake trace event if periodicity == 0 */
if (trace && trace->event_list.size() > 1) {
- s_tmgr_event_t val = trace->event_list.back();
- if (val.delta < 1e-12)
- speed_.event = future_evt_set->add_trace(tmgr_empty_trace_new(), this);
+ trace_mgr::DatedValue val = trace->event_list.back();
+ if (val.date_ < 1e-12)
+ speed_.event = future_evt_set->add_trace(new simgrid::trace_mgr::trace(), this);
}
}
modified(true);
speedTrace = speedIntegratedTrace_->speedTrace_;
- s_tmgr_event_t val = speedTrace->event_list.back();
+ trace_mgr::DatedValue val = speedTrace->event_list.back();
delete speedIntegratedTrace_;
- speed_.scale = val.value;
+ speed_.scale = val.value_;
- trace = new CpuTiTgmr(TRACE_FIXED, val.value);
- XBT_DEBUG("value %f", val.value);
+ trace = new CpuTiTgmr(TRACE_FIXED, val.value_);
+ XBT_DEBUG("value %f", val.value_);
speedIntegratedTrace_ = trace;
CpuTiAction *action;
double sum_priority = 0.0;
double total_area;
- double min_finish = -1;
/* update remaining amount of actions */
updateRemainingAmount(now);
for(ActionTiList::iterator it(actionSet_->begin()), itend(actionSet_->end()) ; it != itend ; ++it) {
action = &*it;
- min_finish = -1;
+ double min_finish = -1;
/* action not running, skip it */
if (action->getStateSet() != surf_cpu_model_pm->getRunningActionSet())
continue;
action->setFinishTime(speedIntegratedTrace_->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->finishTime_)
+ action->getStartTime() + action->getMaxDuration() < action->getFinishTime())
min_finish = action->getStartTime() + action->getMaxDuration();
else
- min_finish = action->finishTime_;
+ min_finish = action->getFinishTime();
} else {
/* put the max duration time on heap */
if (action->getMaxDuration() > NO_MAX_DURATION)
if (min_finish > NO_MAX_DURATION)
xbt_heap_push(static_cast<CpuTiModel*>(model())->tiActionHeap_, action, min_finish);
- XBT_DEBUG("Update finish time: Cpu(%s) Action: %p, Start Time: %f Finish Time: %f Max duration %f", cname(), action,
- action->getStartTime(), action->finishTime_, action->getMaxDuration());
+ 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());
}
/* remove from modified cpu */
modified(false);
bool CpuTi::isUsed()
{
- return !actionSet_->empty();
+ return not actionSet_->empty();
}
double CpuTi::getAvailableSpeed()
continue;
/* skip action that are finishing now */
- if (action->finishTime_ >= 0 && action->finishTime_ <= now)
+ if (action->getFinishTime() >= 0 && action->getFinishTime() <= now)
continue;
/* update remaining */
action->updateRemains(area_total / (sumPriority_ * action->getPriority()));
- XBT_DEBUG("Update remaining action(%p) remaining %f", action, action->remains_);
+ XBT_DEBUG("Update remaining action(%p) remaining %f", action, action->getRemainsNoUpdate());
}
lastUpdate_ = now;
}
CpuAction *CpuTi::execution_start(double size)
{
- XBT_IN("(%s,%g)", cname(), size);
+ XBT_IN("(%s,%g)", getCname(), size);
CpuTiAction* action = new CpuTiAction(static_cast<CpuTiModel*>(model()), size, isOff(), this);
actionSet_->push_back(*action);
if (duration > 0)
duration = MAX(duration, sg_surf_precision);
- XBT_IN("(%s,%g)", cname(), duration);
+ XBT_IN("(%s,%g)", getCname(), duration);
CpuTiAction* action = new CpuTiAction(static_cast<CpuTiModel*>(model()), 1.0, isOff(), this);
- action->maxDuration_ = duration;
+ action->setMaxDuration(duration);
action->suspended_ = 2;
if (duration == NO_MAX_DURATION) {
/* Move to the *end* of the corresponding action set. This convention
void CpuTi::modified(bool modified){
CpuTiList* modifiedCpu = static_cast<CpuTiModel*>(model())->modifiedCpu_;
if (modified) {
- if (!cpu_ti_hook.is_linked()) {
+ if (not cpu_ti_hook.is_linked()) {
modifiedCpu->push_back(*this);
}
} else {
: CpuAction(model_, cost, failed)
, cpu_(cpu)
{
+ indexHeap_ = -1;
cpu_->modified(true);
}
int CpuTiAction::unref()
{
refcount_--;
- if (!refcount_) {
+ if (not refcount_) {
if (action_hook.is_linked())
getStateSet()->erase(getStateSet()->iterator_to(*this));
/* remove from action_set */
XBT_IN("(%p,%g)", this, duration);
- maxDuration_ = duration;
+ Action::setMaxDuration(duration);
if (duration >= 0)
min_finish = (getStartTime() + getMaxDuration()) < getFinishTime() ?
XBT_OUT();
}
-void CpuTiAction::setPriority(double priority)
+void CpuTiAction::setSharingWeight(double priority)
{
XBT_IN("(%p,%g)", this, priority);
- priority_ = priority;
+ sharingWeight_ = priority;
cpu_->modified(true);
XBT_OUT();
}
XBT_IN("(%p)", this);
cpu_->updateRemainingAmount(surf_get_clock());
XBT_OUT();
- return remains_;
+ return getRemainsNoUpdate();
}
}
