Skip to content

Enhance/de mutex #3

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
Moi78 merged 3 commits into from
Jun 13, 2026
Merged

Enhance/de mutex #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee66d25
added moodycamel's lock free queue deps
Moi78 Jun 13, 2026
0b110e6
using lock free queue for local audio fifo
Moi78 Jun 13, 2026
40f1c70
include cleanup
Moi78 Jun 13, 2026
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
30 changes: 6 additions & 24 deletions common/AudioRouter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,29 +33,14 @@ bool AudioRouter::init_router(const std::string &eth_interface, const std::share
}

void AudioRouter::poll_local_audio_buffer() {
bool local_fifo_empty = false;
AudioPacket local_packet;

while (!local_fifo_empty) {
{
#ifndef NO_THREADS
std::unique_lock<std::shared_mutex> __lock{m_local_fifo_mutex};
#endif // NO_THREADS
local_fifo_empty = m_local_audio_fifo.empty();

if (!local_fifo_empty) {
local_packet = m_local_audio_fifo.front();
m_local_audio_fifo.pop();
}
}

if (!local_fifo_empty) {
LowLatHeader llhdr{};
llhdr.sender_uid = m_self_uid;
llhdr.dest_uid = m_self_uid;
while (m_local_audio_fifo.try_dequeue(local_packet)) {
LowLatHeader llhdr{};
llhdr.sender_uid = m_self_uid;
llhdr.dest_uid = m_self_uid;

m_routing_callback(local_packet, llhdr);
}
m_routing_callback(local_packet, llhdr);
}
}

Expand Down Expand Up @@ -135,10 +120,7 @@ void AudioRouter::send_audio_packet(const AudioPacket &packet, uint16_t dest_uid
if (dest_uid != m_self_uid) {
m_audio_iface->send_data(packet, dest_uid);
} else {
#ifndef NO_THREADS
std::unique_lock<std::shared_mutex> __lock{m_local_fifo_mutex};
#endif // NO_THREADS
m_local_audio_fifo.push(packet);
m_local_audio_fifo.enqueue(packet);
}
}

Expand Down
10 changes: 2 additions & 8 deletions common/AudioRouter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@
#ifndef AUDIOROUTER_H
#define AUDIOROUTER_H

#include "third_party/concurrentqueue.h"
#include "netutils/LowLatSocket.h"
#include "packet_structs.h"

#include <functional>
#include <queue>
#include <mutex>
#include <shared_mutex>

class AudioRouter {
public:
Expand Down Expand Up @@ -42,13 +40,9 @@ class AudioRouter {
std::unique_ptr<LowLatSocket> m_control_iface;
uint16_t m_self_uid;

std::queue<AudioPacket> m_local_audio_fifo;
moodycamel::ConcurrentQueue<AudioPacket> m_local_audio_fifo;

std::shared_ptr<NetworkMapper> m_nmapper;

#ifndef NO_THREADS
std::shared_mutex m_local_fifo_mutex;
#endif // NO_THREADS
protected:
std::function<void(AudioPacket&, LowLatHeader&)> m_routing_callback;
std::function<void(ControlPacket&, LowLatHeader&)> m_channel_control_callback;
Expand Down
Loading
Loading