3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stepcompress: Fix proactive queue flushing on move with 64K+ steps 

Commit e05c6354 changed the internal step compress queue from 64bit
integers to 32bit integers.  However, that commit broke the proactive
flushing of moves that could produce more than 64K steps.  This could
lead to large memory allocations and cpu slow downs on printers that
had a very large Z axis - possibly leading to a "Timer too close" mcu
shutdown.  Correct the code so that it properly generates a 64bit
flush clock.

Also, be sure to only expand / memmove the queue when there is no room
for a new element at the end.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2017-11-29 20:16:05 -05:00
parent 6930a7de8d
commit 6d6638826c
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
klippy/stepcompress.c
View File

@ -423,27 +423,32 @@ queue_append_slow(struct stepcompress *sc, double rel_sc)
if (sc->queue_next - sc->queue_pos > 65535 + 2000) { if (sc->queue_next - sc->queue_pos > 65535 + 2000) {
// No point in keeping more than 64K steps in memory // No point in keeping more than 64K steps in memory
int ret = stepcompress_flush(sc, *(sc->queue_next - 65535)); uint32_t flush = *(sc->queue_next-65535) - (uint32_t)sc->last_step_clock;
int ret = stepcompress_flush(sc, sc->last_step_clock + flush);
if (ret) if (ret)
return ret; return ret;
} }
int in_use = sc->queue_next - sc->queue_pos; if (sc->queue_next >= sc->queue_end) {
if (sc->queue_pos > sc->queue) { // Make room in the queue
// Shuffle the internal queue to avoid having to allocate more ram int in_use = sc->queue_next - sc->queue_pos;
memmove(sc->queue, sc->queue_pos, in_use * sizeof(*sc->queue)); if (sc->queue_pos > sc->queue) {
} else { // Shuffle the internal queue to avoid having to allocate more ram
// Expand the internal queue of step times memmove(sc->queue, sc->queue_pos, in_use * sizeof(*sc->queue));
int alloc = sc->queue_end - sc->queue; } else {
if (!alloc) // Expand the internal queue of step times
alloc = QUEUE_START_SIZE; int alloc = sc->queue_end - sc->queue;
while (in_use >= alloc) if (!alloc)
alloc *= 2; alloc = QUEUE_START_SIZE;
sc->queue = realloc(sc->queue, alloc * sizeof(*sc->queue)); while (in_use >= alloc)
sc->queue_end = sc->queue + alloc; alloc *= 2;
sc->queue = realloc(sc->queue, alloc * sizeof(*sc->queue));
sc->queue_end = sc->queue + alloc;
}
sc->queue_pos = sc->queue;
sc->queue_next = sc->queue + in_use;
} }
sc->queue_pos = sc->queue;
sc->queue_next = sc->queue + in_use;
*sc->queue_next++ = abs_step_clock; *sc->queue_next++ = abs_step_clock;
return 0; return 0;
} }