From 1f1c7080d6a6cf2d444dc724d08dc568969aa145 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 4 Jan 2016 10:29:14 +0100 Subject: [PATCH] CpuTI cleanups: initialize fields, dont overide with same content, typos and cosmetics --- src/surf/cpu_ti.cpp | 49 ++++++++++++++++----------------------------- src/surf/cpu_ti.hpp | 7 +++---- 2 files changed, 20 insertions(+), 36 deletions(-) diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index d6a976ba67..d3735e3625 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -125,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 @@ -139,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 @@ -167,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 * @@ -553,36 +552,31 @@ CpuTi::CpuTi(CpuTiModel *model, simgrid::Host *host, xbt_dynar_t speedPeak, 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() { @@ -664,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) { @@ -734,7 +728,7 @@ updateRemainingAmount(now); action->m_finish, action->getMaxDuration()); } -/* remove from modified cpu */ + /* remove from modified cpu */ modified(false); } @@ -749,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; @@ -763,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); @@ -921,11 +911,6 @@ void CpuTiAction::resume() XBT_OUT(); } -bool CpuTiAction::isSuspended() -{ - return m_suspended == 1; -} - void CpuTiAction::setMaxDuration(double duration) { double min_finish; diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index 17940d84e5..02b630b7f8 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -91,7 +91,6 @@ public: void updateIndexHeap(int i); void suspend() override; void resume() override; - bool isSuspended() override; void setMaxDuration(double duration) override; void setPriority(double priority) override; double getRemains() override; @@ -130,11 +129,11 @@ public: void modified(bool modified); CpuTiTgmr *p_availTrace; /*< Structure with data needed to integrate trace file */ - tmgr_trace_event_t p_stateEvent; /*< trace file with states events (ON or OFF) */ - tmgr_trace_event_t p_speedEvent; /*< trace file with availability events */ + tmgr_trace_event_t p_stateEvent = NULL; /*< trace file with states events (ON or OFF) */ + tmgr_trace_event_t p_speedEvent = NULL; /*< trace file with availability events */ ActionTiList *p_actionSet; /*< set with all actions running on cpu */ double m_sumPriority; /*< the sum of actions' priority that are running on cpu */ - double m_lastUpdate; /*< last update of actions' remaining amount done */ + double m_lastUpdate = 0; /*< last update of actions' remaining amount done */ double current_frequency; -- 2.20.1