X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/413534bc9aac9b6a61840de0a20f933534552fd7..c3f81b26d8e8d696a2cc706d18388d8d681cc26c:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 0c5fbb57b7..21f92c50f8 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2014. The SimGrid Team. +/* Copyright (c) 2013-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ CpuTiTrace::CpuTiTrace(tmgr_trace_t power_trace) (xbt_dynar_length(power_trace->s_list.event_list) + 1)); p_integral = (double*) xbt_malloc0(sizeof(double) * (xbt_dynar_length(power_trace->s_list.event_list) + 1)); - m_nbPoints = xbt_dynar_length(power_trace->s_list.event_list); + m_nbPoints = xbt_dynar_length(power_trace->s_list.event_list) + 1; xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) { p_timePoints[i] = time; p_integral[i] = integral; @@ -395,23 +395,20 @@ void surf_cpu_model_init_ti() xbt_assert(!surf_cpu_model_vm,"CPU model already initialized. This should not happen."); surf_cpu_model_pm = new CpuTiModel(); - surf_cpu_model_vm = new CpuTiModel(); + surf_cpu_model_vm = new CpuTiModel(); cpu_ti_define_callbacks(); - ModelPtr model_pm = static_cast(surf_cpu_model_pm); - ModelPtr model_vm = static_cast(surf_cpu_model_vm); + Model *model_pm = static_cast(surf_cpu_model_pm); + Model *model_vm = static_cast(surf_cpu_model_vm); xbt_dynar_push(model_list, &model_pm); xbt_dynar_push(model_list, &model_vm); } -CpuTiModel::CpuTiModel() : CpuModel("cpu_ti") +CpuTiModel::CpuTiModel() : CpuModel() { - CpuTiPtr cpu = NULL; - p_runningActionSetThatDoesNotNeedBeingChecked = new ActionList(); - p_modifiedCpu = - xbt_swag_new(xbt_swag_offset(*cpu, p_modifiedCpuHookup)); + p_modifiedCpu = new CpuTiList(); p_tiActionHeap = xbt_heap_new(8, NULL); xbt_heap_set_update_callback(p_tiActionHeap, @@ -421,13 +418,12 @@ CpuTiModel::CpuTiModel() : CpuModel("cpu_ti") CpuTiModel::~CpuTiModel() { surf_cpu_model_pm = NULL; - delete p_runningActionSetThatDoesNotNeedBeingChecked; - xbt_swag_free(p_modifiedCpu); + delete p_modifiedCpu; xbt_heap_free(p_tiActionHeap); } -CpuPtr CpuTiModel::createCpu(const char *name, +Cpu *CpuTiModel::createCpu(const char *name, xbt_dynar_t powerPeak, int pstate, double powerScale, @@ -438,24 +434,30 @@ CpuPtr CpuTiModel::createCpu(const char *name, xbt_dict_t cpuProperties) { xbt_assert(core==1,"Multi-core not handled with this model yet"); - xbt_assert(!surf_cpu_resource_priv(surf_cpu_resource_by_name(name)), + sg_host_t host = sg_host_by_name(name); + xbt_assert(!sg_host_surfcpu(host), "Host '%s' declared several times in the platform file", name); - CpuTiPtr cpu = new CpuTi(this, name, powerPeak, pstate, powerScale, powerTrace, + xbt_assert(xbt_dynar_getfirst_as(powerPeak, double) > 0.0, + "Power has to be >0.0. Did you forget to specify the mandatory power attribute?"); + CpuTi *cpu = new CpuTi(this, name, powerPeak, pstate, powerScale, powerTrace, core, stateInitial, stateTrace, cpuProperties); - xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, static_cast(cpu)); + sg_host_surfcpu_set(host, cpu); return cpu; } double CpuTiModel::shareResources(double now) { - void *_cpu, *_cpu_next; double min_action_duration = -1; /* iterates over modified cpus to update share resources */ - xbt_swag_foreach_safe(_cpu, _cpu_next, p_modifiedCpu) { - static_cast(_cpu)->updateActionsFinishTime(now); + for(CpuTiList::iterator it(p_modifiedCpu->begin()), itend(p_modifiedCpu->end()) + ; it != itend ;) { + CpuTi *ti = &*it; + ++it; + ti->updateActionsFinishTime(now); } + /* get the min next event if heap not empty */ if (xbt_heap_size(p_tiActionHeap) > 0) min_action_duration = xbt_heap_maxkey(p_tiActionHeap) - now; @@ -469,7 +471,7 @@ void CpuTiModel::updateActionsState(double now, double /*delta*/) { while ((xbt_heap_size(p_tiActionHeap) > 0) && (xbt_heap_maxkey(p_tiActionHeap) <= now)) { - CpuTiActionPtr action = (CpuTiActionPtr) xbt_heap_pop(p_tiActionHeap); + CpuTiAction *action = (CpuTiAction*) xbt_heap_pop(p_tiActionHeap); XBT_DEBUG("Action %p: finish", action); action->finish(); /* set the remains to 0 due to precision problems when updating the remaining amount */ @@ -494,7 +496,7 @@ void CpuTiModel::addTraces() /* connect all traces relative to hosts */ xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - CpuTiPtr cpu = static_cast(surf_cpu_resource_priv(surf_cpu_resource_by_name(elm))); + CpuTi *cpu = static_cast(sg_host_surfcpu(sg_host_by_name(elm))); xbt_assert(cpu, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -505,12 +507,12 @@ void CpuTiModel::addTraces() continue; } XBT_DEBUG("Add state trace: %s to CPU(%s)", trace_name, elm); - cpu->p_stateEvent = tmgr_history_add_trace(history, trace, 0.0, 0, static_cast(cpu)); + cpu->p_stateEvent = tmgr_history_add_trace(history, trace, 0.0, 0, cpu); } 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 = static_cast(surf_cpu_resource_priv(surf_cpu_resource_by_name(elm))); + CpuTi *cpu = static_cast(sg_host_surfcpu(sg_host_by_name(elm))); xbt_assert(cpu, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -531,7 +533,7 @@ void CpuTiModel::addTraces() empty_trace = tmgr_empty_trace_new(); cpu->p_powerEvent = tmgr_history_add_trace(history, empty_trace, - cpu->p_availTrace->m_lastTime, 0, static_cast(cpu)); + cpu->p_availTrace->m_lastTime, 0, cpu); } } } @@ -540,7 +542,7 @@ void CpuTiModel::addTraces() /************ * Resource * ************/ -CpuTi::CpuTi(CpuTiModelPtr model, const char *name, xbt_dynar_t powerPeak, +CpuTi::CpuTi(CpuTiModel *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) @@ -556,21 +558,16 @@ CpuTi::CpuTi(CpuTiModelPtr model, const char *name, xbt_dynar_t powerPeak, XBT_DEBUG("power scale %f", powerScale); p_availTrace = new CpuTiTgmr(powerTrace, powerScale); - CpuTiActionPtr action = NULL; - p_actionSet = xbt_swag_new(xbt_swag_offset(*action, p_cpuListHookup)); + p_actionSet = new ActionTiList(); m_lastUpdate = 0; xbt_dynar_get_cpy(powerPeak, 0, &m_powerPeak); xbt_dynar_free(&powerPeak); /* kill memory leak */ - m_pstate = pstate; - XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_powerPeak, m_pstate); - - p_modifiedCpuHookup.prev = 0; - p_modifiedCpuHookup.next = 0; + XBT_DEBUG("CPU create: peak=%f", m_powerPeak); if (stateTrace) - p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, static_cast(this)); + p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this); if (powerTrace && xbt_dynar_length(powerTrace->s_list.event_list) > 1) { // add a fake trace event if periodicity == 0 xbt_dynar_get_cpy(powerTrace->s_list.event_list, @@ -579,32 +576,33 @@ CpuTi::CpuTi(CpuTiModelPtr model, const char *name, xbt_dynar_t powerPeak, empty_trace = tmgr_empty_trace_new(); p_powerEvent = tmgr_history_add_trace(history, empty_trace, - p_availTrace->m_lastTime, 0, static_cast(this)); + p_availTrace->m_lastTime, 0, this); } } }; CpuTi::~CpuTi(){ -delete p_availTrace; -xbt_swag_free(p_actionSet); + modified(false); + delete p_availTrace; + delete p_actionSet; } void CpuTi::updateState(tmgr_trace_event_t event_type, double value, double date) { - void *_action; - CpuTiActionPtr action; + CpuTiAction *action; if (event_type == p_powerEvent) { tmgr_trace_t power_trace; - CpuTiTgmrPtr trace; + CpuTiTgmr *trace; s_tmgr_event_t val; 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(getModel())->p_modifiedCpu); + + modified(true); power_trace = p_availTrace->p_powerTrace; xbt_dynar_get_cpy(power_trace->s_list.event_list, @@ -630,16 +628,17 @@ void CpuTi::updateState(tmgr_trace_event_t event_type, setState(SURF_RESOURCE_OFF); /* put all action running on cpu to failed */ - xbt_swag_foreach(_action, p_actionSet) { - action = static_cast(_action); + for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end()) + ; it != itend ; ++it) { + action = &*it; if (action->getState() == SURF_ACTION_RUNNING || action->getState() == SURF_ACTION_READY || action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) { action->setFinishTime(date); action->setState(SURF_ACTION_FAILED); if (action->m_indexHeap >= 0) { - CpuTiActionPtr heap_act = (CpuTiActionPtr) - xbt_heap_remove(reinterpret_cast(getModel())->p_tiActionHeap, action->m_indexHeap); + CpuTiAction *heap_act = (CpuTiAction*) + xbt_heap_remove(static_cast(getModel())->p_tiActionHeap, action->m_indexHeap); if (heap_act != action) DIE_IMPOSSIBLE; } @@ -658,15 +657,15 @@ void CpuTi::updateState(tmgr_trace_event_t event_type, void CpuTi::updateActionsFinishTime(double now) { - void *_action; - CpuTiActionPtr action; + CpuTiAction *action; double sum_priority = 0.0, total_area, min_finish = -1; /* update remaning amount of actions */ updateRemainingAmount(now); - xbt_swag_foreach(_action, p_actionSet) { - action = static_cast(_action); + for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end()) + ; it != itend ; ++it) { + action = &*it; /* action not running, skip it */ if (action->getStateSet() != surf_cpu_model_pm->getRunningActionSet()) @@ -684,8 +683,9 @@ updateRemainingAmount(now); } m_sumPriority = sum_priority; - xbt_swag_foreach(_action, p_actionSet) { - action = static_cast(_action); + for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end()) + ; it != itend ; ++it) { + action = &*it; min_finish = -1; /* action not running, skip it */ if (action->getStateSet() != @@ -716,13 +716,13 @@ updateRemainingAmount(now); /* 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(getModel())->p_tiActionHeap, action->m_indexHeap); + CpuTiAction *heap_act = (CpuTiAction*) + xbt_heap_remove(static_cast(getModel())->p_tiActionHeap, action->m_indexHeap); if (heap_act != action) DIE_IMPOSSIBLE; } if (min_finish != NO_MAX_DURATION) - xbt_heap_push(reinterpret_cast(getModel())->p_tiActionHeap, action, min_finish); + xbt_heap_push(static_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", @@ -731,16 +731,14 @@ updateRemainingAmount(now); action->getMaxDuration()); } /* remove from modified cpu */ - xbt_swag_remove(this, reinterpret_cast(getModel())->p_modifiedCpu); + modified(false); } bool CpuTi::isUsed() { - return xbt_swag_size(p_actionSet); + return !p_actionSet->empty(); } - - double CpuTi::getAvailableSpeed() { m_powerScale = p_availTrace->getPowerScale(surf_get_clock()); @@ -755,8 +753,7 @@ double CpuTi::getAvailableSpeed() void CpuTi::updateRemainingAmount(double now) { double area_total; - void* _action; - CpuTiActionPtr action; + CpuTiAction *action; /* already updated */ if (m_lastUpdate >= now) @@ -767,8 +764,9 @@ void CpuTi::updateRemainingAmount(double now) XBT_DEBUG("Flops total: %f, Last update %f", area_total, m_lastUpdate); - xbt_swag_foreach(_action, p_actionSet) { - action = static_cast(_action); + for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end()) + ; it != itend ; ++it) { + action = &*it; /* action not running, skip it */ if (action->getStateSet() != getModel()->getRunningActionSet()) @@ -799,25 +797,25 @@ void CpuTi::updateRemainingAmount(double now) m_lastUpdate = now; } -CpuActionPtr CpuTi::execute(double size) +CpuAction *CpuTi::execute(double size) { XBT_IN("(%s,%g)", getName(), size); - CpuTiActionPtr action = new CpuTiAction(static_cast(getModel()), size, getState() != SURF_RESOURCE_ON, this); + CpuTiAction *action = new CpuTiAction(static_cast(getModel()), size, getState() != SURF_RESOURCE_ON, this); - xbt_swag_insert(action, p_actionSet); + p_actionSet->push_back(*action); XBT_OUT(); return action; } -CpuActionPtr CpuTi::sleep(double duration) +CpuAction *CpuTi::sleep(double duration) { if (duration > 0) duration = MAX(duration, sg_surf_precision); XBT_IN("(%s,%g)", getName(), duration); - CpuTiActionPtr action = new CpuTiAction(static_cast(getModel()), 1.0, getState() != SURF_RESOURCE_ON, this); + CpuTiAction *action = new CpuTiAction(static_cast(getModel()), 1.0, getState() != SURF_RESOURCE_ON, this); action->m_maxDuration = duration; action->m_suspended = 2; @@ -825,37 +823,47 @@ CpuActionPtr CpuTi::sleep(double 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->p_stateSet = reinterpret_cast(getModel())->p_runningActionSetThatDoesNotNeedBeingChecked; - action->getStateSet()->push_back(*static_cast(action)); + action->p_stateSet = static_cast(getModel())->p_runningActionSetThatDoesNotNeedBeingChecked; + action->getStateSet()->push_back(*action); } - xbt_swag_insert(action, p_actionSet); + p_actionSet->push_back(*action); XBT_OUT(); return action; } +void CpuTi::modified(bool modified){ + CpuTiList *modifiedCpu = static_cast(getModel())->p_modifiedCpu; + if (modified) { + if (!cpu_ti_hook.is_linked()) { + modifiedCpu->push_back(*this); + } + } else { + if (cpu_ti_hook.is_linked()) { + modifiedCpu->erase(modifiedCpu->iterator_to(*this)); + } + } +} + /********** * Action * **********/ static void cpu_ti_action_update_index_heap(void *action, int i) { -((CpuTiActionPtr)action)->updateIndexHeap(i); +((CpuTiAction*)action)->updateIndexHeap(i); } -CpuTiAction::CpuTiAction(CpuTiModelPtr model_, double cost, bool failed, - CpuTiPtr cpu) +CpuTiAction::CpuTiAction(CpuTiModel *model_, double cost, bool failed, + CpuTi *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); + p_cpu->modified(true); } void CpuTiAction::updateIndexHeap(int i) @@ -866,7 +874,7 @@ void CpuTiAction::updateIndexHeap(int i) void CpuTiAction::setState(e_surf_action_state_t state) { CpuAction::setState(state); - xbt_swag_insert(p_cpu, reinterpret_cast(getModel())->p_modifiedCpu); + p_cpu->modified(true); } int CpuTiAction::unref() @@ -876,10 +884,11 @@ int CpuTiAction::unref() if (actionHook::is_linked()) getStateSet()->erase(getStateSet()->iterator_to(*this)); /* remove from action_set */ - xbt_swag_remove(this, p_cpu->p_actionSet); + if (action_ti_hook.is_linked()) + p_cpu->p_actionSet->erase(p_cpu->p_actionSet->iterator_to(*this)); /* remove from heap */ - xbt_heap_remove(reinterpret_cast(getModel())->p_tiActionHeap, this->m_indexHeap); - xbt_swag_insert(p_cpu, reinterpret_cast(getModel())->p_modifiedCpu); + xbt_heap_remove(static_cast(getModel())->p_tiActionHeap, this->m_indexHeap); + p_cpu->modified(true); delete this; return 1; } @@ -890,22 +899,17 @@ void CpuTiAction::cancel() { this->setState(SURF_ACTION_FAILED); xbt_heap_remove(getModel()->getActionHeap(), this->m_indexHeap); - xbt_swag_insert(p_cpu, reinterpret_cast(getModel())->p_modifiedCpu); + p_cpu->modified(true); return; } -void CpuTiAction::recycle() -{ - DIE_IMPOSSIBLE; -} - void CpuTiAction::suspend() { XBT_IN("(%p)", this); if (m_suspended != 2) { m_suspended = 1; xbt_heap_remove(getModel()->getActionHeap(), m_indexHeap); - xbt_swag_insert(p_cpu, reinterpret_cast(getModel())->p_modifiedCpu); + p_cpu->modified(true); } XBT_OUT(); } @@ -915,7 +919,7 @@ void CpuTiAction::resume() XBT_IN("(%p)", this); if (m_suspended != 2) { m_suspended = 0; - xbt_swag_insert(p_cpu, reinterpret_cast(getModel())->p_modifiedCpu); + p_cpu->modified(true); } XBT_OUT(); } @@ -941,7 +945,7 @@ void CpuTiAction::setMaxDuration(double duration) /* add in action heap */ if (m_indexHeap >= 0) { - CpuTiActionPtr heap_act = (CpuTiActionPtr) + CpuTiAction *heap_act = (CpuTiAction*) xbt_heap_remove(getModel()->getActionHeap(), m_indexHeap); if (heap_act != this) DIE_IMPOSSIBLE; @@ -955,7 +959,7 @@ void CpuTiAction::setPriority(double priority) { XBT_IN("(%p,%g)", this, priority); m_priority = priority; - xbt_swag_insert(p_cpu, reinterpret_cast(getModel())->p_modifiedCpu); + p_cpu->modified(true); XBT_OUT(); }