X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/281f8c29e177852dcb1591fc31e363e1176857c8..c3f81b26d8e8d696a2cc706d18388d8d681cc26c:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 922c9c7dbd..21f92c50f8 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -1,3 +1,9 @@ +/* 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" @@ -5,14 +11,8 @@ #ifndef SURF_MODEL_CPUTI_H_ #define SURF_MODEL_CPUTI_H_ -extern "C" { XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf_cpu, "Logging specific to the SURF CPU TRACE INTEGRATION module"); -} - -static xbt_swag_t cpu_ti_running_action_set_that_does_not_need_being_checked; -static xbt_swag_t cpu_ti_modified_cpu; -static xbt_heap_t cpu_ti_action_heap; static void cpu_ti_action_update_index_heap(void *action, int i); @@ -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; @@ -119,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 @@ -148,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] - @@ -257,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) @@ -318,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; } @@ -341,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 @@ -379,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); } /********* @@ -400,67 +392,38 @@ static void cpu_ti_define_callbacks() 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(); + cpu_ti_define_callbacks(); - ModelPtr model = static_cast(surf_cpu_model_pm); - xbt_dynar_push(model_list, &model); + 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() { - xbt_assert(!surf_cpu_model_pm,"CPU model already initialized. This should not happen."); - ActionPtr action; - CpuTi cpu; - - cpu_ti_running_action_set_that_does_not_need_being_checked = - xbt_swag_new(xbt_swag_offset(*action, p_stateHookup)); + p_runningActionSetThatDoesNotNeedBeingChecked = new ActionList(); - cpu_ti_modified_cpu = - xbt_swag_new(xbt_swag_offset(cpu, p_modifiedCpuHookup)); + p_modifiedCpu = new CpuTiList(); - cpu_ti_action_heap = xbt_heap_new(8, NULL); - xbt_heap_set_update_callback(cpu_ti_action_heap, + p_tiActionHeap = xbt_heap_new(8, NULL); + xbt_heap_set_update_callback(p_tiActionHeap, cpu_ti_action_update_index_heap); } CpuTiModel::~CpuTiModel() { - void **cpu; - xbt_lib_cursor_t cursor; - char *key; - - xbt_lib_foreach(host_lib, cursor, key, cpu){ - if(cpu[SURF_CPU_LEVEL]) - { - CpuTiPtr CPU = dynamic_cast(static_cast(cpu[SURF_CPU_LEVEL])); - xbt_swag_free(CPU->p_actionSet); - delete CPU->p_availTrace; - } - } - surf_cpu_model_pm = NULL; - - xbt_swag_free - (cpu_ti_running_action_set_that_does_not_need_being_checked); - xbt_swag_free(cpu_ti_modified_cpu); - cpu_ti_running_action_set_that_does_not_need_being_checked = NULL; - xbt_heap_free(cpu_ti_action_heap); -} - -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); + delete p_runningActionSetThatDoesNotNeedBeingChecked; + delete p_modifiedCpu; + xbt_heap_free(p_tiActionHeap); } -CpuTiPtr CpuTiModel::createResource(const char *name, +Cpu *CpuTiModel::createCpu(const char *name, xbt_dynar_t powerPeak, int pstate, double powerScale, @@ -470,51 +433,49 @@ CpuTiPtr CpuTiModel::createResource(const char *name, tmgr_trace_t stateTrace, xbt_dict_t cpuProperties) { - tmgr_trace_t empty_trace; - s_tmgr_event_t val; - CpuTiActionPtr cpuAction; 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)); - return (CpuTiPtr) xbt_lib_get_elm_or_null(host_lib, name); -} - -CpuTiActionPtr CpuTiModel::createAction(double cost, bool failed) -{ - return NULL;//new CpuTiAction(this, cost, failed); + 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, cpu_ti_modified_cpu) { - static_cast(_cpu)->updateActionFinishDate(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(cpu_ti_action_heap) > 0) - min_action_duration = xbt_heap_maxkey(cpu_ti_action_heap) - now; + if (xbt_heap_size(p_tiActionHeap) > 0) + min_action_duration = xbt_heap_maxkey(p_tiActionHeap) - now; XBT_DEBUG("Share resources, min next event date: %f", min_action_duration); return min_action_duration; } -void CpuTiModel::updateActionsState(double now, double delta) +void CpuTiModel::updateActionsState(double now, double /*delta*/) { - while ((xbt_heap_size(cpu_ti_action_heap) > 0) - && (xbt_heap_maxkey(cpu_ti_action_heap) <= now)) { - CpuTiActionPtr action = (CpuTiActionPtr) xbt_heap_pop(cpu_ti_action_heap); + while ((xbt_heap_size(p_tiActionHeap) > 0) + && (xbt_heap_maxkey(p_tiActionHeap) <= now)) { + CpuTiAction *action = (CpuTiAction*) 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()); @@ -535,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); @@ -546,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 = dynamic_cast(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); @@ -572,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); } } } @@ -581,62 +542,67 @@ 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) : - Resource(model, name, properties), Cpu(model, name, properties) { - p_stateCurrent = stateInitial; + xbt_dict_t properties) +: Cpu(model, name, properties, core, 0, powerScale) +{ + p_powerEvent = NULL; + 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; - 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(){ + 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 %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, cpu_ti_modified_cpu); + + modified(true); power_trace = p_availTrace->p_powerTrace; xbt_dynar_get_cpy(power_trace->s_list.event_list, @@ -655,23 +621,24 @@ 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) { - 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->m_finish = date; + action->setFinishTime(date); action->setState(SURF_ACTION_FAILED); if (action->m_indexHeap >= 0) { - CpuTiActionPtr heap_act = (CpuTiActionPtr) - xbt_heap_remove(cpu_ti_action_heap, action->m_indexHeap); + CpuTiAction *heap_act = (CpuTiAction*) + xbt_heap_remove(static_cast(getModel())->p_tiActionHeap, action->m_indexHeap); if (heap_act != action) DIE_IMPOSSIBLE; } @@ -688,91 +655,90 @@ void CpuTi::updateState(tmgr_trace_event_t event_type, return; } -void CpuTi::updateActionFinishDate(double now) +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->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; - 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->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(cpu_ti_action_heap, 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(cpu_ti_action_heap, 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", - 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, cpu_ti_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()); @@ -787,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) @@ -799,15 +764,16 @@ 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->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 */ @@ -815,7 +781,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 */ @@ -824,72 +790,82 @@ 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); } m_lastUpdate = now; } -CpuActionPtr CpuTi::execute(double size) -{ - return _execute(size); -} - -CpuTiActionPtr CpuTi::_execute(double size) +CpuAction *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); + XBT_IN("(%s,%g)", getName(), size); + CpuTiAction *action = new CpuTiAction(static_cast(getModel()), size, getState() != SURF_RESOURCE_ON, this); - action->p_cpu = this; - action->m_indexHeap = -1; - - xbt_swag_insert(this, cpu_ti_modified_cpu); - - xbt_swag_insert(action, p_actionSet); - - action->m_suspended = 0; /* Should be useless because of the - » calloc but it seems to help valgrind... */ + 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, MAXMIN_PRECISION); + duration = MAX(duration, sg_surf_precision); + + XBT_IN("(%s,%g)", getName(), duration); + CpuTiAction *action = new CpuTiAction(static_cast(getModel()), 1.0, getState() != SURF_RESOURCE_ON, this); - XBT_IN("(%s,%g)", m_name, duration); - CpuTiActionPtr action = _execute(1.0); 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 = cpu_ti_running_action_set_that_does_not_need_being_checked; - 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 = static_cast(getModel())->p_runningActionSetThatDoesNotNeedBeingChecked; + action->getStateSet()->push_back(*action); } + + p_actionSet->push_back(*action); + XBT_OUT(); return action; } -void CpuTi::printCpuTiModel() -{ - std::cout << getModel()->getName() << "<(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(CpuTiModel *model_, double cost, bool failed, + CpuTi *cpu) + : CpuAction(model_, cost, failed) +{ + m_suspended = 0; /* Should be useless because of the + calloc but it seems to help valgrind... */ + p_cpu = cpu; + m_indexHeap = -1; + p_cpu->modified(true); +} + void CpuTiAction::updateIndexHeap(int i) { m_indexHeap = i; @@ -897,20 +873,22 @@ void CpuTiAction::updateIndexHeap(int i) void CpuTiAction::setState(e_surf_action_state_t state) { - Action::setState(state); - xbt_swag_insert(p_cpu, cpu_ti_modified_cpu); + CpuAction::setState(state); + p_cpu->modified(true); } 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); + if (action_ti_hook.is_linked()) + p_cpu->p_actionSet->erase(p_cpu->p_actionSet->iterator_to(*this)); /* remove from heap */ - xbt_heap_remove(cpu_ti_action_heap, this->m_indexHeap); - xbt_swag_insert(p_cpu, cpu_ti_modified_cpu); + xbt_heap_remove(static_cast(getModel())->p_tiActionHeap, this->m_indexHeap); + p_cpu->modified(true); delete this; return 1; } @@ -920,23 +898,18 @@ int CpuTiAction::unref() void CpuTiAction::cancel() { this->setState(SURF_ACTION_FAILED); - xbt_heap_remove(cpu_ti_action_heap, this->m_indexHeap); - xbt_swag_insert(p_cpu, cpu_ti_modified_cpu); + xbt_heap_remove(getModel()->getActionHeap(), this->m_indexHeap); + 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(cpu_ti_action_heap, m_indexHeap); - xbt_swag_insert(p_cpu, cpu_ti_modified_cpu); + xbt_heap_remove(getModel()->getActionHeap(), m_indexHeap); + p_cpu->modified(true); } XBT_OUT(); } @@ -946,7 +919,7 @@ void CpuTiAction::resume() XBT_IN("(%p)", this); if (m_suspended != 2) { m_suspended = 0; - xbt_swag_insert(p_cpu, cpu_ti_modified_cpu); + p_cpu->modified(true); } XBT_OUT(); } @@ -965,19 +938,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(cpu_ti_action_heap, m_indexHeap); + CpuTiAction *heap_act = (CpuTiAction*) + xbt_heap_remove(getModel()->getActionHeap(), m_indexHeap); if (heap_act != this) DIE_IMPOSSIBLE; } - xbt_heap_push(cpu_ti_action_heap, this, min_finish); + xbt_heap_push(getModel()->getActionHeap(), this, min_finish); XBT_OUT(); } @@ -986,7 +959,7 @@ void CpuTiAction::setPriority(double priority) { XBT_IN("(%p,%g)", this, priority); m_priority = priority; - xbt_swag_insert(p_cpu, cpu_ti_modified_cpu); + p_cpu->modified(true); XBT_OUT(); } @@ -998,9 +971,5 @@ double CpuTiAction::getRemains() return m_remains; } -static void check() { - CpuTiActionPtr cupAction = new CpuTiAction(NULL, 0, true); -} - #endif /* SURF_MODEL_CPUTI_H_ */