*** 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, 136 insertions, 134 deletions

diff --git a/lldb/tools/debugserver/source/RNBContext.h b/lldb/tools/debugserver/source/RNBContext.h
index 83237eb..6fe7a29 100644
--- a/lldb/tools/debugserver/source/RNBContext.h
+++ b/lldb/tools/debugserver/source/RNBContext.h
@@ -14,148 +14,150 @@
 #ifndef __RNBContext_h__
 #define __RNBContext_h__
 
-#include "RNBDefs.h"
 #include "DNBError.h"
 #include "PThreadEvent.h"
-#include <vector>
+#include "RNBDefs.h"
 #include <string>
+#include <vector>
 
-class RNBContext
-{
+class RNBContext {
 public:
-    enum
-    {
-        event_proc_state_changed         = 0x001,
-        event_proc_thread_running        = 0x002, // Sticky
-        event_proc_thread_exiting        = 0x004,
-        event_proc_stdio_available       = 0x008,
-        event_proc_profile_data          = 0x010,
-        event_read_packet_available      = 0x020,
-        event_read_thread_running        = 0x040, // Sticky
-        event_read_thread_exiting        = 0x080,
-        event_darwin_log_data_available  = 0x100,
-
-        normal_event_bits   = event_proc_state_changed |
-                              event_proc_thread_exiting |
-                              event_proc_stdio_available |
-                              event_proc_profile_data | 
-                              event_read_packet_available |
-                              event_read_thread_exiting |
-                              event_darwin_log_data_available,
-
-        sticky_event_bits   = event_proc_thread_running |
-                              event_read_thread_running,
-
-
-        all_event_bits      = sticky_event_bits | normal_event_bits
-    } event_t;
-    //------------------------------------------------------------------
-    // Constructors and Destructors
-    //------------------------------------------------------------------
-    RNBContext () :
-        m_pid(INVALID_NUB_PROCESS),
-        m_pid_stop_count(0),
-        m_events(0, all_event_bits),
-        m_pid_pthread(),
-        m_launch_status(),
-        m_arg_vec (),
-        m_env_vec (),
-        m_detach_on_error(false)
-    {
-    }
-
-    virtual ~RNBContext();
-
-
-    nub_process_t   ProcessID() const { return m_pid; }
-    bool            HasValidProcessID() const { return m_pid != INVALID_NUB_PROCESS; }
-    void            SetProcessID (nub_process_t pid);
-    nub_size_t      GetProcessStopCount () const { return m_pid_stop_count; }
-    bool            SetProcessStopCount (nub_size_t count)
-                    {
-                        // Returns true if this class' notion of the PID state changed
-                        if (m_pid_stop_count == count)
-                            return false;   // Didn't change
-                        m_pid_stop_count = count;
-                        return true; // The stop count has changed.
-                    }
-
-    bool            ProcessStateRunning() const;
-    PThreadEvent&   Events( ) { return m_events; }
-    nub_event_t     AllEventBits() const { return all_event_bits; }
-    nub_event_t     NormalEventBits() const { return normal_event_bits; }
-    nub_event_t     StickyEventBits() const { return sticky_event_bits; }
-    const char*     EventsAsString (nub_event_t events, std::string& s);
-
-    size_t          ArgumentCount () const { return m_arg_vec.size(); }
-    const char *    ArgumentAtIndex (size_t index);
-    void            PushArgument (const char *arg) { if (arg) m_arg_vec.push_back (arg); }
-    void            ClearArgv () { m_arg_vec.erase (m_arg_vec.begin(), m_arg_vec.end()); }
-
-    size_t          EnvironmentCount () const { return m_env_vec.size(); }
-    const char *    EnvironmentAtIndex (size_t index);
-    void            PushEnvironment (const char *arg) { if (arg) m_env_vec.push_back (arg); }
-    void            ClearEnvironment () { m_env_vec.erase (m_env_vec.begin(), m_env_vec.end()); }
-    DNBError&       LaunchStatus () { return m_launch_status; }
-    const char *    LaunchStatusAsString (std::string& s);
-    nub_launch_flavor_t LaunchFlavor () const { return m_launch_flavor; }
-    void            SetLaunchFlavor (nub_launch_flavor_t flavor) { m_launch_flavor = flavor; }
-    
-    const char *    GetWorkingDirectory () const 
-                    { 
-                        if (!m_working_directory.empty())
-                            return m_working_directory.c_str();
-                        return NULL;
-                    }
-
-    bool            SetWorkingDirectory (const char *path);
-
-    std::string&    GetSTDIN  () { return m_stdin; }
-    std::string&    GetSTDOUT () { return m_stdout; }
-    std::string&    GetSTDERR () { return m_stderr; }
-    std::string&    GetWorkingDir () { return m_working_dir; }
-
-    const char *    GetSTDINPath() { return m_stdin.empty() ? NULL : m_stdin.c_str(); }
-    const char *    GetSTDOUTPath() { return m_stdout.empty() ? NULL : m_stdout.c_str(); }
-    const char *    GetSTDERRPath() { return m_stderr.empty() ? NULL : m_stderr.c_str(); }
-    const char *    GetWorkingDirPath() { return m_working_dir.empty() ? NULL : m_working_dir.c_str(); }
-
-    void            PushProcessEvent (const char *p) { m_process_event.assign(p); }
-    const char *    GetProcessEvent () { return m_process_event.c_str(); }
-    
-    void            SetDetachOnError(bool detach) { m_detach_on_error = detach; }
-    bool            GetDetachOnError () { return m_detach_on_error; }
-    
+  enum {
+    event_proc_state_changed = 0x001,
+    event_proc_thread_running = 0x002, // Sticky
+    event_proc_thread_exiting = 0x004,
+    event_proc_stdio_available = 0x008,
+    event_proc_profile_data = 0x010,
+    event_read_packet_available = 0x020,
+    event_read_thread_running = 0x040, // Sticky
+    event_read_thread_exiting = 0x080,
+    event_darwin_log_data_available = 0x100,
+
+    normal_event_bits = event_proc_state_changed | event_proc_thread_exiting |
+                        event_proc_stdio_available | event_proc_profile_data |
+                        event_read_packet_available |
+                        event_read_thread_exiting |
+                        event_darwin_log_data_available,
+
+    sticky_event_bits = event_proc_thread_running | event_read_thread_running,
+
+    all_event_bits = sticky_event_bits | normal_event_bits
+  } event_t;
+  //------------------------------------------------------------------
+  // Constructors and Destructors
+  //------------------------------------------------------------------
+  RNBContext()
+      : m_pid(INVALID_NUB_PROCESS), m_pid_stop_count(0),
+        m_events(0, all_event_bits), m_pid_pthread(), m_launch_status(),
+        m_arg_vec(), m_env_vec(), m_detach_on_error(false) {}
+
+  virtual ~RNBContext();
+
+  nub_process_t ProcessID() const { return m_pid; }
+  bool HasValidProcessID() const { return m_pid != INVALID_NUB_PROCESS; }
+  void SetProcessID(nub_process_t pid);
+  nub_size_t GetProcessStopCount() const { return m_pid_stop_count; }
+  bool SetProcessStopCount(nub_size_t count) {
+    // Returns true if this class' notion of the PID state changed
+    if (m_pid_stop_count == count)
+      return false; // Didn't change
+    m_pid_stop_count = count;
+    return true; // The stop count has changed.
+  }
+
+  bool ProcessStateRunning() const;
+  PThreadEvent &Events() { return m_events; }
+  nub_event_t AllEventBits() const { return all_event_bits; }
+  nub_event_t NormalEventBits() const { return normal_event_bits; }
+  nub_event_t StickyEventBits() const { return sticky_event_bits; }
+  const char *EventsAsString(nub_event_t events, std::string &s);
+
+  size_t ArgumentCount() const { return m_arg_vec.size(); }
+  const char *ArgumentAtIndex(size_t index);
+  void PushArgument(const char *arg) {
+    if (arg)
+      m_arg_vec.push_back(arg);
+  }
+  void ClearArgv() { m_arg_vec.erase(m_arg_vec.begin(), m_arg_vec.end()); }
+
+  size_t EnvironmentCount() const { return m_env_vec.size(); }
+  const char *EnvironmentAtIndex(size_t index);
+  void PushEnvironment(const char *arg) {
+    if (arg)
+      m_env_vec.push_back(arg);
+  }
+  void ClearEnvironment() {
+    m_env_vec.erase(m_env_vec.begin(), m_env_vec.end());
+  }
+  DNBError &LaunchStatus() { return m_launch_status; }
+  const char *LaunchStatusAsString(std::string &s);
+  nub_launch_flavor_t LaunchFlavor() const { return m_launch_flavor; }
+  void SetLaunchFlavor(nub_launch_flavor_t flavor) { m_launch_flavor = flavor; }
+
+  const char *GetWorkingDirectory() const {
+    if (!m_working_directory.empty())
+      return m_working_directory.c_str();
+    return NULL;
+  }
+
+  bool SetWorkingDirectory(const char *path);
+
+  std::string &GetSTDIN() { return m_stdin; }
+  std::string &GetSTDOUT() { return m_stdout; }
+  std::string &GetSTDERR() { return m_stderr; }
+  std::string &GetWorkingDir() { return m_working_dir; }
+
+  const char *GetSTDINPath() {
+    return m_stdin.empty() ? NULL : m_stdin.c_str();
+  }
+  const char *GetSTDOUTPath() {
+    return m_stdout.empty() ? NULL : m_stdout.c_str();
+  }
+  const char *GetSTDERRPath() {
+    return m_stderr.empty() ? NULL : m_stderr.c_str();
+  }
+  const char *GetWorkingDirPath() {
+    return m_working_dir.empty() ? NULL : m_working_dir.c_str();
+  }
+
+  void PushProcessEvent(const char *p) { m_process_event.assign(p); }
+  const char *GetProcessEvent() { return m_process_event.c_str(); }
+
+  void SetDetachOnError(bool detach) { m_detach_on_error = detach; }
+  bool GetDetachOnError() { return m_detach_on_error; }
+
 protected:
-    //------------------------------------------------------------------
-    // Classes that inherit from RNBContext can see and modify these
-    //------------------------------------------------------------------
-    nub_process_t   m_pid;
-    std::string     m_stdin;
-    std::string     m_stdout;
-    std::string     m_stderr;
-    std::string     m_working_dir;
-    nub_size_t      m_pid_stop_count;
-    PThreadEvent    m_events;       // Threaded events that we can wait for
-    pthread_t       m_pid_pthread;
-    nub_launch_flavor_t m_launch_flavor;    // How to launch our inferior process
-    DNBError        m_launch_status;    // This holds the status from the last launch attempt.
-    std::vector<std::string> m_arg_vec;
-    std::vector<std::string> m_env_vec; // This will be unparsed - entries FOO=value
-    std::string     m_working_directory;
-    std::string     m_process_event;
-    bool            m_detach_on_error;
-
-    void    StartProcessStatusThread();
-    void    StopProcessStatusThread();
-    static void* ThreadFunctionProcessStatus(void *arg);
+  //------------------------------------------------------------------
+  // Classes that inherit from RNBContext can see and modify these
+  //------------------------------------------------------------------
+  nub_process_t m_pid;
+  std::string m_stdin;
+  std::string m_stdout;
+  std::string m_stderr;
+  std::string m_working_dir;
+  nub_size_t m_pid_stop_count;
+  PThreadEvent m_events; // Threaded events that we can wait for
+  pthread_t m_pid_pthread;
+  nub_launch_flavor_t m_launch_flavor; // How to launch our inferior process
+  DNBError
+      m_launch_status; // This holds the status from the last launch attempt.
+  std::vector<std::string> m_arg_vec;
+  std::vector<std::string>
+      m_env_vec; // This will be unparsed - entries FOO=value
+  std::string m_working_directory;
+  std::string m_process_event;
+  bool m_detach_on_error;
+
+  void StartProcessStatusThread();
+  void StopProcessStatusThread();
+  static void *ThreadFunctionProcessStatus(void *arg);
 
 private:
-    //------------------------------------------------------------------
-    // Outlaw copy and assignment operators
-    //------------------------------------------------------------------
-    RNBContext(const RNBContext& rhs);
-    RNBContext& operator=(const RNBContext& rhs);
+  //------------------------------------------------------------------
+  // Outlaw copy and assignment operators
+  //------------------------------------------------------------------
+  RNBContext(const RNBContext &rhs);
+  RNBContext &operator=(const RNBContext &rhs);
 };
 
 #endif // #ifndef __RNBContext_h__