[Lldb-commits] [lldb] r134359 - in /lldb/trunk: include/lldb/Core/ConnectionFileDescriptor.h source/Core/ConnectionFileDescriptor.cpp source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
Greg Clayton
gclayton at apple.com
Sat Jul 2 16:21:07 PDT 2011
Author: gclayton
Date: Sat Jul 2 18:21:06 2011
New Revision: 134359
URL: http://llvm.org/viewvc/llvm-project?rev=134359&view=rev
Log:
When we use the "fd://%u" for file descriptors, we need to detect if this is
a file or socket. We now make a getsockopt call to check if the fd is a socket.
Also, the previous logic in the GDB communication needs to watch for success
with an error so we can deal with EAGAIN and other normal "retry" error codes.
Modified:
lldb/trunk/include/lldb/Core/ConnectionFileDescriptor.h
lldb/trunk/source/Core/ConnectionFileDescriptor.cpp
lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
Modified: lldb/trunk/include/lldb/Core/ConnectionFileDescriptor.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ConnectionFileDescriptor.h?rev=134359&r1=134358&r2=134359&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ConnectionFileDescriptor.h (original)
+++ lldb/trunk/include/lldb/Core/ConnectionFileDescriptor.h Sat Jul 2 18:21:06 2011
@@ -78,10 +78,13 @@
uint32_t m_socket_timeout_usec;
static int
+ GetSocketOption(int fd, int level, int option_name, int &option_value);
+
+ static int
SetSocketOption(int fd, int level, int option_name, int option_value);
bool
- SetSocketRecieveTimeout (uint32_t timeout_usec);
+ SetSocketReceiveTimeout (uint32_t timeout_usec);
private:
DISALLOW_COPY_AND_ASSIGN (ConnectionFileDescriptor);
Modified: lldb/trunk/source/Core/ConnectionFileDescriptor.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ConnectionFileDescriptor.cpp?rev=134359&r1=134358&r2=134359&view=diff
==============================================================================
--- lldb/trunk/source/Core/ConnectionFileDescriptor.cpp (original)
+++ lldb/trunk/source/Core/ConnectionFileDescriptor.cpp Sat Jul 2 18:21:06 2011
@@ -111,8 +111,7 @@
// We have what looks to be a valid file descriptor, but we
// should make it is. We currently are doing this by trying to
// get the flags from the file descriptor and making sure it
- // isn't a bad fd. We also need to enable non blocking mode for
- // the fd if it already isn't.
+ // isn't a bad fd.
errno = 0;
int flags = ::fcntl (m_fd, F_GETFL, 0);
if (flags == -1 || errno == EBADF)
@@ -124,11 +123,10 @@
}
else
{
- if ((flags & O_NONBLOCK) == 0)
- {
- flags |= O_NONBLOCK;
- ::fcntl (m_fd, F_SETFL, flags);
- }
+ // Try and get a socket option from this file descriptor to
+ // see if this is a socket and set m_is_socket accordingly.
+ int resuse;
+ m_is_socket = GetSocketOption (m_fd, SOL_SOCKET, SO_REUSEADDR, resuse) == 0;
m_should_close_fd = true;
return eConnectionStatusSuccess;
}
@@ -200,13 +198,12 @@
if (timeout_usec == UINT32_MAX)
{
- if (m_is_socket)
- SetSocketRecieveTimeout (0);
- status = eConnectionStatusSuccess;
+ if (m_is_socket && SetSocketReceiveTimeout (timeout_usec))
+ status = eConnectionStatusSuccess;
}
else
{
- if (m_is_socket && SetSocketRecieveTimeout (timeout_usec))
+ if (m_is_socket && SetSocketReceiveTimeout (timeout_usec))
status = eConnectionStatusSuccess;
else
status = BytesAvailable (timeout_usec, error_ptr);
@@ -215,7 +212,12 @@
return 0;
Error error;
- ssize_t bytes_read = ::read (m_fd, dst, dst_len);
+ ssize_t bytes_read;
+ if (m_is_socket)
+ bytes_read = ::recv (m_fd, dst, dst_len, 0);
+ else
+ bytes_read = ::read (m_fd, dst, dst_len);
+
if (bytes_read == 0)
{
error.Clear(); // End-of-file. Do not automatically close; pass along for the end-of-file handlers.
@@ -713,26 +715,38 @@
return eConnectionStatusSuccess;
}
-int
-ConnectionFileDescriptor::SetSocketOption(int fd, int level, int option_name, int option_value)
-{
#if defined(__MINGW32__) || defined(__MINGW64__)
- const char* option_value_p = static_cast<const char*>(&option_value);
+typedef const char * set_socket_option_arg_type;
+typedef char * get_socket_option_arg_type;
#else // #if defined(__MINGW32__) || defined(__MINGW64__)
- const void* option_value_p = &option_name;
+typedef const void * set_socket_option_arg_type;
+typedef void * get_socket_option_arg_type;
#endif // #if defined(__MINGW32__) || defined(__MINGW64__)
+int
+ConnectionFileDescriptor::GetSocketOption(int fd, int level, int option_name, int &option_value)
+{
+ get_socket_option_arg_type option_value_p = static_cast<get_socket_option_arg_type>(&option_value);
+ socklen_t option_value_size = sizeof(int);
+ return ::getsockopt(fd, level, option_name, option_value_p, &option_value_size);
+}
+
+int
+ConnectionFileDescriptor::SetSocketOption(int fd, int level, int option_name, int option_value)
+{
+ set_socket_option_arg_type option_value_p = static_cast<get_socket_option_arg_type>(&option_value);
return ::setsockopt(fd, level, option_name, option_value_p, sizeof(option_value));
}
bool
-ConnectionFileDescriptor::SetSocketRecieveTimeout (uint32_t timeout_usec)
+ConnectionFileDescriptor::SetSocketReceiveTimeout (uint32_t timeout_usec)
{
if (m_is_socket)
{
// Check in case timeout for m_fd has already been set to this value
if (timeout_usec == m_socket_timeout_usec)
return true;
+ //printf ("ConnectionFileDescriptor::SetSocketReceiveTimeout (timeout_usec = %u)\n", timeout_usec);
struct timeval timeout;
timeout.tv_sec = timeout_usec / TimeValue::MicroSecPerSec;
Modified: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp?rev=134359&r1=134358&r2=134359&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp Sat Jul 2 18:21:06 2011
@@ -194,7 +194,8 @@
if (CheckForPacket (NULL, 0, packet))
return packet.GetStringRef().size();
- while (IsConnected())
+ bool timed_out = false;
+ while (IsConnected() && !timed_out)
{
lldb::ConnectionStatus status;
size_t bytes_read = Read (buffer, sizeof(buffer), timeout_usec, status, &error);
@@ -207,8 +208,11 @@
{
switch (status)
{
- case eConnectionStatusSuccess:
case eConnectionStatusTimedOut:
+ timed_out = true;
+ break;
+ case eConnectionStatusSuccess:
+ //printf ("status = success but error = %s\n", error.AsCString("<invalid>"));
break;
case eConnectionStatusEndOfFile:
@@ -218,9 +222,6 @@
Disconnect();
break;
}
-
- // Get out of the while loop we we finally timeout without getting any data
- break;
}
}
packet.Clear ();
@@ -237,10 +238,14 @@
if (src && src_len > 0)
{
- if (log)
+ if (log && log->GetVerbose())
{
StreamString s;
- log->Printf ("GDBRemoteCommunication::%s adding %zu bytes: %s\n",__FUNCTION__, src_len, src);
+ log->Printf ("GDBRemoteCommunication::%s adding %u bytes: %.*s",
+ __FUNCTION__,
+ (uint32_t)src_len,
+ (uint32_t)src_len,
+ src);
}
m_bytes.append ((const char *)src, src_len);
}
More information about the lldb-commits
mailing list