mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r12190) -Fix [FS#1786](r8080): YAPF always shows 0ms PF time in debug for debug level 2 (patch by IguannaB)

release/0.6
smatz 2008-02-20 12:31:28 +00:00
parent 169ac7c91d
commit 2b8d1bcb51
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/yapf/yapf_base.hpp
View File

@ -138,21 +138,23 @@ public:
#ifndef NO_DEBUG_MESSAGES #ifndef NO_DEBUG_MESSAGES
perf.Stop(); perf.Stop();
if (_debug_yapf_level >= 3) { if (_debug_yapf_level >= 2) {
int t = perf.Get(1000000); int t = perf.Get(1000000);
_total_pf_time_us += t; _total_pf_time_us += t;
UnitID veh_idx = (m_veh != NULL) ? m_veh->unitnumber : 0; if (_debug_yapf_level >= 3) {
char ttc = Yapf().TransportTypeChar(); UnitID veh_idx = (m_veh != NULL) ? m_veh->unitnumber : 0;
float cache_hit_ratio = (m_stats_cache_hits == 0) ? 0.0f : ((float)m_stats_cache_hits / (float)(m_stats_cache_hits + m_stats_cost_calcs) * 100.0f); char ttc = Yapf().TransportTypeChar();
int cost = bDestFound ? m_pBestDestNode->m_cost : -1; float cache_hit_ratio = (m_stats_cache_hits == 0) ? 0.0f : ((float)m_stats_cache_hits / (float)(m_stats_cache_hits + m_stats_cost_calcs) * 100.0f);
int dist = bDestFound ? m_pBestDestNode->m_estimate - m_pBestDestNode->m_cost : -1; int cost = bDestFound ? m_pBestDestNode->m_cost : -1;
int dist = bDestFound ? m_pBestDestNode->m_estimate - m_pBestDestNode->m_cost : -1;
DEBUG(yapf, 3, "[YAPF%c]%c%4d- %d us - %d rounds - %d open - %d closed - CHR %4.1f%% - c%d(sc%d, ts%d, o%d) -- ", DEBUG(yapf, 3, "[YAPF%c]%c%4d- %d us - %d rounds - %d open - %d closed - CHR %4.1f%% - c%d(sc%d, ts%d, o%d) -- ",
ttc, bDestFound ? '-' : '!', veh_idx, t, m_num_steps, m_nodes.OpenCount(), m_nodes.ClosedCount(), ttc, bDestFound ? '-' : '!', veh_idx, t, m_num_steps, m_nodes.OpenCount(), m_nodes.ClosedCount(),
cache_hit_ratio, cost, dist, m_perf_cost.Get(1000000), m_perf_slope_cost.Get(1000000), cache_hit_ratio, cost, dist, m_perf_cost.Get(1000000), m_perf_slope_cost.Get(1000000),
m_perf_ts_cost.Get(1000000), m_perf_other_cost.Get(1000000) m_perf_ts_cost.Get(1000000), m_perf_other_cost.Get(1000000)
); );
}
} }
#endif /* !NO_DEBUG_MESSAGES */ #endif /* !NO_DEBUG_MESSAGES */
return bDestFound; return bDestFound;