Druk-3D/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-11-14 17:26:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

command: Check for reentrant calls to sendf()

Browse Source 
Allow sendf() to be called from irq and timer context - check for the
case where sendf() is called while already in sendf() and simply
discard those messages.  This makes it safe to use output() debugging
calls even in irq and timer context.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2017-01-13 12:10:00 -05:00
parent f335045273
commit 9a44a20a9d
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/command.c
View File

@@ -114,11 +114,22 @@ error:
void
_sendf(uint8_t parserid, ...)
{
static uint8_t in_sendf;
irqstatus_t flag = irq_save();
if (in_sendf) {
// This sendf call was made from an irq handler while the main
// code was already in sendf - just drop this sendf request.
irq_restore(flag);
return;
}
in_sendf = 1;
irq_restore(flag);
const struct command_encoder *cp = &command_encoders[parserid];
uint8_t max_size = READP(cp->max_size);
char *buf = console_get_output(max_size + MESSAGE_MIN);
if (!buf)
return;
goto done;
char *p = &buf[MESSAGE_HEADER_SIZE];
if (max_size) {
char *maxend = &p[max_size];
@@ -182,6 +193,8 @@ _sendf(uint8_t parserid, ...)
*p++ = crc;
*p++ = MESSAGE_SYNC;
console_push_output(msglen);
done:
in_sendf = 0;
return;
error:
shutdown("Message encode error");