Turn off 'quit' confirmation in lldb-mi

[ki.stfu]

Summary

1. Turn off interpreter.prompt-on-quit on startup (MI)
2. Add CommandInterpreter::SetPromptOnQuit
3. Add SBCommandInterpreter::GetPromptOnQuit/SetPromptOnQuit

All tests pass on OS X.

[ki.stfu]

Friendly ping.

[abidh]

MI part looks ok to me. Please wait for Greg to approve the rest.

[ki.stfu]

In D8444#145131, @abidh wrote:

MI part looks ok to me. Please wait for Greg to approve the rest.

Thanks for review!

@clayborg, take a look please.

[clayborg]

Add the new API to the .i files as mentioned in the inline comments.

include/lldb/API/SBCommandInterpreter.h

222–226

You also need to add these to the SBCommandInterpreter.i file so they are available in python. If you have made any other lldb::SB changes in the last few weeks, you should go back and make sure to add any new functions to the appropriate .i file as well.

[ki.stfu]

Add GetPromptOnQuit/SetPromptOnQuit to SBCommandInterpreter.i

[clayborg]

Remove "const" as per inline comments.

include/lldb/API/SBCommandInterpreter.h

223

You can actually take the const off of this as it does nothing when your only member is an std::shared_ptr, std::auto_ptr or just a pointer. So please take off the const so it doesn't cause problems later. We should have no functions that return "const lldb::SB" objects.

scripts/Python/interface/SBCommandInterpreter.i

153

Remove const per above note.

source/API/SBCommandInterpreter.cpp

451

remove const

[ki.stfu]

@clayborg, take a look again please.

include/lldb/API/SBCommandInterpreter.h

222–226

If you have made any other lldb::SB changes in the last few weeks, you should go back and make sure to add any new functions to the appropriate .i file as well.

Done.

$ svn commit
Sending        scripts/Python/interface/SBCommandInterpreter.i
Sending        scripts/Python/interface/SBModule.i
Sending        scripts/Python/interface/SBTarget.i
Transmitting file data ...
Committed revision 233029.

[ki.stfu]

include/lldb/API/SBCommandInterpreter.h

223

I saw the same thing in scripts/Python/interface/SBTarget.i:

bool
IsValid() const;

Should we remove the 'const' here?

[clayborg]

No, don't change any existing API. Unfortunately by the time we caught this one, it was out in the wild and we had programs linking against it. Just make sure to not add const to any new API.

[ki.stfu]

include/lldb/API/SBCommandInterpreter.h

27–67

or here?

101–102

or here?

[ki.stfu]

In D8444#145654, @clayborg wrote:

No, don't change any existing API. Unfortunately by the time we caught this one, it was out in the wild and we had programs linking against it. Just make sure to not add const to any new API.

ok.

[ki.stfu]

Remove the const from SBxxx methods

[clayborg]

Looks good.

include/lldb/API/SBCommandInterpreter.h

 {
 friend class SBDebugger;
 friend class SBCommandInterpreter;
 
 public:
     SBCommandInterpreterRunOptions();
     ~SBCommandInterpreterRunOptions();
 
     bool
     GetStopOnContinue () const;
 
     void
     SetStopOnContinue (bool);
 
     bool
     GetStopOnError () const;
 
     void
     SetStopOnError (bool);
 
     bool
     GetStopOnCrash () const;
 
     void
     SetStopOnCrash (bool);
 
     bool
     GetEchoCommands () const;
 
     void
     SetEchoCommands (bool);
 
     bool
     GetPrintResults () const;
 
     void
     SetPrintResults (bool);
 
     bool
     GetAddToHistory () const;
 
     void
     SetAddToHistory (bool);
 private:
     lldb_private::CommandInterpreterRunOptions *
     get () const;
 
     lldb_private::CommandInterpreterRunOptions &
     ref () const;
 
     // This is set in the constructor and will always be valid.
     mutable std::unique_ptr<lldb_private::CommandInterpreterRunOptions> m_opaque_up;
 };
 
 class SBCommandInterpreter
 {
 public:
public:
     GetArgumentTypeAsCString (const lldb::CommandArgumentType arg_type);
     
     static const char *
     GetArgumentDescriptionAsCString (const lldb::CommandArgumentType arg_type);
 
     static bool
     EventIsCommandInterpreterEvent (const lldb::SBEvent &event);
     
     bool
     IsValid() const;
 
     bool
     CommandExists (const char *cmd);
 
     bool
     AliasExists (const char *cmd);
 
     lldb::SBBroadcaster
public:
     /// @return
     ///     The string that should be written into the file handle that is
     ///     feeding the input stream for the debugger, or NULL if there is
     ///     no string for this control key.
     //----------------------------------------------------------------------
     const char *
     GetIOHandlerControlSequence(char ch);
 
+    bool
+    GetPromptOnQuit();
+
+    void
+    SetPromptOnQuit(bool b);
+
 protected:
 
     lldb_private::CommandInterpreter &
     ref ();
 
     lldb_private::CommandInterpreter *
     get ();
 

include/lldb/Interpreter/CommandInterpreter.h

public:
     // Properties
     //------------------------------------------------------------------
     bool
     GetExpandRegexAliases () const;
     
     bool
     GetPromptOnQuit () const;
 
+    void
+    SetPromptOnQuit (bool b);
+
     bool
     GetStopCmdSourceOnError () const;
 
     uint32_t
     GetNumErrors() const
     {
         return m_num_errors;
     }

scripts/Python/interface/SBCommandInterpreter.i

public:
 
     bool
     IsValid() const;
 
     const char *
     GetIOHandlerControlSequence(char ch);
 
     bool
+    GetPromptOnQuit();
+
+    void
+    SetPromptOnQuit(bool b);
+
+    bool
     CommandExists (const char *cmd);
 
     bool
     AliasExists (const char *cmd);
 
     lldb::SBBroadcaster
     GetBroadcaster ();
 

source/API/SBCommandInterpreter.cpp

SBCommandInterpreter::GetDebugger ()
     if (log)
         log->Printf ("SBCommandInterpreter(%p)::GetDebugger () => SBDebugger(%p)",
                      static_cast<void*>(m_opaque_ptr),
                      static_cast<void*>(sb_debugger.get()));
 
     return sb_debugger;
 }
 
