Fix tabs, newlines, and spaces getting in the structured data

Author: Jlalond

lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp

@@ -23,6 +23,7 @@
 #include "NativeThreadLinux.h"
 #include "Plugins/Process/POSIX/ProcessPOSIXLog.h"
 #include "Plugins/Process/Utility/LinuxProcMaps.h"
+#include "Plugins/Process/Utility/LinuxProcStatus.h"
 #include "Procfs.h"
 #include "lldb/Core/ModuleSpec.h"
 #include "lldb/Host/Host.h"
@@ -443,10 +444,29 @@ NativeProcessLinux::NativeProcessLinux(::pid_t pid, int terminal_fd,
   SetCurrentThreadID(tids[0]);
   SetState(StateType::eStateStopped, false);
 }
+static bool IsCoredumping(lldb::pid_t pid) {
+  auto BufferOrError = getProcFile(pid, "status");
+  if (!BufferOrError)
+    return false;
+
+  lldb_private::StructuredData::Dictionary proc_status =
+      ParseProcStatus(BufferOrError.get()->getBuffer());
+
+  if (!proc_status.HasKey("CoreDumping"))
+    return false;
+
+  llvm::StringRef result;
+  if (!proc_status.GetValueForKeyAsString("CoreDumping", result))
+    return false;
+
+  return result == "1";
+}
 
 llvm::Expected<std::vector<::pid_t>> NativeProcessLinux::Attach(::pid_t pid) {
   Log *log = GetLog(POSIXLog::Process);
 
+  bool coreDumping = IsCoredumping(pid);
+  LLDB_LOG(log, "{0} coredumping: {1}", pid, coreDumping);
   Status status;
   // Use a map to keep track of the threads which we have attached/need to
   // attach.
@@ -457,21 +477,55 @@ llvm::Expected<std::vector<::pid_t>> NativeProcessLinux::Attach(::pid_t pid) {
       if (it->second == false) {
         lldb::tid_t tid = it->first;
 
-        // Attach to the requested process.
-        // An attach will cause the thread to stop with a SIGSTOP.
-        if ((status = PtraceWrapper(PTRACE_ATTACH, tid)).Fail()) {
-          // No such thread. The thread may have exited. More error handling
-          // may be needed.
-          if (status.GetError() == ESRCH) {
-            it = tids_to_attach.erase(it);
-            continue;
+        if (!coreDumping) {
+          // Attach to the requested process.
+          // An attach will cause the thread to stop with a SIGSTOP.
+          if ((status = PtraceWrapper(PTRACE_ATTACH, tid)).Fail()) {
+            // No such thread. The thread may have exited. More error handling
+            // may be needed.
+            if (status.GetError() == ESRCH) {
+              it = tids_to_attach.erase(it);
+              continue;
+            }
+            if (status.GetError() == EPERM) {
+              // Depending on the value of ptrace_scope, we can return a
+              // different error that suggests how to fix it.
+              return AddPtraceScopeNote(status.ToError());
+            }
+            return status.ToError();
           }
-          if (status.GetError() == EPERM) {
-            // Depending on the value of ptrace_scope, we can return a different
-            // error that suggests how to fix it.
-            return AddPtraceScopeNote(status.ToError());
+        } else {
+          long options = PTRACE_O_TRACEEXIT | PTRACE_O_TRACESYSGOOD;
+          if ((status =
+                   PtraceWrapper(PTRACE_SEIZE, tid, nullptr, (void *)options))
+                  .Fail()) {
+            // No such thread. The thread may have exited. More error handling
+            // may be needed.
+            if (status.GetError() == ESRCH) {
+              it = tids_to_attach.erase(it);
+              continue;
+            }
+            if (status.GetError() == EPERM) {
+              // Depending on the value of ptrace_scope, we can return a
+              // different error that suggests how to fix it.
+              return AddPtraceScopeNote(status.ToError());
+            }
+            return status.ToError();
+          }
+          if ((status = PtraceWrapper(PTRACE_INTERRUPT, tid)).Fail()) {
+            // No such thread. The thread may have exited. More error handling
+            // may be needed.
+            if (status.GetError() == ESRCH) {
+              it = tids_to_attach.erase(it);
+              continue;
+            }
+            if (status.GetError() == EPERM) {
+              // Depending on the value of ptrace_scope, we can return a
+              // different error that suggests how to fix it.
+              return AddPtraceScopeNote(status.ToError());
+            }
+            return status.ToError();
           }
-          return status.ToError();
         }
 
         int wpid =

lldb/source/Plugins/Process/Utility/LinuxProcStatus.cpp

@@ -12,6 +12,8 @@
 #include <vector>
 
 static std::vector<std::string> SplitLines(llvm::StringRef proc_status) {
+  // Push everything to an input stream and then read it to a vec
+  // line by line
   std::istringstream inputstream(proc_status.str());
   std::vector<std::string> lines;
   std::string line;
@@ -22,9 +24,12 @@ static std::vector<std::string> SplitLines(llvm::StringRef proc_status) {
 }
 
 lldb_private::StructuredData::Dictionary
-ParseProcStatus(llvm::StringRef proc_status) {
+lldb_private::ParseProcStatus(llvm::StringRef proc_status) {
   std::vector<std::string> lines = SplitLines(proc_status);
   lldb_private::StructuredData::Dictionary proc_status_data;
+  volatile bool debug = true;
+  while (debug) {
+  }
   for (auto &str : lines) {
     // proc/pid/status is a delineated by a colon, so we split all the lines
     // and then return a structureddata of each name : value. We keep these
@@ -35,6 +40,14 @@ ParseProcStatus(llvm::StringRef proc_status) {
     }
     std::string name = str.substr(0, colonPos);
     std::string value = str.substr(colonPos + 1);
+    // All the leading values have a tab character, but
+    // that's not explicitly documented on the man page so
+    // we have this check to strip the tab, and any newline or
+    // space characters
+    value.erase(std::remove_if(
+                    value.begin(), value.end(),
+                    [](char c) { return c == '\t' || c == '\n' || c == ' '; }),
+                value.end());
     proc_status_data.AddStringItem(name, value);
   }