*** This commit represents a complete reformatting of the LLDB source code

*** to conform to clang-format’s LLVM style.  This kind of mass change has
*** two obvious implications:

Firstly, merging this particular commit into a downstream fork may be a huge
effort.  Alternatively, it may be worth merging all changes up to this commit,
performing the same reformatting operation locally, and then discarding the
merge for this particular commit.  The commands used to accomplish this
reformatting were as follows (with current working directory as the root of
the repository):

    find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} +
    find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ;

The version of clang-format used was 3.9.0, and autopep8 was 1.2.4.

Secondly, “blame” style tools will generally point to this commit instead of
a meaningful prior commit.  There are alternatives available that will attempt
to look through this change and find the appropriate prior commit.  YMMV.

llvm-svn: 280751

1 files changed, 374 insertions, 355 deletions

diff --git a/lldb/tools/lldb-mi/MICmdCmdMiscellanous.cpp b/lldb/tools/lldb-mi/MICmdCmdMiscellanous.cpp
index d534a6f..f2aecbc 100644
--- a/lldb/tools/lldb-mi/MICmdCmdMiscellanous.cpp
+++ b/lldb/tools/lldb-mi/MICmdCmdMiscellanous.cpp
@@ -17,71 +17,73 @@
 #include "lldb/API/SBThread.h"
 
 // In-house headers:
-#include "MICmdCmdMiscellanous.h"
-#include "MICmnMIResultRecord.h"
-#include "MICmnMIValueConst.h"
-#include "MICmnMIOutOfBandRecord.h"
-#include "MICmnLLDBDebugger.h"
-#include "MICmnLLDBDebugSessionInfo.h"
-#include "MIDriverBase.h"
 #include "MICmdArgValFile.h"
+#include "MICmdArgValListOfN.h"
 #include "MICmdArgValNumber.h"
-#include "MICmdArgValString.h"
-#include "MICmdArgValThreadGrp.h"
 #include "MICmdArgValOptionLong.h"
 #include "MICmdArgValOptionShort.h"
-#include "MICmdArgValListOfN.h"
-#include "MICmnStreamStdout.h"
+#include "MICmdArgValString.h"
+#include "MICmdArgValThreadGrp.h"
+#include "MICmdCmdMiscellanous.h"
+#include "MICmnLLDBDebugSessionInfo.h"
+#include "MICmnLLDBDebugger.h"
+#include "MICmnMIOutOfBandRecord.h"
+#include "MICmnMIResultRecord.h"
+#include "MICmnMIValueConst.h"
 #include "MICmnStreamStderr.h"
+#include "MICmnStreamStdout.h"
+#include "MIDriverBase.h"
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmdCmdGdbExit constructor.
 // Type:    Method.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--
