[debugserver] Fix mutex scope in RNBRemote::CommDataReceived #131077
Merged
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
The mutex in RNBRemote::CommDataReceived protects m_rx_packets and should extend to the end of the function to cover the read where we check if the list is empty.
|
@llvm/pr-subscribers-lldb Author: Jonas Devlieghere (JDevlieghere) ChangesThe mutex in RNBRemote::CommDataReceived protects m_rx_packets and should extend to the end of the function to cover the read where we check if the list is empty. Full diff: https://github.com/llvm/llvm-project/pull/131077.diff 1 Files Affected:
diff --git a/lldb/tools/debugserver/source/RNBRemote.cpp b/lldb/tools/debugserver/source/RNBRemote.cpp
index 8a53094429aba..dd6da3db11814 100644
--- a/lldb/tools/debugserver/source/RNBRemote.cpp
+++ b/lldb/tools/debugserver/source/RNBRemote.cpp
@@ -1054,7 +1054,7 @@ rnb_err_t RNBRemote::HandleReceivedPacket(PacketEnum *type) {
void RNBRemote::CommDataReceived(const std::string &new_data) {
// DNBLogThreadedIf (LOG_RNB_REMOTE, "%8d RNBRemote::%s called",
// (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);
@@ -1132,7 +1132,6 @@ void RNBRemote::CommDataReceived(const std::string &new_data) {
__FUNCTION__, data[idx]);
idx = idx + 1;
}
- }
}
if (!m_rx_packets.empty()) {
|
jimingham
reviewed
Mar 13, 2025
| @@ -1054,7 +1054,7 @@ rnb_err_t RNBRemote::HandleReceivedPacket(PacketEnum *type) { | |||
| void RNBRemote::CommDataReceived(const std::string &new_data) { | |||
| // DNBLogThreadedIf (LOG_RNB_REMOTE, "%8d RNBRemote::%s called", | |||
| // (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); | |||
There was a problem hiding this comment.
Should you also fix the indentation?
There was a problem hiding this comment.
Yes, I don't know why clang-format isn't kicking in...
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
jasonmolenda
approved these changes
Mar 13, 2025
JDevlieghere
added a commit
to swiftlang/llvm-project
that referenced
this pull request
Mar 14, 2025
frederik-h
pushed a commit
to frederik-h/llvm-project
that referenced
this pull request
Mar 18, 2025
…1077) The mutex in RNBRemote::CommDataReceived protects m_rx_packets and should extend to the end of the function to cover the read where we check if the list is empty.
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.
The mutex in RNBRemote::CommDataReceived protects m_rx_packets and should extend to the end of the function to cover the read where we check if the list is empty.