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

This reverts commit 987623567a.
pull/6722/head
Austin 2025-05-02 13:53:25 -04:00 zatwierdzone przez GitHub
rodzic 10693c4569
commit 152b8b1b02
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
2 zmienionych plików z 0 dodań i 17 usunięć

Wyświetl plik

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

Wyświetl plik

@ -8,9 +8,6 @@
#include "PointerQueue.h"
#include "RadioInterface.h"
#include "concurrency/OSThread.h"
#ifdef ARCH_PORTDUINO
#include <mutex>
#endif
/**
* A mesh aware router that supports multiple interfaces.
@ -22,12 +19,6 @@ class Router : protected concurrency::OSThread, protected PacketHistory
/// forwarded to the phone.
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:
RadioInterface *iface = NULL;