X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/edab1d82e659722994c64246d5858eca2ff6703d..40778ac106dfafd9f790d8bdadf737de01c3d3e3:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 1b3cec3127..81a156d427 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" @@ -25,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; @@ -113,7 +119,7 @@ double CpuTiTgmr::integrate(double a, double b) /** * \brief Auxiliary function to calculate the integral between a and b. - * It simply calculates the integral at point a and b and returns the difference + * It simply calculates the integral at point a and b and returns the difference * between them. * \param trace Trace structure * \param a Initial point @@ -142,7 +148,7 @@ double CpuTiTrace::integrateSimplePoint(double a) ("a %f ind %d integral %f ind + 1 %f ind %f time +1 %f time %f", a, ind, integral, p_integral[ind + 1], p_integral[ind], p_timePoints[ind + 1], p_timePoints[ind]); - double_update(&a_aux, p_timePoints[ind]); + double_update(&a_aux, p_timePoints[ind], sg_maxmin_precision*sg_surf_precision); if (a_aux > 0) integral += ((p_integral[ind + 1] - @@ -251,7 +257,7 @@ double CpuTiTgmr::solveSomewhatSimple(double a, double amount) * It returns the date when the requested amount of flops is available * \param trace Trace structure * \param a Initial point - * \param amount Amount of flops + * \param amount Amount of flops * \return The date when amount is available. */ double CpuTiTrace::solveSimple(double a, double amount) @@ -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,13 +341,13 @@ 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); } /** * \brief Binary search in array. - * It returns the first point of the interval in which "a" is. + * It returns the first point of the interval in which "a" is. * \param array Array * \param a Value to search * \param low Low bound to search in array @@ -373,18 +379,10 @@ int CpuTiTrace::binarySearch(double *array, double a, int low, int high) * CallBacks * *************/ -static void parse_cpu_ti_init(sg_platf_host_cbarg_t host){ - ((CpuTiModelPtr)surf_cpu_model_pm)->parseInit(host); -} - -static void add_traces_cpu_ti(){ - surf_cpu_model_pm->addTraces(); -} - static void cpu_ti_define_callbacks() { - sg_platf_host_add_cb(parse_cpu_ti_init); - sg_platf_postparse_add_cb(add_traces_cpu_ti); + sg_platf_host_add_cb(cpu_parse_init); + sg_platf_postparse_add_cb(cpu_add_traces); } /********* @@ -408,12 +406,9 @@ void surf_cpu_model_init_ti() CpuTiModel::CpuTiModel() : CpuModel("cpu_ti") { - 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, @@ -423,26 +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); } -void CpuTiModel::parseInit(sg_platf_host_cbarg_t host) -{ - createResource(host->id, - host->power_peak, - host->pstate, - host->power_scale, - host->power_trace, - host->core_amount, - host->initial_state, - host->state_trace, - host->properties); -} - -CpuTiPtr CpuTiModel::createResource(const char *name, +CpuPtr CpuTiModel::createCpu(const char *name, xbt_dynar_t powerPeak, int pstate, double powerScale, @@ -456,26 +437,26 @@ CpuTiPtr CpuTiModel::createResource(const char *name, xbt_assert(!surf_cpu_resource_priv(surf_cpu_resource_by_name(name)), "Host '%s' declared several times in the platform file", name); + 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?"); CpuTiPtr 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)); 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; 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 ;) { + CpuTiPtr 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; @@ -525,7 +506,7 @@ 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) { @@ -551,7 +532,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); } } } @@ -567,52 +548,47 @@ CpuTi::CpuTi(CpuTiModelPtr model, const char *name, xbt_dynar_t powerPeak, : Cpu(model, name, properties, core, 0, powerScale) { p_powerEvent = NULL; - m_stateCurrent = stateInitial; + setState(stateInitial); m_powerScale = powerScale; m_core = core; - tmgr_trace_t empty_trace; - s_tmgr_event_t val; + 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; - 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 + // add a fake trace event if periodicity == 0 xbt_dynar_get_cpy(powerTrace->s_list.event_list, xbt_dynar_length(powerTrace->s_list.event_list) - 1, &val); if (val.delta == 0) { 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; if (event_type == p_powerEvent) { @@ -620,11 +596,12 @@ 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(getModel())->p_modifiedCpu); + + modified(true); power_trace = p_availTrace->p_powerTrace; xbt_dynar_get_cpy(power_trace->s_list.event_list, @@ -643,15 +620,16 @@ void CpuTi::updateState(tmgr_trace_event_t event_type, } else if (event_type == p_stateEvent) { if (value > 0) { - if(m_stateCurrent == SURF_RESOURCE_OFF) + if(getState() == SURF_RESOURCE_OFF) xbt_dynar_push_as(host_that_restart, char*, (char *)getName()); - m_stateCurrent = SURF_RESOURCE_ON; + setState(SURF_RESOURCE_ON); } else { - m_stateCurrent = SURF_RESOURCE_OFF; + 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) { @@ -659,7 +637,7 @@ void CpuTi::updateState(tmgr_trace_event_t event_type, 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); + xbt_heap_remove(static_cast(getModel())->p_tiActionHeap, action->m_indexHeap); if (heap_act != action) DIE_IMPOSSIBLE; } @@ -678,15 +656,15 @@ void CpuTi::updateState(tmgr_trace_event_t event_type, void CpuTi::updateActionsFinishTime(double now) { - void *_action; CpuTiActionPtr 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()) @@ -704,8 +682,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() != @@ -737,12 +716,12 @@ updateRemainingAmount(now); 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); + 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", @@ -751,16 +730,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()); @@ -775,7 +752,6 @@ double CpuTi::getAvailableSpeed() void CpuTi::updateRemainingAmount(double now) { double area_total; - void* _action; CpuTiActionPtr action; /* already updated */ @@ -787,8 +763,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()) @@ -822,9 +799,9 @@ void CpuTi::updateRemainingAmount(double now) CpuActionPtr CpuTi::execute(double size) { XBT_IN("(%s,%g)", getName(), size); - CpuTiActionPtr action = new CpuTiAction(static_cast(getModel()), size, m_stateCurrent != SURF_RESOURCE_ON, this); + CpuTiActionPtr 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; @@ -834,10 +811,10 @@ CpuActionPtr CpuTi::execute(double size) CpuActionPtr CpuTi::sleep(double duration) { if (duration > 0) - duration = MAX(duration, MAXMIN_PRECISION); + duration = MAX(duration, sg_surf_precision); XBT_IN("(%s,%g)", getName(), duration); - CpuTiActionPtr action = new CpuTiAction(static_cast(getModel()), 1.0, m_stateCurrent != SURF_RESOURCE_ON, this); + CpuTiActionPtr action = new CpuTiAction(static_cast(getModel()), 1.0, getState() != SURF_RESOURCE_ON, this); action->m_maxDuration = duration; action->m_suspended = 2; @@ -845,16 +822,29 @@ 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){ + CpuTiListPtr modifiedCpu = static_cast(getModel())->p_modifiedCpu; + if (modified) { + if (!is_linked()) { + modifiedCpu->push_back(*this); + } + } else { + if (is_linked()) { + modifiedCpu->erase(modifiedCpu->iterator_to(*this)); + } + } +} + /********** * Action * **********/ @@ -868,14 +858,11 @@ 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); + p_cpu->modified(true); } void CpuTiAction::updateIndexHeap(int i) @@ -885,8 +872,8 @@ void CpuTiAction::updateIndexHeap(int i) void CpuTiAction::setState(e_surf_action_state_t state) { - Action::setState(state); - xbt_swag_insert(p_cpu, reinterpret_cast(getModel())->p_modifiedCpu); + CpuAction::setState(state); + p_cpu->modified(true); } int CpuTiAction::unref() @@ -896,10 +883,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 (actionTiHook::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; } @@ -910,7 +898,7 @@ 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; } @@ -925,7 +913,7 @@ void CpuTiAction::suspend() 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(); } @@ -935,7 +923,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(); } @@ -975,7 +963,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(); }