rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-21 02:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "router: on linux add a mutex around the queue (#6709)" (#6726)

Browse Source 
This reverts commit 987623567a.
This commit is contained in:
Austin
2025-05-02 13:53:25 -04:00
committed by GitHub
parent 10693c4569
commit 152b8b1b02
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesh/Router.cpp
View File

@@ -64,10 +64,6 @@ Router::Router() : concurrency::OSThread("Router"), fromRadioQueue(MAX_RX_FROMRA
*/ */
int32_t Router::runOnce() int32_t Router::runOnce()
{ {
#ifdef ARCH_PORTDUINO
const std::lock_guard<std::mutex> lock(queueMutex);
#endif
meshtastic_MeshPacket *mp; meshtastic_MeshPacket *mp;
while ((mp = fromRadioQueue.dequeuePtr(0)) != NULL) { while ((mp = fromRadioQueue.dequeuePtr(0)) != NULL) {
// printPacket("handle fromRadioQ", mp); // printPacket("handle fromRadioQ", mp);
@@ -84,10 +80,6 @@ int32_t Router::runOnce()
*/ */
void Router::enqueueReceivedMessage(meshtastic_MeshPacket *p) void Router::enqueueReceivedMessage(meshtastic_MeshPacket *p)
{ {
#ifdef ARCH_PORTDUINO
const std::lock_guard<std::mutex> lock(queueMutex);
#endif
// Try enqueue until successful // Try enqueue until successful
while (!fromRadioQueue.enqueue(p, 0)) { while (!fromRadioQueue.enqueue(p, 0)) {
meshtastic_MeshPacket *old_p; meshtastic_MeshPacket *old_p;

9
src/mesh/Router.h
View File

@@ -8,9 +8,6 @@
#include "PointerQueue.h" #include "PointerQueue.h"
#include "RadioInterface.h" #include "RadioInterface.h"
#include "concurrency/OSThread.h" #include "concurrency/OSThread.h"
#ifdef ARCH_PORTDUINO
#include <mutex>
#endif
/** /**
* A mesh aware router that supports multiple interfaces. * A mesh aware router that supports multiple interfaces.
@@ -22,12 +19,6 @@ class Router : protected concurrency::OSThread, protected PacketHistory
/// forwarded to the phone. /// forwarded to the phone.
PointerQueue<meshtastic_MeshPacket> fromRadioQueue; PointerQueue<meshtastic_MeshPacket> fromRadioQueue;
#ifdef ARCH_PORTDUINO
/// linux calls enqueueReceivedMessage from an other thread when receiving UDP packets,
/// to avoid a data race with LoRa, lock that method.
std::mutex queueMutex;
#endif
protected: protected:
RadioInterface *iface = NULL; RadioInterface *iface = NULL;