diff options
| author | Greg Clayton <gclayton@apple.com> | 2012-01-27 18:57:04 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2012-01-27 18:57:04 +0000 |
| commit | 9620f466af1470d57411bf83dc82a7c1b5a22465 (patch) | |
| tree | db6e6821d2d2f988235acc27a25c10fdad03b2a6 /lldb/source/Core/ConnectionFileDescriptor.cpp | |
| parent | f8f0fd765e4859bd8cf6eb4e7d6e187942610b18 (diff) | |
| download | bcm5719-llvm-9620f466af1470d57411bf83dc82a7c1b5a22465.tar.gz bcm5719-llvm-9620f466af1470d57411bf83dc82a7c1b5a22465.zip | |
Disable the ConnectionFileDescriptor mutex for now as it is deadlocking our
test suite and I need to investigate this.
llvm-svn: 149141
Diffstat (limited to 'lldb/source/Core/ConnectionFileDescriptor.cpp')
| -rw-r--r-- | lldb/source/Core/ConnectionFileDescriptor.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lldb/source/Core/ConnectionFileDescriptor.cpp b/lldb/source/Core/ConnectionFileDescriptor.cpp index b349a410b3e..28f72d57792 100644 --- a/lldb/source/Core/ConnectionFileDescriptor.cpp +++ b/lldb/source/Core/ConnectionFileDescriptor.cpp @@ -73,8 +73,8 @@ ConnectionFileDescriptor::ConnectionFileDescriptor () : m_fd_recv_type (eFDTypeFile), m_udp_send_sockaddr (), m_should_close_fd (false), - m_socket_timeout_usec(0), - m_mutex (Mutex::eMutexTypeRecursive) + m_socket_timeout_usec(0)//, + //m_mutex (Mutex::eMutexTypeRecursive) { LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION | LIBLLDB_LOG_OBJECT)); if (log) @@ -114,7 +114,7 @@ ConnectionFileDescriptor::IsConnected () const ConnectionStatus ConnectionFileDescriptor::Connect (const char *s, Error *error_ptr) { - Mutex::Locker locker (m_mutex); + //Mutex::Locker locker (m_mutex); LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); if (log) log->Printf ("%p ConnectionFileDescriptor::Connect (url = '%s')", this, s); @@ -234,7 +234,6 @@ ConnectionFileDescriptor::Connect (const char *s, Error *error_ptr) ConnectionStatus ConnectionFileDescriptor::Disconnect (Error *error_ptr) { - Mutex::Locker locker (m_mutex); LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); if (log) log->Printf ("%p ConnectionFileDescriptor::Disconnect ()", this); @@ -389,7 +388,7 @@ ConnectionFileDescriptor::Read (void *dst, return 0; } - Disconnect (NULL); + //Disconnect (NULL); return 0; } return bytes_read; @@ -508,7 +507,7 @@ ConnectionFileDescriptor::Write (const void *src, size_t src_len, ConnectionStat break; // Break to close.... } - Disconnect (NULL); + //Disconnect (NULL); return 0; } @@ -602,7 +601,7 @@ ConnectionFileDescriptor::BytesAvailable (uint32_t timeout_usec, Error *error_pt ConnectionStatus ConnectionFileDescriptor::Close (int& fd, Error *error_ptr) { - Mutex::Locker locker (m_mutex); + //Mutex::Locker locker (m_mutex); if (error_ptr) error_ptr->Clear(); bool success = true; |
