Revert patch r313904, as it breaks "command source" and in

particular causes lldb to die on startup if you have a ~/.lldbinit file.

I filed:

https://bugs.llvm.org/show_bug.cgi?id=34758

to cover fixing the bug.

llvm-svn: 314371

diff --git a/lldb/include/lldb/API/SBCommandInterpreter.h b/lldb/include/lldb/API/SBCommandInterpreter.h
index 80f24ce..f684071 100644 (file)
--- a/lldb/include/lldb/API/SBCommandInterpreter.h
+++ b/lldb/include/lldb/API/SBCommandInterpreter.h
@@ -165,8 +165,6 @@ public:
                        int match_start_point, int max_return_elements,
                        lldb::SBStringList &matches);
 
-  bool WasInterrupted() const;
-
   // Catch commands before they execute by registering a callback that will
   // get called when the command gets executed. This allows GUI or command
   // line interfaces to intercept a command and stop it from happening

diff --git a/lldb/include/lldb/Core/IOHandler.h b/lldb/include/lldb/Core/IOHandler.h
index e8cfbad..ebf56d7 100644 (file)
--- a/lldb/include/lldb/Core/IOHandler.h
+++ b/lldb/include/lldb/Core/IOHandler.h
@@ -195,7 +195,7 @@ public:
   enum class Completion { None, LLDBCommand, Expression };
 
   IOHandlerDelegate(Completion completion = Completion::None)
-      : m_completion(completion) {}
+      : m_completion(completion), m_io_handler_done(false) {}
 
   virtual ~IOHandlerDelegate() = default;
 
@@ -296,6 +296,7 @@ public:
 
 protected:
   Completion m_completion; // Support for common builtin completions
+  bool m_io_handler_done;
 };
 
 //----------------------------------------------------------------------

diff --git a/lldb/include/lldb/Interpreter/CommandInterpreter.h b/lldb/include/lldb/Interpreter/CommandInterpreter.h
index a7a67d2..73bd7d6 100644 (file)
--- a/lldb/include/lldb/Interpreter/CommandInterpreter.h
+++ b/lldb/include/lldb/Interpreter/CommandInterpreter.h
@@ -242,8 +242,6 @@ public:
                      bool repeat_on_empty_command = true,
                      bool no_context_switching = false);
 
-  bool WasInterrupted() const;
-
   //------------------------------------------------------------------
   /// Execute a list of commands in sequence.
   ///
@@ -524,24 +522,6 @@ private:
                               StringList &commands_help,
                               CommandObject::CommandMap &command_map);
 
-  // An interruptible wrapper around the stream output
-  void PrintCommandOutput(Stream &stream, llvm::StringRef str,
-                          bool interruptible);
-
-  // A very simple state machine which models the command handling transitions
-  enum class CommandHandlingState {
-    eIdle,
-    eInProgress,
-    eInterrupted,
-  };
-
-  std::atomic<CommandHandlingState> m_command_state{
-      CommandHandlingState::eIdle};
-
-  void StartHandlingCommand();
-  void FinishHandlingCommand();
-  bool InterruptCommand();
-
   Debugger &m_debugger; // The debugger session that this interpreter is
                         // associated with
   ExecutionContextRef m_exe_ctx_ref; // The current execution context to use

diff --git a/lldb/scripts/interface/SBCommandInterpreter.i b/lldb/scripts/interface/SBCommandInterpreter.i
index 255e8ba..c427d38 100644 (file)
--- a/lldb/scripts/interface/SBCommandInterpreter.i
+++ b/lldb/scripts/interface/SBCommandInterpreter.i
@@ -125,18 +125,18 @@ public:
     {
         eBroadcastBitThreadShouldExit       = (1 << 0),
         eBroadcastBitResetPrompt            = (1 << 1),
-        eBroadcastBitQuitCommandReceived    = (1 << 2),           // User entered quit
+        eBroadcastBitQuitCommandReceived    = (1 << 2),           // User entered quit 
         eBroadcastBitAsynchronousOutputData = (1 << 3),
         eBroadcastBitAsynchronousErrorData  = (1 << 4)
     };
 
     SBCommandInterpreter (const lldb::SBCommandInterpreter &rhs);
