Skip to content

Improve websocketd_RxPutC semaphore locking #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
terjeio merged 1 commit into from
May 6, 2026
Merged

Improve websocketd_RxPutC semaphore locking #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions websocketd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,15 +311,15 @@ bool websocketd_RxPutC (char c)

// discard input if MPG has taken over...
if((ok = streambuffers.session && streambuffers.session->state == WsState_Connected && hal.stream.type != StreamType_MPG)) {
if(xSemaphoreTake(rx_mux, portMAX_DELAY) == pdTRUE) {
if(!enqueue_realtime_command(c)) { // If not a real time command attempt to buffer it
if(!enqueue_realtime_command(c)) {
if(xSemaphoreTake(rx_mux, portMAX_DELAY) == pdTRUE) {
uint_fast16_t next_head = BUFNEXT(streambuffers.rxbuf.head, streambuffers.rxbuf);
if((overflow = next_head == streambuffers.rxbuf.tail)) // If buffer full
streambuffers.rxbuf.overflow = true; // flag overflow
streambuffers.rxbuf.data[streambuffers.rxbuf.head] = c; // add data to buffer
streambuffers.rxbuf.head = next_head; // and update pointer
xSemaphoreGive(rx_mux);
}
xSemaphoreGive(rx_mux);
}

}
Expand Down