X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e8b0c2495697cb3be4ea22a4b356e92d118e5a82..b35d70d6818026204833410d2e3917252fa35127:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 3e2d91be93..d3735e3625 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -14,7 +14,14 @@ 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 * @@ -118,9 +125,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 +138,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 +166,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 * @@ -375,13 +381,16 @@ int CpuTiTrace::binarySearch(double *array, double a, int low, int high) return low; } +} +} + /************* * CallBacks * *************/ static void cpu_ti_define_callbacks() { - sg_platf_postparse_add_cb(cpu_add_traces); + sg_platf_postparse_add_cb(simgrid::surf::cpu_add_traces); } /********* @@ -393,16 +402,19 @@ 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(); + surf_cpu_model_vm = new simgrid::surf::CpuTiModel(); cpu_ti_define_callbacks(); - Model *model_pm = static_cast(surf_cpu_model_pm); - Model *model_vm = static_cast(surf_cpu_model_vm); + 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); } +namespace simgrid { +namespace surf { + CpuTiModel::CpuTiModel() : CpuModel() { p_runningActionSetThatDoesNotNeedBeingChecked = new ActionList(); @@ -422,23 +434,20 @@ CpuTiModel::~CpuTiModel() xbt_heap_free(p_tiActionHeap); } -Cpu *CpuTiModel::createCpu(const char *name, +Cpu *CpuTiModel::createCpu(simgrid::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) + tmgr_trace_t stateTrace) { xbt_assert(core==1,"Multi-core not handled with this model yet"); - sg_host_t host = sg_host_by_name(name); 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, name, speedPeak, pstate, speedScale, speedTrace, - core, stateInitial, stateTrace, cpuProperties); - sg_host_surfcpu_register(host, cpu); + CpuTi *cpu = new CpuTi(this, host, speedPeak, pstate, speedScale, speedTrace, + core, stateInitial, stateTrace); return cpu; } @@ -492,7 +501,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); - CpuTi *cpu = static_cast(sg_host_surfcpu(sg_host_by_name(elm))); + CpuTi *cpu = static_cast(sg_host_by_name(elm)->p_cpu); xbt_assert(cpu, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -508,7 +517,7 @@ void CpuTiModel::addTraces() 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))); + CpuTi *cpu = static_cast(sg_host_by_name(elm)->p_cpu); xbt_assert(cpu, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -538,44 +547,39 @@ void CpuTiModel::addTraces() /************ * Resource * ************/ -CpuTi::CpuTi(CpuTiModel *model, const char *name, xbt_dynar_t speedPeak, +CpuTi::CpuTi(CpuTiModel *model, simgrid::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 properties) - : Cpu(model, name, properties, core, 0, speedScale, stateInitial) + e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace) + : Cpu(model, host, NULL, pstate, core, 0, speedScale, stateInitial) { - 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); + + m_speedScale = 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); 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) { + 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); 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); + tmgr_trace_t empty_trace = tmgr_empty_trace_new(); + p_speedEvent = tmgr_history_add_trace(history, empty_trace, p_availTrace->m_lastTime, 0, this); } } -}; +} -CpuTi::~CpuTi(){ +CpuTi::~CpuTi() +{ modified(false); delete p_availTrace; delete p_actionSet; @@ -654,8 +658,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) { @@ -724,7 +728,7 @@ updateRemainingAmount(now); action->m_finish, action->getMaxDuration()); } -/* remove from modified cpu */ + /* remove from modified cpu */ modified(false); } @@ -739,11 +743,7 @@ double CpuTi::getAvailableSpeed() 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; @@ -753,7 +753,7 @@ void CpuTi::updateRemainingAmount(double now) if (m_lastUpdate >= now) return; -/* calcule the surface */ + /* compute the integration area */ area_total = p_availTrace->integrate(m_lastUpdate, now) * m_speedPeak; XBT_DEBUG("Flops total: %f, Last update %f", area_total, m_lastUpdate); @@ -844,17 +844,10 @@ void CpuTi::modified(bool modified){ * Action * **********/ -static void cpu_ti_action_update_index_heap(void *action, int 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); @@ -918,11 +911,6 @@ void CpuTiAction::resume() XBT_OUT(); } -bool CpuTiAction::isSuspended() -{ - return m_suspended == 1; -} - void CpuTiAction::setMaxDuration(double duration) { double min_finish; @@ -965,5 +953,7 @@ double CpuTiAction::getRemains() return m_remains; } -#endif /* SURF_MODEL_CPUTI_H_ */ +} +} +#endif /* SURF_MODEL_CPUTI_H_ */