Skip to content

[debugserver] Migrate RNBRemote away from PThreadMutex (NFC) #137547

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
merged 1 commit into from
Apr 27, 2025
+3 −5
Merged

[debugserver] Migrate RNBRemote away from PThreadMutex (NFC) #137547

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions lldb/tools/debugserver/source/RNBRemote.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,7 @@ rnb_err_t RNBRemote::GetPacketPayload(std::string &return_packet) {
// (uint32_t)m_comm.Timer().ElapsedMicroSeconds(true), __FUNCTION__);

{
PThreadMutex::Locker locker(m_mutex);
std::lock_guard<std::mutex> guard(m_mutex);
if (m_rx_packets.empty()) {
// Only reset the remote command available event if we have no more
// packets
Expand Down Expand Up @@ -1052,7 +1052,7 @@ void RNBRemote::CommDataReceived(const std::string &new_data) {
// (uint32_t)m_comm.Timer().ElapsedMicroSeconds(true), __FUNCTION__);

// Put the packet data into the buffer in a thread safe fashion
PThreadMutex::Locker locker(m_mutex);
std::lock_guard<std::mutex> guard(m_mutex);

std::string data;
// See if we have any left over data from a previous call to this
Expand Down
4 changes: 1 addition & 3 deletions lldb/tools/debugserver/source/RNBRemote.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#define LLDB_TOOLS_DEBUGSERVER_SOURCE_RNBREMOTE_H

#include "DNB.h"
#include "PThreadMutex.h"
#include "RNBContext.h"
#include "RNBDefs.h"
#include "RNBSocket.h"
Expand All @@ -25,7 +24,6 @@

class RNBSocket;
class RNBContext;
class PThreadEvents;

enum event_loop_mode { debug_nub, gdb_remote_protocol, done };

Expand Down Expand Up @@ -379,7 +377,7 @@ class RNBRemote {
std::string m_arch;
nub_thread_t m_continue_thread; // thread to continue; 0 for any, -1 for all
nub_thread_t m_thread; // thread for other ops; 0 for any, -1 for all
PThreadMutex m_mutex; // Mutex that protects
std::mutex m_mutex; // Mutex that protects
DispatchQueueOffsets m_dispatch_queue_offsets;
nub_addr_t m_dispatch_queue_offsets_addr;
uint32_t m_qSymbol_index;
Expand Down
Loading