-CMICmdCmdGdbExit::CMICmdCmdGdbExit()
-{
-    // Command factory matches this name with that received from the stdin stream
-    m_strMiCmd = "gdb-exit";
+CMICmdCmdGdbExit::CMICmdCmdGdbExit() {
+  // Command factory matches this name with that received from the stdin stream
+  m_strMiCmd = "gdb-exit";
 
-    // Required by the CMICmdFactory when registering *this command
-    m_pSelfCreatorFn = &CMICmdCmdGdbExit::CreateSelf;
+  // Required by the CMICmdFactory when registering *this command
+  m_pSelfCreatorFn = &CMICmdCmdGdbExit::CreateSelf;
 }
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmdCmdGdbExit destructor.
 // Type:    Overrideable.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--
-CMICmdCmdGdbExit::~CMICmdCmdGdbExit()
-{
-}
-
-//++ ------------------------------------------------------------------------------------
-// Details: The invoker requires this function. The command does work in this function.
-//          The command is likely to communicate with the LLDB SBDebugger in here.
+CMICmdCmdGdbExit::~CMICmdCmdGdbExit() {}
+
+//++
+//------------------------------------------------------------------------------------
+// Details: The invoker requires this function. The command does work in this
+// function.
+//          The command is likely to communicate with the LLDB SBDebugger in
+//          here.
 // Type:    Overridden.
 // Args:    None.
 // Return:  MIstatus::success - Functional succeeded.
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
-bool
-CMICmdCmdGdbExit::Execute()
-{
-    CMICmnLLDBDebugger::Instance().GetDriver().SetExitApplicationFlag(true);
-    const lldb::SBError sbErr = m_rLLDBDebugSessionInfo.GetProcess().Destroy();
-    // Do not check for sbErr.Fail() here, m_lldbProcess is likely !IsValid()
+bool CMICmdCmdGdbExit::Execute() {
+  CMICmnLLDBDebugger::Instance().GetDriver().SetExitApplicationFlag(true);
+  const lldb::SBError sbErr = m_rLLDBDebugSessionInfo.GetProcess().Destroy();
+  // Do not check for sbErr.Fail() here, m_lldbProcess is likely !IsValid()
 
-    return MIstatus::success;
+  return MIstatus::success;
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: The invoker requires this function. The command prepares a MI Record Result
+//++
+//------------------------------------------------------------------------------------
+// Details: The invoker requires this function. The command prepares a MI Record
+// Result
 //          for the work carried out in the Execute().
 // Type:    Overridden.
 // Args:    None.
@@ -89,42 +91,42 @@ CMICmdCmdGdbExit::Execute()
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
-bool
-CMICmdCmdGdbExit::Acknowledge()
-{
-    const CMICmnMIResultRecord miRecordResult(m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Exit);
-    m_miResultRecord = miRecordResult;
-
-    // Prod the client i.e. Eclipse with out-of-band results to help it 'continue' because it is using LLDB debugger
-    // Give the client '=thread-group-exited,id="i1"'
-    m_bHasResultRecordExtra = true;
-    const CMICmnMIValueConst miValueConst2("i1");
-    const CMICmnMIValueResult miValueResult2("id", miValueConst2);
-    const CMICmnMIOutOfBandRecord miOutOfBand(CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupExited, miValueResult2);
-    m_miResultRecordExtra = miOutOfBand.GetString();
-
-    return MIstatus::success;
+bool CMICmdCmdGdbExit::Acknowledge() {
+  const CMICmnMIResultRecord miRecordResult(
+      m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Exit);
+  m_miResultRecord = miRecordResult;
+
+  // Prod the client i.e. Eclipse with out-of-band results to help it 'continue'
+  // because it is using LLDB debugger
+  // Give the client '=thread-group-exited,id="i1"'
+  m_bHasResultRecordExtra = true;
+  const CMICmnMIValueConst miValueConst2("i1");
+  const CMICmnMIValueResult miValueResult2("id", miValueConst2);
+  const CMICmnMIOutOfBandRecord miOutOfBand(
+      CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupExited, miValueResult2);
+  m_miResultRecordExtra = miOutOfBand.GetString();
+
+  return MIstatus::success;
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: Required by the CMICmdFactory when registering *this command. The factory
+//++
+//------------------------------------------------------------------------------------
+// Details: Required by the CMICmdFactory when registering *this command. The
+// factory
 //          calls this function to create an instance of *this command.
 // Type:    Static method.
 // Args:    None.
 // Return:  CMICmdBase * - Pointer to a new command.
 // Throws:  None.
 //--
-CMICmdBase *
-CMICmdCmdGdbExit::CreateSelf()
-{
-    return new CMICmdCmdGdbExit();
-}
+CMICmdBase *CMICmdCmdGdbExit::CreateSelf() { return new CMICmdCmdGdbExit(); }
 
 //---------------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------------
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmdCmdListThreadGroups constructor.
 // Type:    Method.
 // Args:    None.
@@ -132,35 +134,33 @@ CMICmdCmdGdbExit::CreateSelf()
 // Throws:  None.
 //--
 CMICmdCmdListThreadGroups::CMICmdCmdListThreadGroups()
-    : m_bIsI1(false)
-    , m_bHaveArgOption(false)
-    , m_bHaveArgRecurse(false)
-    , m_constStrArgNamedAvailable("available")
-    , m_constStrArgNamedRecurse("recurse")
-    , m_constStrArgNamedGroup("group")
-    , m_constStrArgNamedThreadGroup("i1")
-{
-    // Command factory matches this name with that received from the stdin stream
-    m_strMiCmd = "list-thread-groups";
-
-    // Required by the CMICmdFactory when registering *this command
-    m_pSelfCreatorFn = &CMICmdCmdListThreadGroups::CreateSelf;
+    : m_bIsI1(false), m_bHaveArgOption(false), m_bHaveArgRecurse(false),
+      m_constStrArgNamedAvailable("available"),
+      m_constStrArgNamedRecurse("recurse"), m_constStrArgNamedGroup("group"),
+      m_constStrArgNamedThreadGroup("i1") {
+  // Command factory matches this name with that received from the stdin stream
+  m_strMiCmd = "list-thread-groups";
+
+  // Required by the CMICmdFactory when registering *this command
+  m_pSelfCreatorFn = &CMICmdCmdListThreadGroups::CreateSelf;
 }
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmdCmdListThreadGroups destructor.
 // Type:    Overrideable.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--
-CMICmdCmdListThreadGroups::~CMICmdCmdListThreadGroups()
-{
-    m_vecMIValueTuple.clear();
+CMICmdCmdListThreadGroups::~CMICmdCmdListThreadGroups() {
+  m_vecMIValueTuple.clear();
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: The invoker requires this function. The parses the command line options
+//++
+//------------------------------------------------------------------------------------
+// Details: The invoker requires this function. The parses the command line
+// options
 //          arguments to extract values for each of those arguments.
 // Type:    Overridden.
 // Args:    None.
@@ -168,22 +168,30 @@ CMICmdCmdListThreadGroups::~CMICmdCmdListThreadGroups()
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
-bool
-CMICmdCmdListThreadGroups::ParseArgs()
-{
-    m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgNamedAvailable, false, true));
-    m_setCmdArgs.Add(
-        new CMICmdArgValOptionLong(m_constStrArgNamedRecurse, false, true, CMICmdArgValListBase::eArgValType_Number, 1));
-    m_setCmdArgs.Add(new CMICmdArgValListOfN(m_constStrArgNamedGroup, false, true, CMICmdArgValListBase::eArgValType_Number));
-    m_setCmdArgs.Add(new CMICmdArgValThreadGrp(m_constStrArgNamedThreadGroup, false, true));
-    return ParseValidateCmdOptions();
+bool CMICmdCmdListThreadGroups::ParseArgs() {
+  m_setCmdArgs.Add(
+      new CMICmdArgValOptionLong(m_constStrArgNamedAvailable, false, true));
+  m_setCmdArgs.Add(
+      new CMICmdArgValOptionLong(m_constStrArgNamedRecurse, false, true,
+                                 CMICmdArgValListBase::eArgValType_Number, 1));
+  m_setCmdArgs.Add(
+      new CMICmdArgValListOfN(m_constStrArgNamedGroup, false, true,
+                              CMICmdArgValListBase::eArgValType_Number));
+  m_setCmdArgs.Add(
+      new CMICmdArgValThreadGrp(m_constStrArgNamedThreadGroup, false, true));
+  return ParseValidateCmdOptions();
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: The invoker requires this function. The command does work in this function.
-//          The command is likely to communicate with the LLDB SBDebugger in here.
-//          Synopsis: -list-thread-groups [ --available ] [ --recurse 1 ] [ group ... ]
-//          This command does not follow the MI documentation exactly. Has an extra
+//++
+//------------------------------------------------------------------------------------
+// Details: The invoker requires this function. The command does work in this
+// function.
+//          The command is likely to communicate with the LLDB SBDebugger in
+//          here.
+//          Synopsis: -list-thread-groups [ --available ] [ --recurse 1 ] [
+//          group ... ]
+//          This command does not follow the MI documentation exactly. Has an
+//          extra
 //          argument "i1" to handle.
 //          Ref:
 // http://sourceware.org/gdb/onlinedocs/gdb/GDB_002fMI-Miscellaneous-Commands.html#GDB_002fMI-Miscellaneous-Commands
@@ -193,62 +201,62 @@ CMICmdCmdListThreadGroups::ParseArgs()
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
-bool
-CMICmdCmdListThreadGroups::Execute()
-{
-    if (m_setCmdArgs.IsArgContextEmpty())
-        // No options so "top level thread groups"
-        return MIstatus::success;
-
-    CMICMDBASE_GETOPTION(pArgAvailable, OptionLong, m_constStrArgNamedAvailable);
-    CMICMDBASE_GETOPTION(pArgRecurse, OptionLong, m_constStrArgNamedRecurse);
-    CMICMDBASE_GETOPTION(pArgThreadGroup, ThreadGrp, m_constStrArgNamedThreadGroup);
-
-    // Got some options so "threads"
-    if (pArgAvailable->GetFound())
-    {
-        if (pArgRecurse->GetFound())
-        {
-            m_bHaveArgRecurse = true;
-            return MIstatus::success;
-        }
-
-        m_bHaveArgOption = true;
-        return MIstatus::success;
-    }
-    // "i1" as first argument (pos 0 of possible arg)
-    if (!pArgThreadGroup->GetFound())
-        return MIstatus::success;
-    m_bIsI1 = true;
-
-    CMICmnLLDBDebugSessionInfo &rSessionInfo(CMICmnLLDBDebugSessionInfo::Instance());
-    lldb::SBProcess sbProcess = rSessionInfo.GetProcess();
-
-    // Note do not check for sbProcess is IsValid(), continue
-
-    m_vecMIValueTuple.clear();
-    const MIuint nThreads = sbProcess.GetNumThreads();
-    for (MIuint i = 0; i < nThreads; i++)
-    {
-        //  GetThreadAtIndex() uses a base 0 index
-        //  GetThreadByIndexID() uses a base 1 index
-        lldb::SBThread thread = sbProcess.GetThreadAtIndex(i);
-
-        if (thread.IsValid())
-        {
-            CMICmnMIValueTuple miTuple;
-            if (!rSessionInfo.MIResponseFormThreadInfo(m_cmdData, thread, CMICmnLLDBDebugSessionInfo::eThreadInfoFormat_NoFrames, miTuple))
-                return MIstatus::failure;
-
-            m_vecMIValueTuple.push_back(miTuple);
-        }
+bool CMICmdCmdListThreadGroups::Execute() {
+  if (m_setCmdArgs.IsArgContextEmpty())
+    // No options so "top level thread groups"
+    return MIstatus::success;
+
+  CMICMDBASE_GETOPTION(pArgAvailable, OptionLong, m_constStrArgNamedAvailable);
+  CMICMDBASE_GETOPTION(pArgRecurse, OptionLong, m_constStrArgNamedRecurse);
+  CMICMDBASE_GETOPTION(pArgThreadGroup, ThreadGrp,
+                       m_constStrArgNamedThreadGroup);
+
+  // Got some options so "threads"
+  if (pArgAvailable->GetFound()) {
+    if (pArgRecurse->GetFound()) {
+      m_bHaveArgRecurse = true;
+      return MIstatus::success;
     }
 
+    m_bHaveArgOption = true;
     return MIstatus::success;
+  }
+  // "i1" as first argument (pos 0 of possible arg)
+  if (!pArgThreadGroup->GetFound())
+    return MIstatus::success;
+  m_bIsI1 = true;
+
+  CMICmnLLDBDebugSessionInfo &rSessionInfo(
+      CMICmnLLDBDebugSessionInfo::Instance());
+  lldb::SBProcess sbProcess = rSessionInfo.GetProcess();
+
+  // Note do not check for sbProcess is IsValid(), continue
+
+  m_vecMIValueTuple.clear();
+  const MIuint nThreads = sbProcess.GetNumThreads();
+  for (MIuint i = 0; i < nThreads; i++) {
+    //  GetThreadAtIndex() uses a base 0 index
+    //  GetThreadByIndexID() uses a base 1 index
+    lldb::SBThread thread = sbProcess.GetThreadAtIndex(i);
+
+    if (thread.IsValid()) {
+      CMICmnMIValueTuple miTuple;
+      if (!rSessionInfo.MIResponseFormThreadInfo(
+              m_cmdData, thread,
+              CMICmnLLDBDebugSessionInfo::eThreadInfoFormat_NoFrames, miTuple))
+        return MIstatus::failure;
+
+      m_vecMIValueTuple.push_back(miTuple);
+    }
+  }
+
+  return MIstatus::success;
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: The invoker requires this function. The command prepares a MI Record Result
+//++
+//------------------------------------------------------------------------------------
+// Details: The invoker requires this function. The command prepares a MI Record
+// Result
 //          for the work carried out in the Execute().
 // Type:    Overridden.
 // Args:    None.
@@ -256,140 +264,147 @@ CMICmdCmdListThreadGroups::Execute()
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
-bool
-CMICmdCmdListThreadGroups::Acknowledge()
-{
-    if (m_bHaveArgOption)
-    {
-        if (m_bHaveArgRecurse)
-        {
-            const CMICmnMIValueConst miValueConst(MIRSRC(IDS_WORD_NOT_IMPLEMENTED_BRKTS));
-            const CMICmnMIValueResult miValueResult("msg", miValueConst);
-            const CMICmnMIResultRecord miRecordResult(m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Error, miValueResult);
-            m_miResultRecord = miRecordResult;
-
-            return MIstatus::success;
-        }
-
-        const CMICmnMIValueConst miValueConst1("i1");
-        const CMICmnMIValueResult miValueResult1("id", miValueConst1);
-        CMICmnMIValueTuple miTuple(miValueResult1);
-
-        const CMICmnMIValueConst miValueConst2("process");
-        const CMICmnMIValueResult miValueResult2("type", miValueConst2);
-        miTuple.Add(miValueResult2);
-
-        CMICmnLLDBDebugSessionInfo &rSessionInfo(CMICmnLLDBDebugSessionInfo::Instance());
-        if (rSessionInfo.GetProcess().IsValid())
-        {
-            const lldb::pid_t pid = rSessionInfo.GetProcess().GetProcessID();
-            const CMIUtilString strPid(CMIUtilString::Format("%lld", pid));
-            const CMICmnMIValueConst miValueConst3(strPid);
-            const CMICmnMIValueResult miValueResult3("pid", miValueConst3);
-            miTuple.Add(miValueResult3);
-        }
-
-        const CMICmnMIValueConst miValueConst4(MIRSRC(IDS_WORD_NOT_IMPLEMENTED_BRKTS));
-        const CMICmnMIValueResult miValueResult4("num_children", miValueConst4);
-        miTuple.Add(miValueResult4);
-
-        const CMICmnMIValueConst miValueConst5(MIRSRC(IDS_WORD_NOT_IMPLEMENTED_BRKTS));
-        const CMICmnMIValueResult miValueResult5("cores", miValueConst5);
-        miTuple.Add(miValueResult5);
-
-        const CMICmnMIValueList miValueList(miTuple);
-        const CMICmnMIValueResult miValueResult6("groups", miValueList);
-        const CMICmnMIResultRecord miRecordResult(m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Done, miValueResult6);
-        m_miResultRecord = miRecordResult;
-
-        return MIstatus::success;
+bool CMICmdCmdListThreadGroups::Acknowledge() {
+  if (m_bHaveArgOption) {
+    if (m_bHaveArgRecurse) {
+      const CMICmnMIValueConst miValueConst(
+          MIRSRC(IDS_WORD_NOT_IMPLEMENTED_BRKTS));
+      const CMICmnMIValueResult miValueResult("msg", miValueConst);
+      const CMICmnMIResultRecord miRecordResult(
+          m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Error,
+          miValueResult);
+      m_miResultRecord = miRecordResult;
+
+      return MIstatus::success;
     }
 
-    if (!m_bIsI1)
-    {
-        const CMICmnMIValueConst miValueConst1("i1");
-        const CMICmnMIValueResult miValueResult1("id", miValueConst1);
-        CMICmnMIValueTuple miTuple(miValueResult1);
-
-        const CMICmnMIValueConst miValueConst2("process");
-        const CMICmnMIValueResult miValueResult2("type", miValueConst2);
-        miTuple.Add(miValueResult2);
-
-        CMICmnLLDBDebugSessionInfo &rSessionInfo(CMICmnLLDBDebugSessionInfo::Instance());
-        if (rSessionInfo.GetProcess().IsValid())
-        {
-            const lldb::pid_t pid = rSessionInfo.GetProcess().GetProcessID();
-            const CMIUtilString strPid(CMIUtilString::Format("%lld", pid));
-            const CMICmnMIValueConst miValueConst3(strPid);
-            const CMICmnMIValueResult miValueResult3("pid", miValueConst3);
-            miTuple.Add(miValueResult3);
-        }
-
-        if (rSessionInfo.GetTarget().IsValid())
-        {
-            lldb::SBTarget sbTrgt = rSessionInfo.GetTarget();
-            const char *pDir = sbTrgt.GetExecutable().GetDirectory();
-            const char *pFileName = sbTrgt.GetExecutable().GetFilename();
-            const CMIUtilString strFile(CMIUtilString::Format("%s/%s", pDir, pFileName));
-            const CMICmnMIValueConst miValueConst4(strFile);
-            const CMICmnMIValueResult miValueResult4("executable", miValueConst4);
-            miTuple.Add(miValueResult4);
-        }
-
-        const CMICmnMIValueList miValueList(miTuple);
-        const CMICmnMIValueResult miValueResult5("groups", miValueList);
-        const CMICmnMIResultRecord miRecordResult(m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Done, miValueResult5);
-        m_miResultRecord = miRecordResult;
-        return MIstatus::success;
+    const CMICmnMIValueConst miValueConst1("i1");
+    const CMICmnMIValueResult miValueResult1("id", miValueConst1);
+    CMICmnMIValueTuple miTuple(miValueResult1);
+
+    const CMICmnMIValueConst miValueConst2("process");
+    const CMICmnMIValueResult miValueResult2("type", miValueConst2);
+    miTuple.Add(miValueResult2);
+
+    CMICmnLLDBDebugSessionInfo &rSessionInfo(
+        CMICmnLLDBDebugSessionInfo::Instance());
+    if (rSessionInfo.GetProcess().IsValid()) {
+      const lldb::pid_t pid = rSessionInfo.GetProcess().GetProcessID();
+      const CMIUtilString strPid(CMIUtilString::Format("%lld", pid));
+      const CMICmnMIValueConst miValueConst3(strPid);
+      const CMICmnMIValueResult miValueResult3("pid", miValueConst3);
+      miTuple.Add(miValueResult3);
     }
 
-    // Build up a list of thread information from tuples
-    VecMIValueTuple_t::const_iterator it = m_vecMIValueTuple.begin();
-    if (it == m_vecMIValueTuple.end())
-    {
-        const CMICmnMIValueConst miValueConst("[]");
-        const CMICmnMIValueResult miValueResult("threads", miValueConst);
-        const CMICmnMIResultRecord miRecordResult(m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Done, miValueResult);
-        m_miResultRecord = miRecordResult;
-        return MIstatus::success;
+    const CMICmnMIValueConst miValueConst4(
+        MIRSRC(IDS_WORD_NOT_IMPLEMENTED_BRKTS));
+    const CMICmnMIValueResult miValueResult4("num_children", miValueConst4);
+    miTuple.Add(miValueResult4);
+
+    const CMICmnMIValueConst miValueConst5(
+        MIRSRC(IDS_WORD_NOT_IMPLEMENTED_BRKTS));
+    const CMICmnMIValueResult miValueResult5("cores", miValueConst5);
+    miTuple.Add(miValueResult5);
+
+    const CMICmnMIValueList miValueList(miTuple);
+    const CMICmnMIValueResult miValueResult6("groups", miValueList);
+    const CMICmnMIResultRecord miRecordResult(
+        m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Done,
+        miValueResult6);
+    m_miResultRecord = miRecordResult;
+
+    return MIstatus::success;
+  }
+
+  if (!m_bIsI1) {
+    const CMICmnMIValueConst miValueConst1("i1");
+    const CMICmnMIValueResult miValueResult1("id", miValueConst1);
+    CMICmnMIValueTuple miTuple(miValueResult1);
+
+    const CMICmnMIValueConst miValueConst2("process");
+    const CMICmnMIValueResult miValueResult2("type", miValueConst2);
+    miTuple.Add(miValueResult2);
+
+    CMICmnLLDBDebugSessionInfo &rSessionInfo(
+        CMICmnLLDBDebugSessionInfo::Instance());
+    if (rSessionInfo.GetProcess().IsValid()) {
+      const lldb::pid_t pid = rSessionInfo.GetProcess().GetProcessID();
+      const CMIUtilString strPid(CMIUtilString::Format("%lld", pid));
+      const CMICmnMIValueConst miValueConst3(strPid);
+      const CMICmnMIValueResult miValueResult3("pid", miValueConst3);
+      miTuple.Add(miValueResult3);
     }
-    CMICmnMIValueList miValueList(*it);
-    ++it;
-    while (it != m_vecMIValueTuple.end())
-    {
-        const CMICmnMIValueTuple &rTuple(*it);
-        miValueList.Add(rTuple);
 
-        // Next
-        ++it;
+    if (rSessionInfo.GetTarget().IsValid()) {
+      lldb::SBTarget sbTrgt = rSessionInfo.GetTarget();
+      const char *pDir = sbTrgt.GetExecutable().GetDirectory();
+      const char *pFileName = sbTrgt.GetExecutable().GetFilename();
+      const CMIUtilString strFile(
+          CMIUtilString::Format("%s/%s", pDir, pFileName));
+      const CMICmnMIValueConst miValueConst4(strFile);
+      const CMICmnMIValueResult miValueResult4("executable", miValueConst4);
+      miTuple.Add(miValueResult4);
     }
 
-    const CMICmnMIValueResult miValueResult("threads", miValueList);
-    const CMICmnMIResultRecord miRecordResult(m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Done, miValueResult);
+    const CMICmnMIValueList miValueList(miTuple);
+    const CMICmnMIValueResult miValueResult5("groups", miValueList);
+    const CMICmnMIResultRecord miRecordResult(
+        m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Done,
+        miValueResult5);
     m_miResultRecord = miRecordResult;
-
     return MIstatus::success;
+  }
+
+  // Build up a list of thread information from tuples
+  VecMIValueTuple_t::const_iterator it = m_vecMIValueTuple.begin();
+  if (it == m_vecMIValueTuple.end()) {
+    const CMICmnMIValueConst miValueConst("[]");
+    const CMICmnMIValueResult miValueResult("threads", miValueConst);
+    const CMICmnMIResultRecord miRecordResult(
+        m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Done,
+        miValueResult);
+    m_miResultRecord = miRecordResult;
+    return MIstatus::success;
+  }
+  CMICmnMIValueList miValueList(*it);
+  ++it;
+  while (it != m_vecMIValueTuple.end()) {
+    const CMICmnMIValueTuple &rTuple(*it);
+    miValueList.Add(rTuple);
+
+    // Next
+    ++it;
+  }
+
+  const CMICmnMIValueResult miValueResult("threads", miValueList);
+  const CMICmnMIResultRecord miRecordResult(
+      m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Done,
+      miValueResult);
+  m_miResultRecord = miRecordResult;
+
+  return MIstatus::success;
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: Required by the CMICmdFactory when registering *this command. The factory
+//++
+//------------------------------------------------------------------------------------
+// Details: Required by the CMICmdFactory when registering *this command. The
+// factory
 //          calls this function to create an instance of *this command.
 // Type:    Static method.
 // Args:    None.
 // Return:  CMICmdBase * - Pointer to a new command.
 // Throws:  None.
 //--
-CMICmdBase *
-CMICmdCmdListThreadGroups::CreateSelf()
-{
-    return new CMICmdCmdListThreadGroups();
+CMICmdBase *CMICmdCmdListThreadGroups::CreateSelf() {
+  return new CMICmdCmdListThreadGroups();
 }
 
 //---------------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------------
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmdCmdInterpreterExec constructor.
 // Type:    Method.
 // Args:    None.
@@ -397,29 +412,29 @@ CMICmdCmdListThreadGroups::CreateSelf()
 // Throws:  None.
 //--
 CMICmdCmdInterpreterExec::CMICmdCmdInterpreterExec()
-    : m_constStrArgNamedInterpreter("interpreter")
-    , m_constStrArgNamedCommand("command")
-{
-    // Command factory matches this name with that received from the stdin stream
-    m_strMiCmd = "interpreter-exec";
-
-    // Required by the CMICmdFactory when registering *this command
-    m_pSelfCreatorFn = &CMICmdCmdInterpreterExec::CreateSelf;
+    : m_constStrArgNamedInterpreter("interpreter"),
+      m_constStrArgNamedCommand("command") {
+  // Command factory matches this name with that received from the stdin stream
+  m_strMiCmd = "interpreter-exec";
+
+  // Required by the CMICmdFactory when registering *this command
+  m_pSelfCreatorFn = &CMICmdCmdInterpreterExec::CreateSelf;
 }
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmdCmdInterpreterExec destructor.
 // Type:    Overrideable.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--
-CMICmdCmdInterpreterExec::~CMICmdCmdInterpreterExec()
-{
-}
+CMICmdCmdInterpreterExec::~CMICmdCmdInterpreterExec() {}
 
-//++ ------------------------------------------------------------------------------------
-// Details: The invoker requires this function. The parses the command line options
+//++
+//------------------------------------------------------------------------------------
+// Details: The invoker requires this function. The parses the command line
+// options
 //          arguments to extract values for each of those arguments.
 // Type:    Overridden.
 // Args:    None.
@@ -427,45 +442,51 @@ CMICmdCmdInterpreterExec::~CMICmdCmdInterpreterExec()
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
-bool
-CMICmdCmdInterpreterExec::ParseArgs()
-{
-    m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgNamedInterpreter, true, true));
-    m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgNamedCommand, true, true, true));
-    return ParseValidateCmdOptions();
+bool CMICmdCmdInterpreterExec::ParseArgs() {
+  m_setCmdArgs.Add(
+      new CMICmdArgValString(m_constStrArgNamedInterpreter, true, true));
+  m_setCmdArgs.Add(
+      new CMICmdArgValString(m_constStrArgNamedCommand, true, true, true));
+  return ParseValidateCmdOptions();
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: The invoker requires this function. The command does work in this function.
-//          The command is likely to communicate with the LLDB SBDebugger in here.
+//++
+//------------------------------------------------------------------------------------
+// Details: The invoker requires this function. The command does work in this
+// function.
+//          The command is likely to communicate with the LLDB SBDebugger in
+//          here.
 // Type:    Overridden.
 // Args:    None.
 // Return:  MIstatus::success - Functional succeeded.
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
-bool
-CMICmdCmdInterpreterExec::Execute()
-{
-    CMICMDBASE_GETOPTION(pArgInterpreter, String, m_constStrArgNamedInterpreter);
-    CMICMDBASE_GETOPTION(pArgCommand, String, m_constStrArgNamedCommand);
-
-    // Handle the interpreter parameter by do nothing on purpose (set to 'handled' in
-    // the arg definition above)
-    const CMIUtilString &rStrInterpreter(pArgInterpreter->GetValue());
-    MIunused(rStrInterpreter);
-
-    const CMIUtilString &rStrCommand(pArgCommand->GetValue());
-    CMICmnLLDBDebugSessionInfo &rSessionInfo(CMICmnLLDBDebugSessionInfo::Instance());
-    const lldb::ReturnStatus rtn =
-        rSessionInfo.GetDebugger().GetCommandInterpreter().HandleCommand(rStrCommand.c_str(), m_lldbResult, true);
-    MIunused(rtn);
-
-    return MIstatus::success;
+bool CMICmdCmdInterpreterExec::Execute() {
+  CMICMDBASE_GETOPTION(pArgInterpreter, String, m_constStrArgNamedInterpreter);
+  CMICMDBASE_GETOPTION(pArgCommand, String, m_constStrArgNamedCommand);
+
+  // Handle the interpreter parameter by do nothing on purpose (set to 'handled'
+  // in
+  // the arg definition above)
+  const CMIUtilString &rStrInterpreter(pArgInterpreter->GetValue());
+  MIunused(rStrInterpreter);
+
+  const CMIUtilString &rStrCommand(pArgCommand->GetValue());
+  CMICmnLLDBDebugSessionInfo &rSessionInfo(
+      CMICmnLLDBDebugSessionInfo::Instance());
+  const lldb::ReturnStatus rtn =
+      rSessionInfo.GetDebugger().GetCommandInterpreter().HandleCommand(
+          rStrCommand.c_str(), m_lldbResult, true);
+  MIunused(rtn);
+
+  return MIstatus::success;
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: The invoker requires this function. The command prepares a MI Record Result
+//++
+//------------------------------------------------------------------------------------
+// Details: The invoker requires this function. The command prepares a MI Record
+// Result
 //          for the work carried out in the Execute().
 // Type:    Overridden.
 // Args:    None.
@@ -473,92 +494,91 @@ CMICmdCmdInterpreterExec::Execute()
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
-bool
-CMICmdCmdInterpreterExec::Acknowledge()
-{
-    if (m_lldbResult.GetOutputSize() > 0)
-    {
-        CMIUtilString strMsg(m_lldbResult.GetOutput());
-        strMsg = strMsg.StripCREndOfLine();
-        CMICmnStreamStdout::TextToStdout(strMsg);
-    }
-    if (m_lldbResult.GetErrorSize() > 0)
-    {
-        CMIUtilString strMsg(m_lldbResult.GetError());
-        strMsg = strMsg.StripCREndOfLine();
-        CMICmnStreamStderr::LLDBMsgToConsole(strMsg);
-    }
-
-    const CMICmnMIResultRecord miRecordResult(m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Done);
-    m_miResultRecord = miRecordResult;
-
-    return MIstatus::success;
+bool CMICmdCmdInterpreterExec::Acknowledge() {
+  if (m_lldbResult.GetOutputSize() > 0) {
+    CMIUtilString strMsg(m_lldbResult.GetOutput());
+    strMsg = strMsg.StripCREndOfLine();
+    CMICmnStreamStdout::TextToStdout(strMsg);
+  }
+  if (m_lldbResult.GetErrorSize() > 0) {
+    CMIUtilString strMsg(m_lldbResult.GetError());
+    strMsg = strMsg.StripCREndOfLine();
+    CMICmnStreamStderr::LLDBMsgToConsole(strMsg);
+  }
+
+  const CMICmnMIResultRecord miRecordResult(
+      m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Done);
+  m_miResultRecord = miRecordResult;
+
+  return MIstatus::success;
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: Required by the CMICmdFactory when registering *this command. The factory
+//++
+//------------------------------------------------------------------------------------
+// Details: Required by the CMICmdFactory when registering *this command. The
+// factory
 //          calls this function to create an instance of *this command.
 // Type:    Static method.
 // Args:    None.
 // Return:  CMICmdBase * - Pointer to a new command.
 // Throws:  None.
 //--
-CMICmdBase *
-CMICmdCmdInterpreterExec::CreateSelf()
-{
-    return new CMICmdCmdInterpreterExec();
+CMICmdBase *CMICmdCmdInterpreterExec::CreateSelf() {
+  return new CMICmdCmdInterpreterExec();
 }
 
 //---------------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------------
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmdCmdInferiorTtySet constructor.
 // Type:    Method.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--
-CMICmdCmdInferiorTtySet::CMICmdCmdInferiorTtySet()
-{
-    // Command factory matches this name with that received from the stdin stream
-    m_strMiCmd = "inferior-tty-set";
+CMICmdCmdInferiorTtySet::CMICmdCmdInferiorTtySet() {
+  // Command factory matches this name with that received from the stdin stream
+  m_strMiCmd = "inferior-tty-set";
 
-    // Required by the CMICmdFactory when registering *this command
-    m_pSelfCreatorFn = &CMICmdCmdInferiorTtySet::CreateSelf;
+  // Required by the CMICmdFactory when registering *this command
+  m_pSelfCreatorFn = &CMICmdCmdInferiorTtySet::CreateSelf;
 }
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmdCmdInferiorTtySet destructor.
 // Type:    Overrideable.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--
-CMICmdCmdInferiorTtySet::~CMICmdCmdInferiorTtySet()
-{
-}
-
-//++ ------------------------------------------------------------------------------------
-// Details: The invoker requires this function. The command does work in this function.
-//          The command is likely to communicate with the LLDB SBDebugger in here.
+CMICmdCmdInferiorTtySet::~CMICmdCmdInferiorTtySet() {}
+
+//++
+//------------------------------------------------------------------------------------
+// Details: The invoker requires this function. The command does work in this
+// function.
+//          The command is likely to communicate with the LLDB SBDebugger in
+//          here.
 // Type:    Overridden.
 // Args:    None.
 // Return:  MIstatus::success - Functional succeeded.
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
-bool
-CMICmdCmdInferiorTtySet::Execute()
-{
-    // Do nothing
+bool CMICmdCmdInferiorTtySet::Execute() {
+  // Do nothing
 
-    return MIstatus::success;
+  return MIstatus::success;
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: The invoker requires this function. The command prepares a MI Record Result
+//++
+//------------------------------------------------------------------------------------
+// Details: The invoker requires this function. The command prepares a MI Record
+// Result
 //          for the work carried out in the Execute().
 // Type:    Overridden.
 // Args:    None.
@@ -566,25 +586,24 @@ CMICmdCmdInferiorTtySet::Execute()
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
-bool
-CMICmdCmdInferiorTtySet::Acknowledge()
-{
-    const CMICmnMIResultRecord miRecordResult(m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Error);
-    m_miResultRecord = miRecordResult;
+bool CMICmdCmdInferiorTtySet::Acknowledge() {
+  const CMICmnMIResultRecord miRecordResult(
+      m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Error);
+  m_miResultRecord = miRecordResult;
 
-    return MIstatus::success;
+  return MIstatus::success;
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: Required by the CMICmdFactory when registering *this command. The factory
+//++
+//------------------------------------------------------------------------------------
+// Details: Required by the CMICmdFactory when registering *this command. The
+// factory
 //          calls this function to create an instance of *this command.
 // Type:    Static method.
 // Args:    None.
 // Return:  CMICmdBase * - Pointer to a new command.
 // Throws:  None.
 //--
-CMICmdBase *
-CMICmdCmdInferiorTtySet::CreateSelf()
-{
-    return new CMICmdCmdInferiorTtySet();
+CMICmdBase *CMICmdCmdInferiorTtySet::CreateSelf() {
+  return new CMICmdCmdInferiorTtySet();
 }