-
+    
     ~SBCommandInterpreter ();
 
-    static const char *
+    static const char * 
     GetArgumentTypeAsCString (const lldb::CommandArgumentType arg_type);
-
+    
     static const char *
     GetArgumentDescriptionAsCString (const lldb::CommandArgumentType arg_type);
 
@@ -181,7 +181,7 @@ public:
 
     lldb::SBProcess
     GetProcess ();
-
+    
     lldb::SBDebugger
     GetDebugger ();
 
@@ -209,12 +209,10 @@ public:
                       int match_start_point,
                       int max_return_elements,
                       lldb::SBStringList &matches);
-
+    
     bool
     IsActive ();
 
-    bool
-    WasInterrupted () const;
 };
 
 } // namespace lldb

diff --git a/lldb/source/API/SBCommandInterpreter.cpp b/lldb/source/API/SBCommandInterpreter.cpp
index c9bb8f6..aa49539 100644 (file)
--- a/lldb/source/API/SBCommandInterpreter.cpp
+++ b/lldb/source/API/SBCommandInterpreter.cpp
@@ -161,10 +161,6 @@ bool SBCommandInterpreter::IsActive() {
   return (IsValid() ? m_opaque_ptr->IsActive() : false);
 }
 
-bool SBCommandInterpreter::WasInterrupted() const {
-  return (IsValid() ? m_opaque_ptr->WasInterrupted() : false);
-}
-
 const char *SBCommandInterpreter::GetIOHandlerControlSequence(char ch) {
   return (IsValid()
               ? m_opaque_ptr->GetDebugger()

diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp
index 4eaec5b..bb1b3f8 100644 (file)
--- a/lldb/source/Commands/CommandObjectTarget.cpp
+++ b/lldb/source/Commands/CommandObjectTarget.cpp
@@ -2053,8 +2053,6 @@ protected:
               result.GetOutputStream().EOL();
               result.GetOutputStream().EOL();
             }
-            if (m_interpreter.WasInterrupted())
-              break;
             num_dumped++;
             DumpModuleSymtab(
                 m_interpreter, result.GetOutputStream(),
@@ -2083,8 +2081,6 @@ protected:
                   result.GetOutputStream().EOL();
                   result.GetOutputStream().EOL();
                 }
-                if (m_interpreter.WasInterrupted())
-                  break;
                 num_dumped++;
                 DumpModuleSymtab(m_interpreter, result.GetOutputStream(),
                                  module, m_options.m_sort_order);
@@ -2150,8 +2146,6 @@ protected:
                                           " modules.\n",
                                           (uint64_t)num_modules);
           for (size_t image_idx = 0; image_idx < num_modules; ++image_idx) {
-            if (m_interpreter.WasInterrupted())
-              break;
             num_dumped++;
             DumpModuleSections(
                 m_interpreter, result.GetOutputStream(),
@@ -2173,8 +2167,6 @@ protected:
               FindModulesByName(target, arg_cstr, module_list, true);
           if (num_matches > 0) {
             for (size_t i = 0; i < num_matches; ++i) {
-              if (m_interpreter.WasInterrupted())
-                break;
               Module *module = module_list.GetModulePointerAtIndex(i);
               if (module) {
                 num_dumped++;
@@ -2247,8 +2239,6 @@ protected:
                                           " modules.\n",
                                           (uint64_t)num_modules);
           for (uint32_t image_idx = 0; image_idx < num_modules; ++image_idx) {
-            if (m_interpreter.WasInterrupted())
-              break;
             if (DumpModuleSymbolVendor(
                     result.GetOutputStream(),
                     target_modules.GetModulePointerAtIndexUnlocked(image_idx)))
@@ -2270,8 +2260,6 @@ protected:
               FindModulesByName(target, arg_cstr, module_list, true);
           if (num_matches > 0) {
             for (size_t i = 0; i < num_matches; ++i) {
-              if (m_interpreter.WasInterrupted())
-                break;
               Module *module = module_list.GetModulePointerAtIndex(i);
               if (module) {
                 if (DumpModuleSymbolVendor(result.GetOutputStream(), module))
@@ -2339,8 +2327,6 @@ protected:
         if (num_modules > 0) {
           uint32_t num_dumped = 0;
           for (uint32_t i = 0; i < num_modules; ++i) {
-            if (m_interpreter.WasInterrupted())
-              break;
             if (DumpCompileUnitLineTable(
                     m_interpreter, result.GetOutputStream(),
                     target_modules.GetModulePointerAtIndexUnlocked(i),

diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp
index a4d7815..d42e4df 100644 (file)
--- a/lldb/source/Core/Debugger.cpp
+++ b/lldb/source/Core/Debugger.cpp
@@ -1170,7 +1170,7 @@ TestPromptFormats (StackFrame *frame)
         return;
 
     StreamString s;
-    const char *prompt_format =
+    const char *prompt_format =         
     "{addr = '${addr}'\n}"
     "{addr-file-or-load = '${addr-file-or-load}'\n}"
     "{current-pc-arrow = '${current-pc-arrow}'\n}"

diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp
index 884c6dc..5efc6d1 100644 (file)
--- a/lldb/source/Interpreter/CommandInterpreter.cpp
+++ b/lldb/source/Interpreter/CommandInterpreter.cpp
@@ -546,7 +546,7 @@ void CommandInterpreter::LoadCommandDictionary() {
       char buffer[1024];
       int num_printed =
           snprintf(buffer, 1024, "%s %s", break_regexes[i][1], "-o");
-      lldbassert(num_printed < 1024);
+      assert(num_printed < 1024);
       UNUSED_IF_ASSERT_DISABLED(num_printed);
       success =
           tbreak_regex_cmd_ap->AddRegexCommand(break_regexes[i][0], buffer);
@@ -891,8 +891,8 @@ bool CommandInterpreter::AddCommand(llvm::StringRef name,
                                     const lldb::CommandObjectSP &cmd_sp,
                                     bool can_replace) {
   if (cmd_sp.get())
-    lldbassert((this == &cmd_sp->GetCommandInterpreter()) &&
-               "tried to add a CommandObject from a different interpreter");
+    assert((this == &cmd_sp->GetCommandInterpreter()) &&
+           "tried to add a CommandObject from a different interpreter");
 
   if (name.empty())
     return false;
@@ -913,8 +913,8 @@ bool CommandInterpreter::AddUserCommand(llvm::StringRef name,
                                         const lldb::CommandObjectSP &cmd_sp,
                                         bool can_replace) {
   if (cmd_sp.get())
-    lldbassert((this == &cmd_sp->GetCommandInterpreter()) &&
-               "tried to add a CommandObject from a different interpreter");
+    assert((this == &cmd_sp->GetCommandInterpreter()) &&
+           "tried to add a CommandObject from a different interpreter");
 
   if (!name.empty()) {
     // do not allow replacement of internal commands
@@ -1062,8 +1062,8 @@ CommandInterpreter::AddAlias(llvm::StringRef alias_name,
                              lldb::CommandObjectSP &command_obj_sp,
                              llvm::StringRef args_string) {
   if (command_obj_sp.get())
-    lldbassert((this == &command_obj_sp->GetCommandInterpreter()) &&
-               "tried to add a CommandObject from a different interpreter");
+    assert((this == &command_obj_sp->GetCommandInterpreter()) &&
+           "tried to add a CommandObject from a different interpreter");
 
   std::unique_ptr<CommandAlias> command_alias_up(
       new CommandAlias(*this, command_obj_sp, args_string, alias_name));
@@ -1839,7 +1839,7 @@ int CommandInterpreter::HandleCompletion(
   matches.Clear();
 
   // Only max_return_elements == -1 is supported at present:
-  lldbassert(max_return_elements == -1);
+  assert(max_return_elements == -1);
   bool word_complete;
   num_command_matches = HandleCompletionMatches(
       parsed_line, cursor_index, cursor_char_position, match_start_point,
@@ -2677,57 +2677,6 @@ size_t CommandInterpreter::GetProcessOutput() {
   return total_bytes;
 }
 
-void CommandInterpreter::StartHandlingCommand() {
-  auto prev_state = m_command_state.exchange(CommandHandlingState::eInProgress);
-  lldbassert(prev_state == CommandHandlingState::eIdle);
-}
-
-void CommandInterpreter::FinishHandlingCommand() {
-  auto prev_state = m_command_state.exchange(CommandHandlingState::eIdle);
-  lldbassert(prev_state != CommandHandlingState::eIdle);
-}
-
-bool CommandInterpreter::InterruptCommand() {
-  auto in_progress = CommandHandlingState::eInProgress;
-  return m_command_state.compare_exchange_strong(
-      in_progress, CommandHandlingState::eInterrupted);
-}
-
-bool CommandInterpreter::WasInterrupted() const {
-  return m_command_state == CommandHandlingState::eInterrupted;
-}
-
-void CommandInterpreter::PrintCommandOutput(Stream &stream, llvm::StringRef str,
-                                            bool interruptible) {
-  if (str.empty())
-    return;
-
-  if (interruptible) {
-    // Split the output into lines and poll for interrupt requests
-    const char *data = str.data();
-    size_t size = str.size();
-    while (size > 0 && !WasInterrupted()) {
-      size_t chunk_size = 0;
-      for (; chunk_size < size; ++chunk_size) {
-        lldbassert(data[chunk_size] != '\0');
-        if (data[chunk_size] == '\n') {
-          ++chunk_size;
-          break;
-        }
-      }
-      chunk_size = stream.Write(data, chunk_size);
-      lldbassert(size >= chunk_size);
-      data += chunk_size;
-      size -= chunk_size;
-    }
-    if (size > 0) {
-      stream.Printf("\n... Interrupted.\n");
-    }
-  } else {
-    stream.PutCString(str);
-  }
-}
-
 void CommandInterpreter::IOHandlerInputComplete(IOHandler &io_handler,
                                                 std::string &line) {
   const bool is_interactive = io_handler.GetIsInteractive();
@@ -2751,8 +2700,6 @@ void CommandInterpreter::IOHandlerInputComplete(IOHandler &io_handler,
                                                line.c_str());
   }
 
-  StartHandlingCommand();
-
   lldb_private::CommandReturnObject result;
   HandleCommand(line.c_str(), eLazyBoolCalculate, result);
 
@@ -2763,20 +2710,18 @@ void CommandInterpreter::IOHandlerInputComplete(IOHandler &io_handler,
 
     if (!result.GetImmediateOutputStream()) {
       llvm::StringRef output = result.GetOutputData();
-      PrintCommandOutput(*io_handler.GetOutputStreamFile(), output,
-                         is_interactive);
+      if (!output.empty())
+        io_handler.GetOutputStreamFile()->PutCString(output);
     }
 
     // Now emit the command error text from the command we just executed
     if (!result.GetImmediateErrorStream()) {
       llvm::StringRef error = result.GetErrorData();
-      PrintCommandOutput(*io_handler.GetErrorStreamFile(), error,
-                         is_interactive);
+      if (!error.empty())
+        io_handler.GetErrorStreamFile()->PutCString(error);
     }
   }
 
-  FinishHandlingCommand();
-
   switch (result.GetStatus()) {
   case eReturnStatusInvalid:
   case eReturnStatusSuccessFinishNoResult:
@@ -2832,9 +2777,6 @@ bool CommandInterpreter::IOHandlerInterrupt(IOHandler &io_handler) {
   ExecutionContext exe_ctx(GetExecutionContext());
   Process *process = exe_ctx.GetProcessPtr();
 
-  if (InterruptCommand())
-    return true;
-
   if (process) {
     StateType state = process->GetState();
     if (StateIsRunningState(state)) {
@@ -3056,7 +2998,7 @@ CommandInterpreter::ResolveCommandImpl(std::string &command_line,
         result.AppendRawError(error_msg.GetString());
       } else {
         // We didn't have only one match, otherwise we wouldn't get here.
-        lldbassert(num_matches == 0);
+        assert(num_matches == 0);
         result.AppendErrorWithFormat("'%s' is not a valid command.\n",
                                      next_word.c_str());
       }