Skip to content

[lldb-dap] Retry unbuffered reads. #165823

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[lldb-dap] Retry unbuffered reads. #165823

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
15 changes: 13 additions & 2 deletions lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,11 @@ def _read_packet(
followed by the JSON bytes from self.recv. Returns None on EOF.
"""

# NOTE: We open the socket or pipe to the subprocess in an unbuffered
# mode to ensure we do not end up with a partial message in the buffer
# when we perform our select. Otherwise, we may run into a case where we
# attempt a read and the buffer is partially full but a new message is
# not sent to fill in the requested buffer size.
ready = self.selector.select(timeout)
if not ready:
warnings.warn(
Expand All @@ -243,10 +248,16 @@ def _read_packet(
if separator != "":
Exception("malformed DAP content header, unexpected line: " + separator)
# Read JSON bytes
json_str = self.recv.read(length).decode()
# NOTE: Because the read channel is unbuffered we may receive less
# than the requested number of bytes. In, which case we need to
# perform a new read.
json_str = b""
while len(json_str) < length:
json_str += self.recv.read(length - len(json_str))

if self.trace_file:
self.trace_file.write(
"%s from adapter:\n%s\n" % (time.time(), json_str)
"%s from adapter:\n%s\n" % (time.time(), json_str.decode())
)
# Decode the JSON bytes into a python dictionary
return json.loads(json_str)
Expand Down
Loading