[clang-tools-extra] r297779 - [clangd] Fix not being able to attach a debugger on macOS

Benjamin Kramer via cfe-commits cfe-commits at lists.llvm.org
Tue Mar 14 13:41:28 PDT 2017

Author: d0k
Date: Tue Mar 14 15:41:28 2017
New Revision: 297779

URL: http://llvm.org/viewvc/llvm-project?rev=297779&view=rev
[clangd] Fix not being able to attach a debugger on macOS

Clangd is often waiting for input on getline as it awaits requests. If the
getline is interrupted, it causes the system call (read) to fail and the EINTR
error to be set. This can be seen when attaching a debugger such as LLDB on
macOS. On macOS (and possibly other operating systems), this system call is not
restarted after interruption but on Linux it is restarted which is why
attaching a debugger does work correctly there.

The solution is to work around the non-restarting system call by checking the
errno for EINTR when the stream fails and try again. This should be safe on all
Unixish platforms.

See also http://bugs.llvm.org/show_bug.cgi?id=32149 for some background

Patch by Marc-Andre Laperle!
Differential Revision: https://reviews.llvm.org/D30675


Modified: clang-tools-extra/trunk/clangd/ClangDMain.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/ClangDMain.cpp?rev=297779&r1=297778&r2=297779&view=diff
--- clang-tools-extra/trunk/clangd/ClangDMain.cpp (original)
+++ clang-tools-extra/trunk/clangd/ClangDMain.cpp Tue Mar 14 15:41:28 2017
@@ -67,6 +67,10 @@ int main(int argc, char *argv[]) {
     // by \r\n.
     std::string Line;
     std::getline(std::cin, Line);
+    if (!std::cin.good() && errno == EINTR) {
+      std::cin.clear();
+      continue;
+    }
     // Skip empty lines.
     llvm::StringRef LineRef(Line);

More information about the cfe-commits mailing list