maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

On windows a socket and file descriptor aren't the same kind of handle, pass the type to Close so it uses the right api to close it. 

llvm-svn: 191446
This commit is contained in:
Carlo Kok 2013-09-26 18:49:53 +00:00
parent e435f94b69
commit a46964f1bb
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lldb/include/lldb/Core/ConnectionFileDescriptor.h
View File

@ -77,6 +77,13 @@ public:
GetWritePort () const;
protected:
typedef enum
{
eFDTypeFile, // Other FD requireing read/write
eFDTypeSocket, // Socket requiring send/recv
eFDTypeSocketUDP // Unconnected UDP socket requiring sendto/recvfrom
} FDType;
void
OpenCommandPipe ();
@ -103,14 +110,7 @@ protected:
NamedSocketConnect (const char *socket_name, Error *error_ptr);
lldb::ConnectionStatus
Close (int& fd, Error *error);
typedef enum
{
eFDTypeFile, // Other FD requireing read/write
eFDTypeSocket, // Socket requiring send/recv
eFDTypeSocketUDP // Unconnected UDP socket requiring sendto/recvfrom
} FDType;
Close (int& fd, FDType type, Error *error);
int m_fd_send;
int m_fd_recv;

22
lldb/source/Core/ConnectionFileDescriptor.cpp
View File

@ -398,16 +398,16 @@ ConnectionFileDescriptor::Disconnect (Error *error_ptr)
{
if (m_fd_send == m_fd_recv)
{
status = Close (m_fd_send, error_ptr);
status = Close (m_fd_send, m_fd_send_type, error_ptr);
}
else
{
// File descriptors are the different, close both if needed
if (m_fd_send >= 0)
status = Close (m_fd_send, error_ptr);
status = Close (m_fd_send, m_fd_send_type, error_ptr);
if (m_fd_recv >= 0)
{
ConnectionStatus recv_status = Close (m_fd_recv, error_ptr);
ConnectionStatus recv_status = Close (m_fd_recv, m_fd_recv_type, error_ptr);
if (status == eConnectionStatusSuccess)
status = recv_status;
}
@ -1146,7 +1146,7 @@ ConnectionFileDescriptor::BytesAvailable (uint32_t timeout_usec, Error *error_pt
#endif
ConnectionStatus
ConnectionFileDescriptor::Close (int& fd, Error *error_ptr)
ConnectionFileDescriptor::Close (int& fd, FDType type, Error *error_ptr)
{
if (error_ptr)
error_ptr->Clear();
@ -1162,7 +1162,11 @@ ConnectionFileDescriptor::Close (int& fd, Error *error_ptr)
Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION));
if (log)
log->Printf ("%p ConnectionFileDescriptor::Close (fd = %i)", this,fd);
#if _WIN32
if (type != eFDTypeFile)
success = closesocket(fd) == 0;
else
#endif
success = ::close (fd) == 0;
// A reference to a FD was passed in, set it to an invalid value
fd = -1;
@ -1301,7 +1305,7 @@ ConnectionFileDescriptor::SocketListen (uint16_t listen_port_num, Error *error_p
{
if (error_ptr)
error_ptr->SetErrorToErrno();
Close (listen_port, NULL);
Close (listen_port, eFDTypeSocket, NULL);
return eConnectionStatusError;
}
@ -1310,7 +1314,7 @@ ConnectionFileDescriptor::SocketListen (uint16_t listen_port_num, Error *error_p
{
if (error_ptr)
error_ptr->SetErrorToErrno();
Close (listen_port, NULL);
Close (listen_port, eFDTypeSocket, NULL);
return eConnectionStatusError;
}
@ -1319,13 +1323,13 @@ ConnectionFileDescriptor::SocketListen (uint16_t listen_port_num, Error *error_p
{
if (error_ptr)
error_ptr->SetErrorToErrno();
Close (listen_port, NULL);
Close (listen_port, eFDTypeSocket, NULL);
return eConnectionStatusError;
}
}
// We are done with the listen port
Close (listen_port, NULL);
Close (listen_port, eFDTypeSocket, NULL);
m_should_close_fd = true;