nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix RideFileCache taking too long on dodgy files

Browse Source 
When the samples in a ride file start from a large offset
e.g. 6hrs is the timestamp for the first sample. The
ridefilecache will compute bests over the initial 6hr
gap.

This patch adjusts the timestamps so they always start
from zero, but only when calculating bests -- it does not
modify the ride data.

We may want to consider 'automatically' fixing this during
ridefile reading, but for now this fixes a nasty bug that
causes GC to hog CPU for large periods of time when computing
the cache.

Fixes #510.
This commit is contained in:
Mark Liversedge
2011-11-12 20:29:53 +00:00
parent bf0609f5e1
commit 78c1923e57
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/RideFileCache.cpp
View File

@@ -557,18 +557,33 @@ MeanMaxComputer::run()
// the calculations of >6m since windowsize is used to
// determine segment duration rather than examining the
// timestamps on each sample
// the decrit will also pull timestamps back to start at
// zero, since some files have a very large start time
// that creates work for nil effect (but increases compute
// time drastically).
cpintdata data;
data.rec_int_ms = (int) round(ride->recIntSecs() * 1000.0);
double lastsecs = 0;
bool first = true;
double offset = 0;
foreach (const RideFilePoint *p, ride->dataPoints()) {
// get offset to apply on all samples if first sample
if (first == true) {
offset = p->secs;
first = false;
}
// drag back to start at 0s
double psecs = p->secs - offset;
// fill in any gaps in recording - use same dodgy rounding as before
int count = (p->secs - lastsecs - ride->recIntSecs()) / ride->recIntSecs();
int count = (psecs - lastsecs - ride->recIntSecs()) / ride->recIntSecs();
for(int i=0; i<count; i++)
data.points.append(cpintpoint(round(lastsecs+((i+1)*ride->recIntSecs() *1000.0)/1000), 0));
lastsecs = p->secs;
lastsecs = psecs;
double secs = round(p->secs * 1000.0) / 1000;
double secs = round(psecs * 1000.0) / 1000;
if (secs > 0) data.points.append(cpintpoint(secs, (int) round(p->value(baseSeries))));
}