[LLDB, lldb-mi] Add option --synchronous.

[polyakov.alex]

Summary

Option --synchronous disables asynchronous mode in the lldb-mi driver. Used for testing only.

[polyakov.alex]

This option is needed by https://reviews.llvm.org/D46588.

[aprantl]

Looks good!

[clayborg]

Looks fine, just move the option parsing code down by the others instead of having it before the checking for file args.

tools/lldb-mi/MIDriver.cpp

441–444 ↗

(On Diff #147680)

This should be moved down by the other arguments (like to line 471 of this file, or 473 of old one)

[polyakov.alex]

Moved the option parsing code down by the others.

lldb/trunk/tools/lldb-mi/MICmnResources.h

enum {
   IDE_MI_APP_ARG_VERSION_LONG,
   IDE_MI_APP_ARG_INTERPRETER,
   IDE_MI_APP_ARG_EXECUTEABLE,
   IDE_MI_APP_ARG_SOURCE,
   IDE_MI_APP_ARG_APP_LOG,
   IDE_MI_APP_ARG_APP_LOG_DIR,
   IDE_MI_APP_ARG_EXAMPLE,
   IDE_MI_APP_ARG_EXECUTABLE,
+  IDE_MI_APP_ARG_SYNCHRONOUS,
 
   IDS_STDIN_ERR_INVALID_PROMPT,
   IDS_STDIN_ERR_THREAD_CREATION_FAILED,
   IDS_STDIN_ERR_THREAD_DELETE,
   IDS_STDIN_ERR_CHKING_BYTE_AVAILABLE,
   IDS_STDIN_INPUT_CTRL_CHARS,
 
   IDS_CMD_QUIT_HELP,

lldb/trunk/tools/lldb-mi/MICmnResources.cpp

CMICmnResources::ms_pResourceId2TextData[] = {
         {IDE_MI_APP_ARG_APP_LOG_DIR,
          "--log-dir\n\tUse this argument to specify the directory the MI "
          "Driver\n\twill place the log file in, i.e --log-dir=/tmp."},
         {IDE_MI_APP_ARG_EXAMPLE, "Example MI command:\n\t3-info-gdb-mi-command "
                                  "gdb-set\n\t3^done,command={exists=\"true\"}"},
         {IDE_MI_APP_ARG_EXECUTABLE, "executable (NOT IMPLEMENTED)\n\tThe file "
                                     "path to the executable i.e. '\"C:\\My "
                                     "Dev\\foo.exe\"'."},
+        {IDE_MI_APP_ARG_SYNCHRONOUS, "--synchronous\n\tBlock until each command "
+                                     "has finished executing.\n\tUsed for testing only."},
         {IDS_STDIN_ERR_INVALID_PROMPT,
          "Stdin. Invalid prompt description '%s'"},
         {IDS_STDIN_ERR_THREAD_CREATION_FAILED,
          "Stdin. Thread creation failed '%s'"},
         {IDS_STDIN_ERR_THREAD_DELETE, "Stdin. Thread failed to delete '%s'"},
         {IDS_STDIN_ERR_CHKING_BYTE_AVAILABLE,
          "Stdin. Peeking on stdin stream '%s'"},
         {IDS_STDIN_INPUT_CTRL_CHARS,

lldb/trunk/tools/lldb-mi/MIDriver.cpp

 //------------------------------------------------------------------------------------
 // Details: Check the arguments that were passed to this program to make sure
 // they are
 //          valid and to get their argument values (if any). The following are
 //          options
 //          that are only handled by *this driver:
 //              --executable <file>
 //              --source <file> or -s <file>
+//              --synchronous
 //          The application's options --interpreter and --executable in code act
 //          very similar.
 //          The --executable is necessary to differentiate whether the MI Driver
 //          is being
 //          used by a client (e.g. Eclipse) or from the command line. Eclipse
 //          issues the option
 //          --interpreter and also passes additional arguments which can be
 //          interpreted as an
 //          executable if called from the command line. Using --executable tells
 //          the MI Driver
 //          it is being called from the command line and to prepare to launch
 //          the executable
 //          argument for a debug session. Using --interpreter on the command
 //          line does not
 //          issue additional commands to initialise a debug session.
+//          Option --synchronous disables an asynchronous mode in the lldb-mi driver.
 // Type:    Overridden.
 // Args:    argc        - (R)   An integer that contains the count of arguments
 // that follow in
 //                              argv. The argc parameter is always greater than
 //                              or equal to 1.
 //          argv        - (R)   An array of null-terminated strings representing
 //          command-line
 //                              arguments entered by the user of the program. By
for (MIint i = argc - 1; i > 0; i--) {
       }
       // This argument is also checked for in CMIDriverMgr::ParseArgs()
       else if (strArg.compare("--executable") == 0) // Used to specify that
                                                     // there is executable
                                                     // argument also on the
                                                     // command line
       {                                             // See fn description.
         bHaveExecutableLongOption = true;
+      } else if (strArg.compare("--synchronous") == 0) {
+        CMICmnLLDBDebugSessionInfo::Instance().GetDebugger().SetAsync(false);
       }
     }
   }
 
   if (bHaveExecutableFileNamePath && bHaveExecutableLongOption) {
     SetDriverDebuggingArgExecutable();
   }
 

lldb/trunk/tools/lldb-mi/MIDriverMgr.cpp

 //--
 CMIUtilString CMIDriverMgr::GetHelpOnCmdLineArgOptions() const {
   const CMIUtilString pHelp[] = {
       MIRSRC(IDE_MI_APP_DESCRIPTION), MIRSRC(IDE_MI_APP_INFORMATION),
       MIRSRC(IDE_MI_APP_ARG_USAGE), MIRSRC(IDE_MI_APP_ARG_HELP),
       MIRSRC(IDE_MI_APP_ARG_VERSION), MIRSRC(IDE_MI_APP_ARG_VERSION_LONG),
       MIRSRC(IDE_MI_APP_ARG_INTERPRETER), MIRSRC(IDE_MI_APP_ARG_SOURCE),
       MIRSRC(IDE_MI_APP_ARG_EXECUTEABLE),
+      MIRSRC(IDE_MI_APP_ARG_SYNCHRONOUS),
       CMIUtilString::Format(
           MIRSRC(IDE_MI_APP_ARG_APP_LOG),
           CMICmnLogMediumFile::Instance().GetFileName().c_str()),
       MIRSRC(IDE_MI_APP_ARG_APP_LOG_DIR), MIRSRC(IDE_MI_APP_ARG_EXECUTABLE),
       MIRSRC(IDS_CMD_QUIT_HELP), MIRSRC(IDE_MI_APP_ARG_EXAMPLE)};
   const MIuint nHelpItems = sizeof pHelp / sizeof pHelp[0];
   CMIUtilString strHelp;
   for (MIuint i = 0; i < nHelpItems; i++) {