Move ESP-NOW bridge RX processing out of callbacks#2060
Open
robekl wants to merge 1 commit intomeshcore-dev:devfrom
Open
Move ESP-NOW bridge RX processing out of callbacks#2060robekl wants to merge 1 commit intomeshcore-dev:devfrom
robekl wants to merge 1 commit intomeshcore-dev:devfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This fixes the ESP-NOW bridge receive path so callback context no longer allocates mesh packets, mutates duplicate-tracking state, or touches the packet manager queues.
Problem
ESPNowBridge::recv_cb()currently calls intoonDataRecv(), which fully parses incoming frames and then:mesh::Packetobjects_seen_packets.hasSeen()_mgr->queueInbound()That work runs from the ESP-NOW callback path, while the main dispatcher loop is simultaneously using the same
PacketManagerand duplicate tables.StaticPoolPacketManageris not synchronized; it mutates raw arrays and counters directly. So the bridge was crossing the packet ownership boundary from callback context and could race the main loop.This is the exact class of issue previously identified in thread-safety review: heavy callback-side processing over shared queue state.
Fix
This PR changes the bridge RX flow to a bounded mailbox model:
ESPNowBridge::loop()now drains queued raw frames in normal main-loop contextPacketallocation, duplicate checking, and_mgr->queueInbound()all happen from the main loop instead of callback contextWhy this fixes it
After this change, callback context never touches:
StaticPoolPacketManagerSimpleMeshTablesThose shared ownership structures are back to being single-context for this bridge implementation, which removes the queue corruption / duplicate-table race that existed before.
Validation
Built successfully:
Heltec_v2_repeater_bridge_espnow