+bool
+SBCommandInterpreter::GetPromptOnQuit()
+{
+    if (m_opaque_ptr)
+        return m_opaque_ptr->GetPromptOnQuit();
+    return false;
+}
+
+void
+SBCommandInterpreter::SetPromptOnQuit (bool b)
+{
+    if (m_opaque_ptr)
+        m_opaque_ptr->SetPromptOnQuit(b);
+}
+
 CommandInterpreter *
 SBCommandInterpreter::get ()
 {
     return m_opaque_ptr;
 }
 
 CommandInterpreter &
 SBCommandInterpreter::ref ()
SBCommand::AddCommand (const char* name, lldb::SBCommandPluginInterface *impl, const char* help)
     if (m_opaque_sp->IsMultiwordObject() == false)
         return lldb::SBCommand();
     lldb::CommandObjectSP new_command_sp;
     new_command_sp.reset(new CommandPluginInterfaceImplementation(m_opaque_sp->GetCommandInterpreter(),name,impl,help));
     if (new_command_sp && m_opaque_sp->LoadSubCommand(name,new_command_sp))
         return lldb::SBCommand(new_command_sp);
     return lldb::SBCommand();
 }
-

source/Interpreter/CommandInterpreter.cpp

 
 bool
 CommandInterpreter::GetPromptOnQuit () const
 {
     const uint32_t idx = ePropertyPromptOnQuit;
     return m_collection_sp->GetPropertyAtIndexAsBoolean (nullptr, idx, g_properties[idx].default_uint_value != 0);
 }
 
+void
+CommandInterpreter::SetPromptOnQuit (bool b)
+{
+    const uint32_t idx = ePropertyPromptOnQuit;
+    m_collection_sp->SetPropertyAtIndexAsBoolean (nullptr, idx, b);
+}
+
 bool
 CommandInterpreter::GetStopCmdSourceOnError () const
 {
     const uint32_t idx = ePropertyStopCmdSourceOnError;
     return m_collection_sp->GetPropertyAtIndexAsBoolean (nullptr, idx, g_properties[idx].default_uint_value != 0);
 }
 
 void

tools/lldb-mi/MICmnLLDBDebugger.cpp

 // Return:  MIstatus::success - Functionality succeeded.
 //          MIstatus::failure - Functionality failed.
 // Throws:  None.
 //--
 bool
 CMICmnLLDBDebugger::InitSBDebugger(void)
 {
     m_lldbDebugger = lldb::SBDebugger::Create(false);
-    if (m_lldbDebugger.IsValid())
-        return MIstatus::success;
-
+    if (!m_lldbDebugger.IsValid())
+    {
         SetErrorDescription(MIRSRC(IDS_LLDBDEBUGGER_ERR_INVALIDDEBUGGER));
         return MIstatus::failure;
     }
 
+    m_lldbDebugger.GetCommandInterpreter().SetPromptOnQuit(false);
+
+    return MIstatus::success;
+}
+
 //++ ------------------------------------------------------------------------------------
 // Details: Set the LLDB Debugger's std in, err and out streams. (Not implemented left
 //          here for reference. Was called in the CMICmnLLDBDebugger::Initialize() )
 // Type:    Method.
 // Args:    None.
 // Return:  MIstatus::success - Functionality succeeded.
 //          MIstatus::failure - Functionality failed.
 // Throws:  None.