[Lldb-commits] [lldb] r149141 - in /lldb/trunk: include/lldb/Core/ConnectionFileDescriptor.h source/Core/ConnectionFileDescriptor.cpp

[Greg Clayton]

Author: gclayton
Date: Fri Jan 27 12:57:04 2012
New Revision: 149141

URL: http://llvm.org/viewvc/llvm-project?rev=149141&view=rev
Log:
Disable the ConnectionFileDescriptor mutex for now as it is deadlocking our
test suite and I need to investigate this.


Modified:
    lldb/trunk/include/lldb/Core/ConnectionFileDescriptor.h
    lldb/trunk/source/Core/ConnectionFileDescriptor.cpp

Modified: lldb/trunk/include/lldb/Core/ConnectionFileDescriptor.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ConnectionFileDescriptor.h?rev=149141&r1=149140&r2=149141&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ConnectionFileDescriptor.h (original)
+++ lldb/trunk/include/lldb/Core/ConnectionFileDescriptor.h Fri Jan 27 12:57:04 2012
@@ -105,7 +105,7 @@
     SocketAddress m_udp_send_sockaddr;
     bool m_should_close_fd; // True if this class should close the file descriptor when it goes away.
     uint32_t m_socket_timeout_usec;
-    Mutex m_mutex;
+    //Mutex m_mutex;
     
     static in_port_t
     GetSocketPort (int fd);

Modified: lldb/trunk/source/Core/ConnectionFileDescriptor.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ConnectionFileDescriptor.cpp?rev=149141&r1=149140&r2=149141&view=diff
==============================================================================
--- lldb/trunk/source/Core/ConnectionFileDescriptor.cpp (original)
+++ lldb/trunk/source/Core/ConnectionFileDescriptor.cpp Fri Jan 27 12:57:04 2012
@@ -73,8 +73,8 @@
     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 @@
 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 @@
 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 @@
             return 0;
         }
 
-        Disconnect (NULL);
+        //Disconnect (NULL);
         return 0;
     }
     return bytes_read;
@@ -508,7 +507,7 @@
             break;  // Break to close....
         }
 
-        Disconnect (NULL);
+        //Disconnect (NULL);
         return 0;
     }
 
@@ -602,7 +601,7 @@
 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;