aboutsummaryrefslogtreecommitdiff
path: root/lldb/source/API/SBCommunication.cpp
diff options
context:
space:
mode:
authorKate Stone <katherine.stone@apple.com>2016-09-06 20:57:50 +0000
committerKate Stone <katherine.stone@apple.com>2016-09-06 20:57:50 +0000
commitb9c1b51e45b845debb76d8658edabca70ca56079 (patch)
treedfcb5a13ef2b014202340f47036da383eaee74aa /lldb/source/API/SBCommunication.cpp
parentd5aa73376966339caad04013510626ec2e42c760 (diff)
downloadllvm-b9c1b51e45b845debb76d8658edabca70ca56079.zip
llvm-b9c1b51e45b845debb76d8658edabca70ca56079.tar.gz
llvm-b9c1b51e45b845debb76d8658edabca70ca56079.tar.bz2
*** 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
Diffstat (limited to 'lldb/source/API/SBCommunication.cpp')
-rw-r--r--lldb/source/API/SBCommunication.cpp370
1 files changed, 163 insertions, 207 deletions
diff --git a/lldb/source/API/SBCommunication.cpp b/lldb/source/API/SBCommunication.cpp
index 956b6cf..f80b114 100644
--- a/lldb/source/API/SBCommunication.cpp
+++ b/lldb/source/API/SBCommunication.cpp
@@ -16,270 +16,226 @@
using namespace lldb;
using namespace lldb_private;
+SBCommunication::SBCommunication() : m_opaque(NULL), m_opaque_owned(false) {}
+SBCommunication::SBCommunication(const char *broadcaster_name)
+ : m_opaque(new Communication(broadcaster_name)), m_opaque_owned(true) {
+ Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
-SBCommunication::SBCommunication() :
- m_opaque (NULL),
- m_opaque_owned (false)
-{
+ if (log)
+ log->Printf("SBCommunication::SBCommunication (broadcaster_name=\"%s\") => "
+ "SBCommunication(%p)",
+ broadcaster_name, static_cast<void *>(m_opaque));
}
-SBCommunication::SBCommunication(const char * broadcaster_name) :
- m_opaque (new Communication (broadcaster_name)),
- m_opaque_owned (true)
-{
- Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-
- if (log)
- log->Printf ("SBCommunication::SBCommunication (broadcaster_name=\"%s\") => "
- "SBCommunication(%p)", broadcaster_name,
- static_cast<void*>(m_opaque));
+SBCommunication::~SBCommunication() {
+ if (m_opaque && m_opaque_owned)
+ delete m_opaque;
+ m_opaque = NULL;
+ m_opaque_owned = false;
}
-SBCommunication::~SBCommunication()
-{
- if (m_opaque && m_opaque_owned)
- delete m_opaque;
- m_opaque = NULL;
- m_opaque_owned = false;
-}
+bool SBCommunication::IsValid() const { return m_opaque != NULL; }
-bool
-SBCommunication::IsValid () const
-{
- return m_opaque != NULL;
+bool SBCommunication::GetCloseOnEOF() {
+ if (m_opaque)
+ return m_opaque->GetCloseOnEOF();
+ return false;
}
-bool
-SBCommunication::GetCloseOnEOF ()
-{
- if (m_opaque)
- return m_opaque->GetCloseOnEOF ();
- return false;
+void SBCommunication::SetCloseOnEOF(bool b) {
+ if (m_opaque)
+ m_opaque->SetCloseOnEOF(b);
}
-void
-SBCommunication::SetCloseOnEOF (bool b)
-{
- if (m_opaque)
- m_opaque->SetCloseOnEOF (b);
+ConnectionStatus SBCommunication::Connect(const char *url) {
+ if (m_opaque) {
+ if (!m_opaque->HasConnection())
+ m_opaque->SetConnection(Connection::CreateDefaultConnection(url));
+ return m_opaque->Connect(url, NULL);
+ }
+ return eConnectionStatusNoConnection;
}
-ConnectionStatus
-SBCommunication::Connect (const char *url)
-{
- if (m_opaque)
- {
- if (!m_opaque->HasConnection ())
- m_opaque->SetConnection(Connection::CreateDefaultConnection(url));
- return m_opaque->Connect (url, NULL);
- }
- return eConnectionStatusNoConnection;
-}
+ConnectionStatus SBCommunication::AdoptFileDesriptor(int fd, bool owns_fd) {
+ Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
-ConnectionStatus
-SBCommunication::AdoptFileDesriptor (int fd, bool owns_fd)
-{
- Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-
- ConnectionStatus status = eConnectionStatusNoConnection;
- if (m_opaque)
- {
- if (m_opaque->HasConnection ())
- {
- if (m_opaque->IsConnected())
- m_opaque->Disconnect();
- }
- m_opaque->SetConnection (new ConnectionFileDescriptor (fd, owns_fd));
- if (m_opaque->IsConnected())
- status = eConnectionStatusSuccess;
- else
- status = eConnectionStatusLostConnection;
+ ConnectionStatus status = eConnectionStatusNoConnection;
+ if (m_opaque) {
+ if (m_opaque->HasConnection()) {
+ if (m_opaque->IsConnected())
+ m_opaque->Disconnect();
}
+ m_opaque->SetConnection(new ConnectionFileDescriptor(fd, owns_fd));
+ if (m_opaque->IsConnected())
+ status = eConnectionStatusSuccess;
+ else
+ status = eConnectionStatusLostConnection;
+ }
- if (log)
- log->Printf ("SBCommunication(%p)::AdoptFileDescriptor (fd=%d, ownd_fd=%i) => %s",
- static_cast<void*>(m_opaque), fd, owns_fd,
- Communication::ConnectionStatusAsCString (status));
+ if (log)
+ log->Printf(
+ "SBCommunication(%p)::AdoptFileDescriptor (fd=%d, ownd_fd=%i) => %s",
+ static_cast<void *>(m_opaque), fd, owns_fd,
+ Communication::ConnectionStatusAsCString(status));
- return status;
+ return status;
}
+ConnectionStatus SBCommunication::Disconnect() {
+ Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
-ConnectionStatus
-SBCommunication::Disconnect ()
-{
- Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-
- ConnectionStatus status= eConnectionStatusNoConnection;
- if (m_opaque)
- status = m_opaque->Disconnect ();
-
- if (log)
- log->Printf ("SBCommunication(%p)::Disconnect () => %s",
- static_cast<void*>(m_opaque),
- Communication::ConnectionStatusAsCString (status));
+ ConnectionStatus status = eConnectionStatusNoConnection;
+ if (m_opaque)
+ status = m_opaque->Disconnect();
- return status;
+ if (log)
+ log->Printf("SBCommunication(%p)::Disconnect () => %s",
+ static_cast<void *>(m_opaque),
+ Communication::ConnectionStatusAsCString(status));
+
+ return status;
}
-bool
-SBCommunication::IsConnected () const
-{
- Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
- bool result = false;
- if (m_opaque)
- result = m_opaque->IsConnected ();
+bool SBCommunication::IsConnected() const {
+ Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
+ bool result = false;
+ if (m_opaque)
+ result = m_opaque->IsConnected();
- if (log)
- log->Printf ("SBCommunication(%p)::IsConnected () => %i",
- static_cast<void*>(m_opaque), result);
+ if (log)
+ log->Printf("SBCommunication(%p)::IsConnected () => %i",
+ static_cast<void *>(m_opaque), result);
- return false;
+ return false;
}
-size_t
-SBCommunication::Read (void *dst, size_t dst_len, uint32_t timeout_usec, ConnectionStatus &status)
-{
- Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
- if (log)
- log->Printf ("SBCommunication(%p)::Read (dst=%p, dst_len=%" PRIu64 ", timeout_usec=%u, &status)...",
- static_cast<void*>(m_opaque), static_cast<void*>(dst),
- static_cast<uint64_t>(dst_len), timeout_usec);
- size_t bytes_read = 0;
- if (m_opaque)
- bytes_read = m_opaque->Read (dst, dst_len, timeout_usec, status, NULL);
- else
- status = eConnectionStatusNoConnection;
-
- if (log)
- log->Printf ("SBCommunication(%p)::Read (dst=%p, dst_len=%" PRIu64 ", timeout_usec=%u, &status=%s) => %" PRIu64,
- static_cast<void*>(m_opaque), static_cast<void*>(dst),
- static_cast<uint64_t>(dst_len), timeout_usec,
- Communication::ConnectionStatusAsCString (status),
- static_cast<uint64_t>(bytes_read));
- return bytes_read;
+size_t SBCommunication::Read(void *dst, size_t dst_len, uint32_t timeout_usec,
+ ConnectionStatus &status) {
+ Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
+ if (log)
+ log->Printf("SBCommunication(%p)::Read (dst=%p, dst_len=%" PRIu64
+ ", timeout_usec=%u, &status)...",
+ static_cast<void *>(m_opaque), static_cast<void *>(dst),
+ static_cast<uint64_t>(dst_len), timeout_usec);
+ size_t bytes_read = 0;
+ if (m_opaque)
+ bytes_read = m_opaque->Read(dst, dst_len, timeout_usec, status, NULL);
+ else
+ status = eConnectionStatusNoConnection;
+
+ if (log)
+ log->Printf("SBCommunication(%p)::Read (dst=%p, dst_len=%" PRIu64
+ ", timeout_usec=%u, &status=%s) => %" PRIu64,
+ static_cast<void *>(m_opaque), static_cast<void *>(dst),
+ static_cast<uint64_t>(dst_len), timeout_usec,
+ Communication::ConnectionStatusAsCString(status),
+ static_cast<uint64_t>(bytes_read));
+ return bytes_read;
}
+size_t SBCommunication::Write(const void *src, size_t src_len,
+ ConnectionStatus &status) {
+ size_t bytes_written = 0;
+ if (m_opaque)
+ bytes_written = m_opaque->Write(src, src_len, status, NULL);
+ else
+ status = eConnectionStatusNoConnection;
-size_t
-SBCommunication::Write (const void *src, size_t src_len, ConnectionStatus &status)
-{
- size_t bytes_written = 0;
- if (m_opaque)
- bytes_written = m_opaque->Write (src, src_len, status, NULL);
- else
- status = eConnectionStatusNoConnection;
-
- Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
- if (log)
- log->Printf ("SBCommunication(%p)::Write (src=%p, src_len=%" PRIu64 ", &status=%s) => %" PRIu64,
- static_cast<void*>(m_opaque), static_cast<const void*>(src),
- static_cast<uint64_t>(src_len),
- Communication::ConnectionStatusAsCString (status),
- static_cast<uint64_t>(bytes_written));
+ Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
+ if (log)
+ log->Printf("SBCommunication(%p)::Write (src=%p, src_len=%" PRIu64
+ ", &status=%s) => %" PRIu64,
+ static_cast<void *>(m_opaque), static_cast<const void *>(src),
+ static_cast<uint64_t>(src_len),
+ Communication::ConnectionStatusAsCString(status),
+ static_cast<uint64_t>(bytes_written));
- return 0;
+ return 0;
}
-bool
-SBCommunication::ReadThreadStart ()
-{
- Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+bool SBCommunication::ReadThreadStart() {
+ Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
- bool success = false;
- if (m_opaque)
- success = m_opaque->StartReadThread ();
+ bool success = false;
+ if (m_opaque)
+ success = m_opaque->StartReadThread();
- if (log)
- log->Printf ("SBCommunication(%p)::ReadThreadStart () => %i",
- static_cast<void*>(m_opaque), success);
+ if (log)
+ log->Printf("SBCommunication(%p)::ReadThreadStart () => %i",
+ static_cast<void *>(m_opaque), success);
- return success;
+ return success;
}
+bool SBCommunication::ReadThreadStop() {
+ Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
+ if (log)
+ log->Printf("SBCommunication(%p)::ReadThreadStop ()...",
+ static_cast<void *>(m_opaque));
-bool
-SBCommunication::ReadThreadStop ()
-{
- Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
- if (log)
- log->Printf ("SBCommunication(%p)::ReadThreadStop ()...",
- static_cast<void*>(m_opaque));
+ bool success = false;
+ if (m_opaque)
+ success = m_opaque->StopReadThread();
- bool success = false;
- if (m_opaque)
- success = m_opaque->StopReadThread ();
+ if (log)
+ log->Printf("SBCommunication(%p)::ReadThreadStop () => %i",
+ static_cast<void *>(m_opaque), success);
- if (log)
- log->Printf ("SBCommunication(%p)::ReadThreadStop () => %i",
- static_cast<void*>(m_opaque), success);
-
- return success;
+ return success;
}
-bool
-SBCommunication::ReadThreadIsRunning ()
-{
- bool result = false;
- if (m_opaque)
- result = m_opaque->ReadThreadIsRunning ();
- Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
- if (log)
- log->Printf ("SBCommunication(%p)::ReadThreadIsRunning () => %i",
- static_cast<void*>(m_opaque), result);
- return result;
+bool SBCommunication::ReadThreadIsRunning() {
+ bool result = false;
+ if (m_opaque)
+ result = m_opaque->ReadThreadIsRunning();
+ Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
+ if (log)
+ log->Printf("SBCommunication(%p)::ReadThreadIsRunning () => %i",
+ static_cast<void *>(m_opaque), result);
+ return result;
}
-bool
-SBCommunication::SetReadThreadBytesReceivedCallback
-(
- ReadThreadBytesReceived callback,
- void *callback_baton
-)
-{
- Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-
- bool result = false;
- if (m_opaque)
- {
- m_opaque->SetReadThreadBytesReceivedCallback (callback, callback_baton);
- result = true;
- }
+bool SBCommunication::SetReadThreadBytesReceivedCallback(
+ ReadThreadBytesReceived callback, void *callback_baton) {
+ Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
+
+ bool result = false;
+ if (m_opaque) {
+ m_opaque->SetReadThreadBytesReceivedCallback(callback, callback_baton);
+ result = true;
+ }
- if (log)
- log->Printf ("SBCommunication(%p)::SetReadThreadBytesReceivedCallback (callback=%p, baton=%p) => %i",
- static_cast<void*>(m_opaque),
- reinterpret_cast<void*>(reinterpret_cast<intptr_t>(callback)),
- static_cast<void*>(callback_baton), result);
+ if (log)
+ log->Printf("SBCommunication(%p)::SetReadThreadBytesReceivedCallback "
+ "(callback=%p, baton=%p) => %i",
+ static_cast<void *>(m_opaque),
+ reinterpret_cast<void *>(reinterpret_cast<intptr_t>(callback)),
+ static_cast<void *>(callback_baton), result);
- return result;
+ return result;
}
-SBBroadcaster
-SBCommunication::GetBroadcaster ()
-{
- SBBroadcaster broadcaster (m_opaque, false);
+SBBroadcaster SBCommunication::GetBroadcaster() {
+ SBBroadcaster broadcaster(m_opaque, false);
- Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+ Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
- if (log)
- log->Printf ("SBCommunication(%p)::GetBroadcaster () => SBBroadcaster (%p)",
- static_cast<void*>(m_opaque),
- static_cast<void*>(broadcaster.get()));
+ if (log)
+ log->Printf("SBCommunication(%p)::GetBroadcaster () => SBBroadcaster (%p)",
+ static_cast<void *>(m_opaque),
+ static_cast<void *>(broadcaster.get()));
- return broadcaster;
+ return broadcaster;
}
-const char *
-SBCommunication::GetBroadcasterClass ()
-{
- return Communication::GetStaticBroadcasterClass().AsCString();
+const char *SBCommunication::GetBroadcasterClass() {
+ return Communication::GetStaticBroadcasterClass().AsCString();
}
//
-//void
-//SBCommunication::CreateIfNeeded ()
+// void
+// SBCommunication::CreateIfNeeded ()
//{
// if (m_opaque == NULL)
// {