X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3ae712a1b95294052b6e8136d0f0f2d4b30e6eb..5f9b13c6302e914a514168da8ff54818c0ee6787:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 5c083d5929..93c115c984 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -1,12 +1,13 @@ -/* 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 * 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" +#include "src/surf/trace_mgr.hpp" +#include "src/surf/platform.hpp" #ifndef SURF_MODEL_CPUTI_H_ #define SURF_MODEL_CPUTI_H_ @@ -14,13 +15,20 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf_cpu, "Logging specific to the SURF CPU TRACE INTEGRATION module"); -static void cpu_ti_action_update_index_heap(void *action, int i); +namespace simgrid { +namespace surf { + +static inline +void cpu_ti_action_update_index_heap(void *action, int i) +{ + ((simgrid::surf::CpuTiAction*)action)->updateIndexHeap(i); +} /********* * Trace * *********/ -CpuTiTrace::CpuTiTrace(tmgr_trace_t power_trace) +CpuTiTrace::CpuTiTrace(tmgr_trace_t speedTrace) { s_tmgr_event_t val; unsigned int cpt; @@ -28,11 +36,11 @@ CpuTiTrace::CpuTiTrace(tmgr_trace_t power_trace) double time = 0; int i = 0; p_timePoints = (double*) xbt_malloc0(sizeof(double) * - (xbt_dynar_length(power_trace->s_list.event_list) + 1)); + (xbt_dynar_length(speedTrace->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); - xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) { + (xbt_dynar_length(speedTrace->event_list) + 1)); + m_nbPoints = xbt_dynar_length(speedTrace->event_list) + 1; + xbt_dynar_foreach(speedTrace->event_list, cpt, val) { p_timePoints[i] = time; p_integral[i] = integral; integral += val.delta * val.value; @@ -118,9 +126,8 @@ 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 - * between them. + * \brief Auxiliary function to compute the integral between a and b. + * It simply computes the integrals at point a and b and returns the difference between them. * \param trace Trace structure * \param a Initial point * \param b Final point @@ -132,7 +139,7 @@ double CpuTiTrace::integrateSimple(double a, double b) } /** - * \brief Auxiliary function to calculate the integral at point a. + * \brief Auxiliary function to compute the integral at point a. * \param trace Trace structure * \param a point * \return Integral @@ -160,7 +167,7 @@ double CpuTiTrace::integrateSimplePoint(double a) } /** -* \brief Calculate the time needed to execute "amount" on cpu. +* \brief Computes the time needed to execute "amount" on cpu. * * Here, amount can span multiple trace periods * @@ -279,12 +286,12 @@ double CpuTiTrace::solveSimple(double a, double amount) } /** -* \brief Auxiliary function to update the CPU power scale. +* \brief Auxiliary function to update the CPU speed scale. * -* This function uses the trace structure to return the power scale at the determined time a. -* \param trace Trace structure to search the updated power scale +* This function uses the trace structure to return the speed scale at the determined time a. +* \param trace Trace structure to search the updated speed scale * \param a Time -* \return CPU power scale +* \return CPU speed scale */ double CpuTiTgmr::getPowerScale(double a) { @@ -295,19 +302,19 @@ double CpuTiTgmr::getPowerScale(double a) reduced_a = a - floor(a / m_lastTime) * m_lastTime; point = p_trace->binarySearch(p_trace->p_timePoints, reduced_a, 0, p_trace->m_nbPoints - 1); - xbt_dynar_get_cpy(p_powerTrace->s_list.event_list, point, &val); + xbt_dynar_get_cpy(p_speedTrace->event_list, point, &val); return val.value; } /** * \brief Creates a new integration trace from a tmgr_trace_t * -* \param power_trace CPU availability trace -* \param value Percentage of CPU power available (useful to fixed tracing) +* \param speedTrace CPU availability trace +* \param value Percentage of CPU speed available (useful to fixed tracing) * \param spacing Initial spacing * \return Integration trace structure */ -CpuTiTgmr::CpuTiTgmr(tmgr_trace_t power_trace, double value) +CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, double value) { double total_time = 0.0; s_tmgr_event_t val; @@ -315,7 +322,7 @@ CpuTiTgmr::CpuTiTgmr(tmgr_trace_t power_trace, double value) p_trace = 0; /* no availability file, fixed trace */ - if (!power_trace) { + if (!speedTrace) { m_type = TRACE_FIXED; m_value = value; XBT_DEBUG("No availability trace. Constant value = %f", value); @@ -323,21 +330,21 @@ CpuTiTgmr::CpuTiTgmr(tmgr_trace_t power_trace, double value) } /* only one point available, fixed trace */ - if (xbt_dynar_length(power_trace->s_list.event_list) == 1) { - xbt_dynar_get_cpy(power_trace->s_list.event_list, 0, &val); + if (xbt_dynar_length(speedTrace->event_list) == 1) { + xbt_dynar_get_cpy(speedTrace->event_list, 0, &val); m_type = TRACE_FIXED; m_value = val.value; return; } m_type = TRACE_DYNAMIC; - p_powerTrace = power_trace; + p_speedTrace = speedTrace; /* count the total time of trace file */ - xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) { + xbt_dynar_foreach(speedTrace->event_list, cpt, val) { total_time += val.delta; } - p_trace = new CpuTiTrace(power_trace); + p_trace = new CpuTiTrace(speedTrace); m_lastTime = total_time; m_total = p_trace->integrateSimple(0, total_time); @@ -375,14 +382,7 @@ int CpuTiTrace::binarySearch(double *array, double a, int low, int high) return low; } -/************* - * CallBacks * - *************/ - -static void cpu_ti_define_callbacks() -{ - sg_platf_host_add_cb(parse_cpu_init); - sg_platf_postparse_add_cb(add_traces_cpu); +} } /********* @@ -394,24 +394,21 @@ 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."); - surf_cpu_model_pm = new CpuTiModel(); - surf_cpu_model_vm = new CpuTiModel(); + surf_cpu_model_pm = new simgrid::surf::CpuTiModel(); + xbt_dynar_push(all_existing_models, &surf_cpu_model_pm); - cpu_ti_define_callbacks(); - ModelPtr model_pm = static_cast(surf_cpu_model_pm); - ModelPtr model_vm = static_cast(surf_cpu_model_vm); - xbt_dynar_push(model_list, &model_pm); - xbt_dynar_push(model_list, &model_vm); + surf_cpu_model_vm = new simgrid::surf::CpuTiModel(); + xbt_dynar_push(all_existing_models, &surf_cpu_model_vm); } -CpuTiModel::CpuTiModel() : CpuModel("cpu_ti") -{ - CpuTiPtr cpu = NULL; +namespace simgrid { +namespace surf { +CpuTiModel::CpuTiModel() : CpuModel() +{ 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,41 +418,40 @@ 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::createResource(const char *name, - xbt_dynar_t powerPeak, - int pstate, - double powerScale, - tmgr_trace_t powerTrace, +Cpu *CpuTiModel::createCpu(simgrid::s4u::Host *host, + xbt_dynar_t speedPeak, + int pstate, + double speedScale, + tmgr_trace_t speedTrace, int core, - e_surf_resource_state_t stateInitial, - tmgr_trace_t stateTrace, - xbt_dict_t cpuProperties) + int initiallyOn, + tmgr_trace_t stateTrace) { xbt_assert(core==1,"Multi-core not handled with this model yet"); - xbt_assert(!surf_cpu_resource_priv(surf_cpu_resource_by_name(name)), - "Host '%s' declared several times in the platform file", - name); - 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)); + xbt_assert(xbt_dynar_getfirst_as(speedPeak, double) > 0.0, + "Speed has to be >0.0. Did you forget to specify the mandatory speed attribute?"); + CpuTi *cpu = new CpuTi(this, host, speedPeak, pstate, speedScale, speedTrace, + core, initiallyOn, stateTrace); return cpu; } -double CpuTiModel::shareResources(double now) +double CpuTiModel::next_occuring_event(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 +465,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 */ @@ -480,193 +476,135 @@ void CpuTiModel::updateActionsState(double now, double /*delta*/) } } -void CpuTiModel::addTraces() -{ - xbt_dict_cursor_t cursor = NULL; - char *trace_name, *elm; - - static int called = 0; - - if (called) - return; - called = 1; - -/* 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))); - - xbt_assert(cpu, "Host %s undefined", elm); - xbt_assert(trace, "Trace %s undefined", trace_name); - - if (cpu->p_stateEvent) { - XBT_DEBUG("Trace already configured for this CPU(%s), ignoring it", - elm); - 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)); - } - - 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))); - - xbt_assert(cpu, "Host %s undefined", elm); - xbt_assert(trace, "Trace %s undefined", trace_name); - - XBT_DEBUG("Add power trace: %s to CPU(%s)", trace_name, elm); - if (cpu->p_availTrace) - delete cpu->p_availTrace; - - cpu->p_availTrace = new CpuTiTgmr(trace, cpu->m_powerScale); - - /* add a fake trace event if periodicity == 0 */ - if (trace && xbt_dynar_length(trace->s_list.event_list) > 1) { - s_tmgr_event_t val; - xbt_dynar_get_cpy(trace->s_list.event_list, - xbt_dynar_length(trace->s_list.event_list) - 1, &val); - if (val.delta == 0) { - tmgr_trace_t empty_trace; - 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)); - } - } - } -} - /************ * Resource * ************/ -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) -: Cpu(model, name, properties, core, 0, powerScale) -{ - p_powerEvent = NULL; - setState(stateInitial); - m_powerScale = powerScale; +CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak, + int pstate, double speedScale, tmgr_trace_t speedTrace, int core, + int initiallyOn, tmgr_trace_t stateTrace) + : Cpu(model, host, NULL, pstate, core, 0, speedScale, initiallyOn) +{ + xbt_assert(core==1,"Multi-core not handled by this model yet"); 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 %f", powerScale); - p_availTrace = new CpuTiTgmr(powerTrace, powerScale); - - CpuTiActionPtr action = NULL; - p_actionSet = xbt_swag_new(xbt_swag_offset(*action, p_cpuListHookup)); - m_lastUpdate = 0; + p_speed.scale = speedScale; + p_availTrace = new CpuTiTgmr(speedTrace, speedScale); - 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_actionSet = new ActionTiList(); - p_modifiedCpuHookup.prev = 0; - p_modifiedCpuHookup.next = 0; + xbt_dynar_get_cpy(speedPeak, 0, &p_speed.peak); + XBT_DEBUG("CPU create: peak=%f", p_speed.peak); if (stateTrace) - p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, static_cast(this)); - if (powerTrace && xbt_dynar_length(powerTrace->s_list.event_list) > 1) { + p_stateEvent = future_evt_set->add_trace(stateTrace, 0.0, this); + + if (speedTrace && xbt_dynar_length(speedTrace->event_list) > 1) { + s_tmgr_event_t val; // 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); + xbt_dynar_get_cpy(speedTrace->event_list, + xbt_dynar_length(speedTrace->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_speed.event = + future_evt_set->add_trace(tmgr_empty_trace_new(), p_availTrace->m_lastTime, this); } } -}; - -CpuTi::~CpuTi(){ -delete p_availTrace; -xbt_swag_free(p_actionSet); } -void CpuTi::updateState(tmgr_trace_event_t event_type, - double value, double date) +CpuTi::~CpuTi() { - void *_action; - CpuTiActionPtr action; + modified(false); + delete p_availTrace; + delete p_actionSet; +} +void CpuTi::set_speed_trace(tmgr_trace_t trace) +{ + if (p_availTrace) + delete p_availTrace; + + p_availTrace = new CpuTiTgmr(trace, p_speed.scale); - if (event_type == p_powerEvent) { - tmgr_trace_t power_trace; - CpuTiTgmrPtr trace; + /* add a fake trace event if periodicity == 0 */ + if (trace && xbt_dynar_length(trace->event_list) > 1) { + s_tmgr_event_t val; + xbt_dynar_get_cpy(trace->event_list, xbt_dynar_length(trace->event_list) - 1, &val); + if (val.delta == 0) + p_speed.event = future_evt_set->add_trace(tmgr_empty_trace_new(), 0.0, this); + } +} + +void CpuTi::apply_event(tmgr_trace_iterator_t event, double value) +{ + if (event == p_speed.event) { + tmgr_trace_t speedTrace; + CpuTiTgmr *trace; s_tmgr_event_t val; - XBT_DEBUG("Finish trace date: %f value %f date %f", surf_get_clock(), - value, date); + XBT_DEBUG("Finish trace date: value %f", value); /* update remaining of actions and put in modified cpu swag */ - updateRemainingAmount(date); - xbt_swag_insert(this, reinterpret_cast(getModel())->p_modifiedCpu); + updateRemainingAmount(surf_get_clock()); - power_trace = p_availTrace->p_powerTrace; - xbt_dynar_get_cpy(power_trace->s_list.event_list, - xbt_dynar_length(power_trace->s_list.event_list) - 1, &val); + modified(true); + + speedTrace = p_availTrace->p_speedTrace; + xbt_dynar_get_cpy(speedTrace->event_list, + xbt_dynar_length(speedTrace->event_list) - 1, &val); /* free old trace */ delete p_availTrace; - m_powerScale = val.value; + p_speed.scale = val.value; trace = new CpuTiTgmr(TRACE_FIXED, val.value); XBT_DEBUG("value %f", val.value); p_availTrace = trace; - if (tmgr_trace_event_free(event_type)) - p_powerEvent = NULL; + tmgr_trace_event_unref(&p_speed.event); - } else if (event_type == p_stateEvent) { + } else if (event == p_stateEvent) { if (value > 0) { - if(getState() == SURF_RESOURCE_OFF) + if(isOff()) xbt_dynar_push_as(host_that_restart, char*, (char *)getName()); - setState(SURF_RESOURCE_ON); + turnOn(); } else { - setState(SURF_RESOURCE_OFF); + turnOff(); + double date = surf_get_clock(); /* 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) { + + CpuTiAction *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; } } } } - if (tmgr_trace_event_free(event_type)) - p_stateEvent = NULL; + tmgr_trace_event_unref(&p_stateEvent); + } else { - XBT_CRITICAL("Unknown event ! \n"); - xbt_abort(); + xbt_die("Unknown event!\n"); } - - return; } 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); + /* update remaining 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 +622,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() != @@ -699,7 +638,7 @@ updateRemainingAmount(now); (action->getRemains()) * sum_priority * action->getPriority(); - total_area /= m_powerPeak; + total_area /= p_speed.peak; action->setFinishTime(p_availTrace->solve(now, total_area)); /* verify which event will happen before (max_duration or finish time) */ @@ -716,13 +655,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", @@ -730,45 +669,39 @@ updateRemainingAmount(now); action->m_finish, action->getMaxDuration()); } -/* remove from modified cpu */ - xbt_swag_remove(this, reinterpret_cast(getModel())->p_modifiedCpu); + /* remove from modified cpu */ + 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()); + p_speed.scale = p_availTrace->getPowerScale(surf_get_clock()); return Cpu::getAvailableSpeed(); } -/** -* \brief Update the remaining amount of actions -* -* \param now Current time -*/ +/** @brief Update the remaining amount of actions */ void CpuTi::updateRemainingAmount(double now) { double area_total; - void* _action; - CpuTiActionPtr action; + CpuTiAction *action; /* already updated */ if (m_lastUpdate >= now) return; -/* calcule the surface */ - area_total = p_availTrace->integrate(m_lastUpdate, now) * m_powerPeak; + /* compute the integration area */ + area_total = p_availTrace->integrate(m_lastUpdate, now) * p_speed.peak; 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,63 +732,66 @@ void CpuTi::updateRemainingAmount(double now) m_lastUpdate = now; } -CpuActionPtr CpuTi::execute(double size) +CpuAction *CpuTi::execution_start(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, isOff(), 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, isOff(), 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 */ - action->getStateSet()->erase(action->getStateSet()->iterator_to(*action)); - action->p_stateSet = reinterpret_cast(getModel())->p_runningActionSetThatDoesNotNeedBeingChecked; - action->getStateSet()->push_back(*static_cast(action)); + action->getStateSet()->erase(action->getStateSet()->iterator_to(*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::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,20 +802,21 @@ 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() { m_refcount--; if (!m_refcount) { - if (actionHook::is_linked()) - getStateSet()->erase(getStateSet()->iterator_to(*this)); + if (action_hook.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 +827,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,16 +847,11 @@ 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(); } -bool CpuTiAction::isSuspended() -{ - return m_suspended == 1; -} - void CpuTiAction::setMaxDuration(double duration) { double min_finish; @@ -941,7 +868,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 +882,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(); } @@ -967,5 +894,7 @@ double CpuTiAction::getRemains() return m_remains; } -#endif /* SURF_MODEL_CPUTI_H_ */ +} +} +#endif /* SURF_MODEL_CPUTI_H_ */