[lldb] [ConnectionFileDescriptorPosix] Use a single NativeFile

Replace separate read and write NativeFile instances with a single
instance shared for reading and writing.  There is no clear indication
why two instances were used in the first place, and replacing them
with just one does not seem to cause any regressions in tests or manual
'process connect file://...'.

Differential Revision: https://reviews.llvm.org/D111314
This commit is contained in:
Michał Górny 2021-10-07 16:28:53 +02:00
parent 2cc7013b0e
commit dcb0e687fa
1 changed files with 6 additions and 9 deletions

View File

@ -85,9 +85,8 @@ ConnectionFileDescriptor::ConnectionFileDescriptor(int fd, bool owns_fd)
: Connection(), m_pipe(), m_mutex(), m_shutting_down(false),
m_waiting_for_accept(false), m_child_processes_inherit(false) {
m_write_sp =
std::make_shared<NativeFile>(fd, File::eOpenOptionWriteOnly, owns_fd);
m_read_sp =
std::make_shared<NativeFile>(fd, File::eOpenOptionReadOnly, false);
std::make_shared<NativeFile>(fd, File::eOpenOptionReadWrite, owns_fd);
m_read_sp = m_write_sp;
Log *log(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_CONNECTION |
LIBLLDB_LOG_OBJECT));
@ -219,9 +218,8 @@ ConnectionStatus ConnectionFileDescriptor::Connect(llvm::StringRef path,
m_write_sp = m_read_sp;
} else {
m_read_sp = std::make_shared<NativeFile>(
fd, File::eOpenOptionReadOnly, false);
m_write_sp = std::make_shared<NativeFile>(
fd, File::eOpenOptionWriteOnly, false);
fd, File::eOpenOptionReadWrite, false);
m_write_sp = m_read_sp;
}
m_uri = std::string(*addr);
return eConnectionStatusSuccess;
@ -271,9 +269,8 @@ ConnectionStatus ConnectionFileDescriptor::Connect(llvm::StringRef path,
}
}
m_read_sp =
std::make_shared<NativeFile>(fd, File::eOpenOptionReadOnly, true);
m_write_sp =
std::make_shared<NativeFile>(fd, File::eOpenOptionWriteOnly, false);
std::make_shared<NativeFile>(fd, File::eOpenOptionReadWrite, true);
m_write_sp = m_read_sp;
return eConnectionStatusSuccess;
}
#endif