This is an archive of the discontinued LLVM Phabricator instance.

Differential D64698

Handle EOF from `lldb-vscode`
ClosedPublic

Authored by jankratochvil on Jul 13 2019, 3:49 PM.

Details

Reviewers
clayborg
labath
JDevlieghere
Commits
rGd0ac1888aab4: [lldb] Handle EOF from `lldb-vscode`
rLLDB366187: [lldb] Handle EOF from `lldb-vscode`
rL366187: [lldb] Handle EOF from `lldb-vscode`
Summary

Sometimes (when running lldb-vscode under strace) I get:

read(0, "", 16)                         = 0
read(0, "", 16)                         = 0
read(0, "", 16)                         = 0
...

Patch is obvious, isn't it? With this patch testcases finish properly even with strace:

read(0, "", 16)                         = 0
futex(0x1346508, FUTEX_WAKE_PRIVATE, 2147483647) = 0
stat("", 0x7ffe8f2634c8)                = -1 ENOENT (No such file or directory)
--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_KILLED, si_pid=9124, si_uid=1001, si_status=SIGINT, si_utime=1, si_stime=0} ---
close(4)                                = 0
exit_group(0)                           = ?
+++ exited with 0 +++

Diff Detail

Repository
rL LLVM

Event Timeline

jankratochvil created this revision.Jul 13 2019, 3:49 PM
JDevlieghere added a comment.Jul 15 2019, 9:02 AM

Looks solid to me, but I'll defer to Greg to accept.

clayborg accepted this revision.Jul 15 2019, 5:52 PM
This revision is now accepted and ready to land.Jul 15 2019, 5:52 PM
Closed by commit rL366187: [lldb] Handle EOF from `lldb-vscode` (authored by jankratochvil). · Explain WhyJul 15 2019, 11:37 PM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptJul 15 2019, 11:37 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
lldb/
trunk/
tools/
lldb-vscode/
5 lines

Diff 210026

lldb/trunk/tools/lldb-vscode/IOStream.cpp

Show First 20 Lines • Show All 95 Lines • ▼ Show 20 Linesbool InputStream::read_full(std::ofstream *log, size_t length,
char *ptr = &data[0]; char *ptr = &data[0];
while (length != 0) { while (length != 0) {
int bytes_read = 0; int bytes_read = 0;
if (descriptor.m_is_socket) if (descriptor.m_is_socket)
bytes_read = ::recv(descriptor.m_socket, ptr, length, 0); bytes_read = ::recv(descriptor.m_socket, ptr, length, 0);
else else
bytes_read = ::read(descriptor.m_fd, ptr, length); bytes_read = ::read(descriptor.m_fd, ptr, length);
if (bytes_read == 0) {
if (log)
*log << "End of file (EOF) reading from input file.\n";
return false;
}
if (bytes_read < 0) { if (bytes_read < 0) {
int reason = 0; int reason = 0;
#if defined(_WIN32) #if defined(_WIN32)
if (descriptor.m_is_socket) if (descriptor.m_is_socket)
reason = WSAGetLastError(); reason = WSAGetLastError();
else else
reason = errno; reason = errno;
#else #else
▲ Show 20 Lines • Show All 42 Lines • Show Last 20 Lines