X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/93c8beeb914dc3624c3818b21f17567345b4d36c..f3677661714bf6122d678071c0bd44141417be14:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index f7b25dd11c..fc07dd59c7 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2013-2014. 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 "trace_mgr_private.h" #include "xbt/heap.h" @@ -312,7 +318,7 @@ CpuTiTgmr::CpuTiTgmr(tmgr_trace_t power_trace, double value) if (!power_trace) { m_type = TRACE_FIXED; m_value = value; - XBT_DEBUG("No availability trace. Constant value = %lf", value); + XBT_DEBUG("No availability trace. Constant value = %f", value); return; } @@ -335,7 +341,7 @@ CpuTiTgmr::CpuTiTgmr(tmgr_trace_t power_trace, double value) m_lastTime = total_time; m_total = p_trace->integrateSimple(0, total_time); - XBT_DEBUG("Total integral %lf, last_time %lf ", + XBT_DEBUG("Total integral %f, last_time %f ", m_total, m_lastTime); } @@ -408,11 +414,9 @@ void surf_cpu_model_init_ti() CpuTiModel::CpuTiModel() : CpuModel("cpu_ti") { - ActionPtr action = NULL; - CpuTiPtr cpu; + CpuTiPtr cpu = NULL; - p_runningActionSetThatDoesNotNeedBeingChecked = - xbt_swag_new(xbt_swag_offset(*action, p_stateHookup)); + p_runningActionSetThatDoesNotNeedBeingChecked = new ActionList(); p_modifiedCpu = xbt_swag_new(xbt_swag_offset(*cpu, p_modifiedCpuHookup)); @@ -426,7 +430,7 @@ CpuTiModel::~CpuTiModel() { surf_cpu_model_pm = NULL; - xbt_swag_free(p_runningActionSetThatDoesNotNeedBeingChecked); + delete p_runningActionSetThatDoesNotNeedBeingChecked; xbt_swag_free(p_modifiedCpu); xbt_heap_free(p_tiActionHeap); } @@ -464,11 +468,6 @@ CpuTiPtr CpuTiModel::createResource(const char *name, return cpu; } -CpuTiActionPtr CpuTiModel::createAction(double /*cost*/, bool /*failed*/) -{ - return NULL;//new CpuTiAction(this, cost, failed); -} - double CpuTiModel::shareResources(double now) { void *_cpu, *_cpu_next; @@ -476,7 +475,7 @@ double CpuTiModel::shareResources(double now) /* iterates over modified cpus to update share resources */ xbt_swag_foreach_safe(_cpu, _cpu_next, p_modifiedCpu) { - static_cast(_cpu)->updateActionFinishDate(now); + static_cast(_cpu)->updateActionsFinishTime(now); } /* get the min next event if heap not empty */ if (xbt_heap_size(p_tiActionHeap) > 0) @@ -493,9 +492,9 @@ void CpuTiModel::updateActionsState(double now, double /*delta*/) && (xbt_heap_maxkey(p_tiActionHeap) <= now)) { CpuTiActionPtr action = (CpuTiActionPtr) xbt_heap_pop(p_tiActionHeap); XBT_DEBUG("Action %p: finish", action); - action->m_finish = surf_get_clock(); + action->finish(); /* set the remains to 0 due to precision problems when updating the remaining amount */ - action->m_remains = 0; + action->setRemains(0); action->setState(SURF_ACTION_DONE); /* update remaining amount of all actions */ action->p_cpu->updateRemainingAmount(surf_get_clock()); @@ -532,7 +531,7 @@ void CpuTiModel::addTraces() xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - CpuTiPtr cpu = dynamic_cast(static_cast(surf_cpu_resource_priv(surf_cpu_resource_by_name(elm)))); + CpuTiPtr cpu = static_cast(surf_cpu_resource_priv(surf_cpu_resource_by_name(elm))); xbt_assert(cpu, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -566,16 +565,16 @@ CpuTi::CpuTi(CpuTiModelPtr model, const char *name, xbt_dynar_t powerPeak, int pstate, double powerScale, tmgr_trace_t powerTrace, int core, e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace, xbt_dict_t properties) -: Resource(model, name, properties) -, Cpu(model, name, properties, core, 0, powerScale) { +: Cpu(model, name, properties, core, 0, powerScale) +{ p_powerEvent = NULL; - p_stateCurrent = stateInitial; + setState(stateInitial); m_powerScale = powerScale; m_core = core; tmgr_trace_t empty_trace; s_tmgr_event_t val; xbt_assert(core==1,"Multi-core not handled with this model yet"); - XBT_DEBUG("power scale %lf", powerScale); + XBT_DEBUG("power scale %f", powerScale); p_availTrace = new CpuTiTgmr(powerTrace, powerScale); CpuTiActionPtr action = NULL; @@ -622,11 +621,11 @@ void CpuTi::updateState(tmgr_trace_event_t event_type, CpuTiTgmrPtr trace; s_tmgr_event_t val; - XBT_DEBUG("Finish trace date: %f value %lf date %f", surf_get_clock(), + XBT_DEBUG("Finish trace date: %f value %f date %f", surf_get_clock(), value, date); /* update remaining of actions and put in modified cpu swag */ updateRemainingAmount(date); - xbt_swag_insert(this, reinterpret_cast(p_model)->p_modifiedCpu); + xbt_swag_insert(this, reinterpret_cast(getModel())->p_modifiedCpu); power_trace = p_availTrace->p_powerTrace; xbt_dynar_get_cpy(power_trace->s_list.event_list, @@ -645,11 +644,11 @@ void CpuTi::updateState(tmgr_trace_event_t event_type, } else if (event_type == p_stateEvent) { if (value > 0) { - if(p_stateCurrent == SURF_RESOURCE_OFF) - xbt_dynar_push_as(host_that_restart, char*, (char *)m_name); - p_stateCurrent = SURF_RESOURCE_ON; + if(getState() == SURF_RESOURCE_OFF) + xbt_dynar_push_as(host_that_restart, char*, (char *)getName()); + setState(SURF_RESOURCE_ON); } else { - p_stateCurrent = SURF_RESOURCE_OFF; + setState(SURF_RESOURCE_OFF); /* put all action running on cpu to failed */ xbt_swag_foreach(_action, p_actionSet) { @@ -657,11 +656,11 @@ void CpuTi::updateState(tmgr_trace_event_t event_type, if (action->getState() == SURF_ACTION_RUNNING || action->getState() == SURF_ACTION_READY || action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) { - action->m_finish = date; + action->setFinishTime(date); action->setState(SURF_ACTION_FAILED); if (action->m_indexHeap >= 0) { CpuTiActionPtr heap_act = (CpuTiActionPtr) - xbt_heap_remove(reinterpret_cast(p_model)->p_tiActionHeap, action->m_indexHeap); + xbt_heap_remove(reinterpret_cast(getModel())->p_tiActionHeap, action->m_indexHeap); if (heap_act != action) DIE_IMPOSSIBLE; } @@ -678,7 +677,7 @@ void CpuTi::updateState(tmgr_trace_event_t event_type, return; } -void CpuTi::updateActionFinishDate(double now) +void CpuTi::updateActionsFinishTime(double now) { void *_action; CpuTiActionPtr action; @@ -690,19 +689,19 @@ updateRemainingAmount(now); xbt_swag_foreach(_action, p_actionSet) { action = static_cast(_action); /* action not running, skip it */ - if (action->p_stateSet != - surf_cpu_model_pm->p_runningActionSet) + if (action->getStateSet() != + surf_cpu_model_pm->getRunningActionSet()) continue; /* bogus priority, skip it */ - if (action->m_priority <= 0) + if (action->getPriority() <= 0) continue; /* action suspended, skip it */ if (action->m_suspended != 0) continue; - sum_priority += 1.0 / action->m_priority; + sum_priority += 1.0 / action->getPriority(); } m_sumPriority = sum_priority; @@ -710,50 +709,50 @@ updateRemainingAmount(now); action = static_cast(_action); min_finish = -1; /* action not running, skip it */ - if (action->p_stateSet != - surf_cpu_model_pm->p_runningActionSet) + if (action->getStateSet() != + surf_cpu_model_pm->getRunningActionSet()) continue; /* verify if the action is really running on cpu */ - if (action->m_suspended == 0 && action->m_priority > 0) { + if (action->m_suspended == 0 && action->getPriority() > 0) { /* total area needed to finish the action. Used in trace integration */ total_area = - (action->m_remains) * sum_priority * - action->m_priority; + (action->getRemains()) * sum_priority * + action->getPriority(); total_area /= m_powerPeak; - action->m_finish = p_availTrace->solve(now, total_area); + action->setFinishTime(p_availTrace->solve(now, total_area)); /* verify which event will happen before (max_duration or finish time) */ - if (action->m_maxDuration != NO_MAX_DURATION && - action->m_start + action->m_maxDuration < action->m_finish) - min_finish = action->m_start + action->m_maxDuration; + if (action->getMaxDuration() != NO_MAX_DURATION && + action->getStartTime() + action->getMaxDuration() < action->m_finish) + min_finish = action->getStartTime() + action->getMaxDuration(); else min_finish = action->m_finish; } else { /* put the max duration time on heap */ - if (action->m_maxDuration != NO_MAX_DURATION) - min_finish = action->m_start + action->m_maxDuration; + if (action->getMaxDuration() != NO_MAX_DURATION) + min_finish = action->getStartTime() + action->getMaxDuration(); } /* add in action heap */ XBT_DEBUG("action(%p) index %d", action, action->m_indexHeap); if (action->m_indexHeap >= 0) { CpuTiActionPtr heap_act = (CpuTiActionPtr) - xbt_heap_remove(reinterpret_cast(p_model)->p_tiActionHeap, action->m_indexHeap); + xbt_heap_remove(reinterpret_cast(getModel())->p_tiActionHeap, action->m_indexHeap); if (heap_act != action) DIE_IMPOSSIBLE; } if (min_finish != NO_MAX_DURATION) - xbt_heap_push(reinterpret_cast(p_model)->p_tiActionHeap, action, min_finish); + xbt_heap_push(reinterpret_cast(getModel())->p_tiActionHeap, action, min_finish); XBT_DEBUG ("Update finish time: Cpu(%s) Action: %p, Start Time: %f Finish Time: %f Max duration %f", - m_name, action, action->m_start, + getName(), action, action->getStartTime(), action->m_finish, - action->m_maxDuration); + action->getMaxDuration()); } /* remove from modified cpu */ - xbt_swag_remove(this, reinterpret_cast(p_model)->p_modifiedCpu); + xbt_swag_remove(this, reinterpret_cast(getModel())->p_modifiedCpu); } bool CpuTi::isUsed() @@ -792,12 +791,12 @@ void CpuTi::updateRemainingAmount(double now) xbt_swag_foreach(_action, p_actionSet) { action = static_cast(_action); /* action not running, skip it */ - if (action->p_stateSet != - getModel()->p_runningActionSet) + if (action->getStateSet() != + getModel()->getRunningActionSet()) continue; /* bogus priority, skip it */ - if (action->m_priority <= 0) + if (action->getPriority() <= 0) continue; /* action suspended, skip it */ @@ -805,7 +804,7 @@ void CpuTi::updateRemainingAmount(double now) continue; /* action don't need update */ - if (action->m_start >= now) + if (action->getStartTime() >= now) continue; /* skip action that are finishing now */ @@ -814,9 +813,7 @@ void CpuTi::updateRemainingAmount(double now) continue; /* update remaining */ - double_update(&(action->m_remains), - area_total / (m_sumPriority * - action->m_priority)); + action->updateRemains(area_total / (m_sumPriority * action->getPriority())); XBT_DEBUG("Update remaining action(%p) remaining %f", action, action->m_remains); } @@ -825,24 +822,11 @@ void CpuTi::updateRemainingAmount(double now) CpuActionPtr CpuTi::execute(double size) { - return _execute(size); -} - -CpuTiActionPtr CpuTi::_execute(double size) -{ - XBT_IN("(%s,%g)", m_name, size); - CpuTiActionPtr action = new CpuTiAction(static_cast(p_model), size, p_stateCurrent != SURF_RESOURCE_ON); - - action->p_cpu = this; - action->m_indexHeap = -1; - - xbt_swag_insert(this, reinterpret_cast(p_model)->p_modifiedCpu); + XBT_IN("(%s,%g)", getName(), size); + CpuTiActionPtr action = new CpuTiAction(static_cast(getModel()), size, getState() != SURF_RESOURCE_ON, this); xbt_swag_insert(action, p_actionSet); - action->m_suspended = 0; /* Should be useless because of the - » calloc but it seems to help valgrind... */ - XBT_OUT(); return action; } @@ -853,33 +837,48 @@ CpuActionPtr CpuTi::sleep(double duration) if (duration > 0) duration = MAX(duration, MAXMIN_PRECISION); - XBT_IN("(%s,%g)", m_name, duration); - CpuTiActionPtr action = _execute(1.0); + XBT_IN("(%s,%g)", getName(), duration); + CpuTiActionPtr action = new CpuTiAction(static_cast(getModel()), 1.0, getState() != SURF_RESOURCE_ON, this); + action->m_maxDuration = duration; action->m_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 */ - xbt_swag_remove(static_cast(action), action->p_stateSet); - action->p_stateSet = reinterpret_cast(p_model)->p_runningActionSetThatDoesNotNeedBeingChecked; - xbt_swag_insert(static_cast(action), action->p_stateSet); + /* 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->p_stateSet = reinterpret_cast(getModel())->p_runningActionSetThatDoesNotNeedBeingChecked; + action->getStateSet()->push_back(*static_cast(action)); } + + xbt_swag_insert(action, p_actionSet); + XBT_OUT(); return action; } -void CpuTi::printCpuTiModel() -{ - std::cout << getModel()->getName() << "<updateIndexHeap(i); +((CpuTiActionPtr)action)->updateIndexHeap(i); +} + +CpuTiAction::CpuTiAction(CpuTiModelPtr model_, double cost, bool failed, + CpuTiPtr cpu) + : CpuAction(model_, cost, failed) +{ + p_cpuListHookup.next = 0; + p_cpuListHookup.prev = 0; + + m_suspended = 0; /* Should be useless because of the + calloc but it seems to help valgrind... */ + p_cpu = cpu; + m_indexHeap = -1; + xbt_swag_insert(cpu, reinterpret_cast(getModel())->p_modifiedCpu); } + void CpuTiAction::updateIndexHeap(int i) { m_indexHeap = i; @@ -888,19 +887,20 @@ void CpuTiAction::updateIndexHeap(int i) void CpuTiAction::setState(e_surf_action_state_t state) { Action::setState(state); - xbt_swag_insert(p_cpu, reinterpret_cast(p_model)->p_modifiedCpu); + xbt_swag_insert(p_cpu, reinterpret_cast(getModel())->p_modifiedCpu); } int CpuTiAction::unref() { m_refcount--; if (!m_refcount) { - xbt_swag_remove(static_cast(this), p_stateSet); + if (actionHook::is_linked()) + getStateSet()->erase(getStateSet()->iterator_to(*this)); /* remove from action_set */ xbt_swag_remove(this, p_cpu->p_actionSet); /* remove from heap */ - xbt_heap_remove(reinterpret_cast(p_model)->p_tiActionHeap, this->m_indexHeap); - xbt_swag_insert(p_cpu, reinterpret_cast(p_model)->p_modifiedCpu); + xbt_heap_remove(reinterpret_cast(getModel())->p_tiActionHeap, this->m_indexHeap); + xbt_swag_insert(p_cpu, reinterpret_cast(getModel())->p_modifiedCpu); delete this; return 1; } @@ -910,8 +910,8 @@ int CpuTiAction::unref() void CpuTiAction::cancel() { this->setState(SURF_ACTION_FAILED); - xbt_heap_remove(p_model->p_actionHeap, this->m_indexHeap); - xbt_swag_insert(p_cpu, reinterpret_cast(p_model)->p_modifiedCpu); + xbt_heap_remove(getModel()->getActionHeap(), this->m_indexHeap); + xbt_swag_insert(p_cpu, reinterpret_cast(getModel())->p_modifiedCpu); return; } @@ -925,8 +925,8 @@ void CpuTiAction::suspend() XBT_IN("(%p)", this); if (m_suspended != 2) { m_suspended = 1; - xbt_heap_remove(p_model->p_actionHeap, m_indexHeap); - xbt_swag_insert(p_cpu, reinterpret_cast(p_model)->p_modifiedCpu); + xbt_heap_remove(getModel()->getActionHeap(), m_indexHeap); + xbt_swag_insert(p_cpu, reinterpret_cast(getModel())->p_modifiedCpu); } XBT_OUT(); } @@ -936,7 +936,7 @@ void CpuTiAction::resume() XBT_IN("(%p)", this); if (m_suspended != 2) { m_suspended = 0; - xbt_swag_insert(p_cpu, reinterpret_cast(p_model)->p_modifiedCpu); + xbt_swag_insert(p_cpu, reinterpret_cast(getModel())->p_modifiedCpu); } XBT_OUT(); } @@ -955,19 +955,19 @@ void CpuTiAction::setMaxDuration(double duration) m_maxDuration = duration; if (duration >= 0) - min_finish = (m_start + m_maxDuration) < m_finish ? - (m_start + m_maxDuration) : m_finish; + min_finish = (getStartTime() + getMaxDuration()) < getFinishTime() ? + (getStartTime() + getMaxDuration()) : getFinishTime(); else - min_finish = m_finish; + min_finish = getFinishTime(); /* add in action heap */ if (m_indexHeap >= 0) { CpuTiActionPtr heap_act = (CpuTiActionPtr) - xbt_heap_remove(p_model->p_actionHeap, m_indexHeap); + xbt_heap_remove(getModel()->getActionHeap(), m_indexHeap); if (heap_act != this) DIE_IMPOSSIBLE; } - xbt_heap_push(p_model->p_actionHeap, this, min_finish); + xbt_heap_push(getModel()->getActionHeap(), this, min_finish); XBT_OUT(); } @@ -976,7 +976,7 @@ void CpuTiAction::setPriority(double priority) { XBT_IN("(%p,%g)", this, priority); m_priority = priority; - xbt_swag_insert(p_cpu, reinterpret_cast(p_model)->p_modifiedCpu); + xbt_swag_insert(p_cpu, reinterpret_cast(getModel())->p_modifiedCpu); XBT_OUT(); }