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

serialqueue: Eventually time out if unable to write CANbus messages 

Klipper logs an error on a failed CANbus write.  Unfortunately, if the
bus becomes permanently disabled (eg, due to a user removing power to
devices on the CANbus) then it can result in the logs filling with
error messages.

Permanently disable the low-level processing of messages if CANbus
writes continually fail for at least 10 seconds.  This avoids filling
the log with redundant messages.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2023-10-04 22:26:10 -04:00
parent 043f18da26
commit 447125faae
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
klippy/chelper/serialqueue.c
View File

@ -62,6 +62,7 @@ struct serialqueue {
int ready_bytes, upcoming_bytes, need_ack_bytes, last_ack_bytes; int ready_bytes, upcoming_bytes, need_ack_bytes, last_ack_bytes;
uint64_t need_kick_clock; uint64_t need_kick_clock;
struct list_head notify_queue; struct list_head notify_queue;
double last_write_fail_time;
// Received messages // Received messages
struct list_head receive_queue; struct list_head receive_queue;
// Fastreader support // Fastreader support
@ -376,8 +377,16 @@ do_write(struct serialqueue *sq, void *buf, int buflen)
int ret = write(sq->serial_fd, &cf, sizeof(cf)); int ret = write(sq->serial_fd, &cf, sizeof(cf));
if (ret < 0) { if (ret < 0) {
report_errno("can write", ret); report_errno("can write", ret);
double curtime = get_monotonic();
if (!sq->last_write_fail_time) {
sq->last_write_fail_time = curtime;
} else if (curtime > sq->last_write_fail_time + 10.0) {
errorf("Halting reads due to CAN write errors.");
pollreactor_do_exit(sq->pr);
}
return; return;
} }
sq->last_write_fail_time = 0.0;
buf += size; buf += size;
buflen -= size; buflen -= size;
} }