X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4736926935eb52f1e561715d2fa5a3fc4144a188..03d87ef83eada5a3cf9aacce9e6a5dc0d169aaa3:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index a72268a2f6..ec7f4e67cd 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -5,8 +5,9 @@ * 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_ @@ -35,11 +36,11 @@ CpuTiTrace::CpuTiTrace(tmgr_trace_t speedTrace) double time = 0; int i = 0; p_timePoints = (double*) xbt_malloc0(sizeof(double) * - (xbt_dynar_length(speedTrace->s_list.event_list) + 1)); + (xbt_dynar_length(speedTrace->event_list) + 1)); p_integral = (double*) xbt_malloc0(sizeof(double) * - (xbt_dynar_length(speedTrace->s_list.event_list) + 1)); - m_nbPoints = xbt_dynar_length(speedTrace->s_list.event_list) + 1; - xbt_dynar_foreach(speedTrace->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; @@ -125,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 @@ -139,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 @@ -167,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 * @@ -302,7 +302,7 @@ 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_speedTrace->s_list.event_list, point, &val); + xbt_dynar_get_cpy(p_speedTrace->event_list, point, &val); return val.value; } @@ -330,8 +330,8 @@ CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, double value) } /* only one point available, fixed trace */ - if (xbt_dynar_length(speedTrace->s_list.event_list) == 1) { - xbt_dynar_get_cpy(speedTrace->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; @@ -341,7 +341,7 @@ CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, double value) p_speedTrace = speedTrace; /* count the total time of trace file */ - xbt_dynar_foreach(speedTrace->s_list.event_list, cpt, val) { + xbt_dynar_foreach(speedTrace->event_list, cpt, val) { total_time += val.delta; } p_trace = new CpuTiTrace(speedTrace); @@ -385,15 +385,6 @@ int CpuTiTrace::binarySearch(double *array, double a, int low, int high) } } -/************* - * CallBacks * - *************/ - -static void cpu_ti_define_callbacks() -{ - sg_platf_postparse_add_cb(simgrid::surf::cpu_add_traces); -} - /********* * Model * *********/ @@ -404,13 +395,10 @@ 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 simgrid::surf::CpuTiModel(); - surf_cpu_model_vm = new simgrid::surf::CpuTiModel(); + xbt_dynar_push(all_existing_models, &surf_cpu_model_pm); - cpu_ti_define_callbacks(); - simgrid::surf::Model *model_pm = static_cast(surf_cpu_model_pm); - simgrid::surf::Model *model_vm = static_cast(surf_cpu_model_vm); - xbt_dynar_push(all_existing_models, &model_pm); - xbt_dynar_push(all_existing_models, &model_vm); + surf_cpu_model_vm = new simgrid::surf::CpuTiModel(); + xbt_dynar_push(all_existing_models, &surf_cpu_model_vm); } namespace simgrid { @@ -435,24 +423,24 @@ CpuTiModel::~CpuTiModel() xbt_heap_free(p_tiActionHeap); } -Cpu *CpuTiModel::createCpu(simgrid::Host *host, - xbt_dynar_t speedPeak, - int pstate, +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, + int initiallyOn, tmgr_trace_t stateTrace) { xbt_assert(core==1,"Multi-core not handled with this model yet"); 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, stateInitial, stateTrace); + core, initiallyOn, stateTrace); return cpu; } -double CpuTiModel::shareResources(double now) +double CpuTiModel::next_occuring_event(double now) { double min_action_duration = -1; @@ -490,99 +478,42 @@ 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); - 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); - - 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, 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); - 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); - - XBT_DEBUG("Add speed trace: %s to CPU(%s)", trace_name, elm); - if (cpu->p_availTrace) - delete cpu->p_availTrace; - - cpu->p_availTrace = new CpuTiTgmr(trace, cpu->m_speedScale); - - /* 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_speedEvent = - tmgr_history_add_trace(history, empty_trace, - cpu->p_availTrace->m_lastTime, 0, cpu); - } - } - } +THROW_DEADCODE; } /************ * Resource * ************/ -CpuTi::CpuTi(CpuTiModel *model, simgrid::Host *host, xbt_dynar_t speedPeak, +CpuTi::CpuTi(CpuTiModel *model, 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) - : Cpu(model, host, core, 0, speedScale, stateInitial) + int initiallyOn, tmgr_trace_t stateTrace) + : Cpu(model, host, NULL, pstate, core, 0, speedScale, initiallyOn) { - p_speedEvent = NULL; - m_speedScale = speedScale; + 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("speed scale %f", speedScale); + + p_speed.scale = speedScale; p_availTrace = new CpuTiTgmr(speedTrace, speedScale); p_actionSet = new ActionTiList(); - m_lastUpdate = 0; - - xbt_dynar_get_cpy(speedPeak, 0, &m_speedPeak); - XBT_DEBUG("CPU create: peak=%f", m_speedPeak); + 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, this); - if (speedTrace && xbt_dynar_length(speedTrace->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(speedTrace->s_list.event_list, - xbt_dynar_length(speedTrace->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_speedEvent = - tmgr_history_add_trace(history, empty_trace, - p_availTrace->m_lastTime, 0, this); + p_speed.event = + future_evt_set->add_trace(tmgr_empty_trace_new(), p_availTrace->m_lastTime, this); } } -}; +} CpuTi::~CpuTi() { @@ -590,51 +521,64 @@ CpuTi::~CpuTi() 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); -void CpuTi::updateState(tmgr_trace_event_t event_type, - double value, double date) + /* 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) { CpuTiAction *action; - if (event_type == p_speedEvent) { + 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); + updateRemainingAmount(surf_get_clock()); modified(true); speedTrace = p_availTrace->p_speedTrace; - xbt_dynar_get_cpy(speedTrace->s_list.event_list, - xbt_dynar_length(speedTrace->s_list.event_list) - 1, &val); + xbt_dynar_get_cpy(speedTrace->event_list, + xbt_dynar_length(speedTrace->event_list) - 1, &val); /* free old trace */ delete p_availTrace; - m_speedScale = 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_speedEvent = 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 */ for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end()) ; it != itend ; ++it) { - action = &*it; + action = &*it; if (action->getState() == SURF_ACTION_RUNNING || action->getState() == SURF_ACTION_READY || action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) { @@ -649,14 +593,10 @@ void CpuTi::updateState(tmgr_trace_event_t event_type, } } } - 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) @@ -664,8 +604,8 @@ void CpuTi::updateActionsFinishTime(double now) 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); for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end()) ; it != itend ; ++it) { @@ -703,7 +643,7 @@ updateRemainingAmount(now); (action->getRemains()) * sum_priority * action->getPriority(); - total_area /= m_speedPeak; + total_area /= p_speed.peak; action->setFinishTime(p_availTrace->solve(now, total_area)); /* verify which event will happen before (max_duration or finish time) */ @@ -734,7 +674,7 @@ updateRemainingAmount(now); action->m_finish, action->getMaxDuration()); } -/* remove from modified cpu */ + /* remove from modified cpu */ modified(false); } @@ -745,15 +685,11 @@ bool CpuTi::isUsed() double CpuTi::getAvailableSpeed() { - m_speedScale = 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; @@ -763,8 +699,8 @@ void CpuTi::updateRemainingAmount(double now) if (m_lastUpdate >= now) return; -/* calcule the surface */ - area_total = p_availTrace->integrate(m_lastUpdate, now) * m_speedPeak; + /* 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); @@ -801,10 +737,10 @@ void CpuTi::updateRemainingAmount(double now) m_lastUpdate = now; } -CpuAction *CpuTi::execute(double size) +CpuAction *CpuTi::execution_start(double size) { XBT_IN("(%s,%g)", getName(), size); - CpuTiAction *action = new CpuTiAction(static_cast(getModel()), size, getState() != SURF_RESOURCE_ON, this); + CpuTiAction *action = new CpuTiAction(static_cast(getModel()), size, isOff(), this); p_actionSet->push_back(*action); @@ -819,14 +755,14 @@ CpuAction *CpuTi::sleep(double duration) 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); + 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->getStateSet()->erase(action->getStateSet()->iterator_to(*action)); action->p_stateSet = static_cast(getModel())->p_runningActionSetThatDoesNotNeedBeingChecked; action->getStateSet()->push_back(*action); } @@ -855,11 +791,9 @@ void CpuTi::modified(bool modified){ **********/ CpuTiAction::CpuTiAction(CpuTiModel *model_, double cost, bool failed, - CpuTi *cpu) + 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); @@ -880,8 +814,8 @@ int CpuTiAction::unref() { m_refcount--; if (!m_refcount) { - if (action_hook.is_linked()) - getStateSet()->erase(getStateSet()->iterator_to(*this)); + if (action_hook.is_linked()) + getStateSet()->erase(getStateSet()->iterator_to(*this)); /* remove from action_set */ if (action_ti_hook.is_linked()) p_cpu->p_actionSet->erase(p_cpu->p_actionSet->iterator_to(*this)); @@ -923,11 +857,6 @@ void CpuTiAction::resume() XBT_OUT(); } -bool CpuTiAction::isSuspended() -{ - return m_suspended == 1; -} - void CpuTiAction::setMaxDuration(double duration) { double min_finish;