Skip to content

[lldb] Remove ConnectionFileDescriptor::child_process_inherit #115861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 13, 2024
Merged

[lldb] Remove ConnectionFileDescriptor::child_process_inherit #115861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions lldb/include/lldb/Host/posix/ConnectionFileDescriptorPosix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class ConnectionFileDescriptor : public Connection {
typedef llvm::function_ref<void(llvm::StringRef local_socket_id)>
socket_id_callback_type;

ConnectionFileDescriptor(bool child_processes_inherit = false);
ConnectionFileDescriptor();

ConnectionFileDescriptor(int fd, bool owns_fd);

Expand Down Expand Up @@ -65,9 +65,6 @@ class ConnectionFileDescriptor : public Connection {

lldb::IOObjectSP GetReadObject() override { return m_io_sp; }

bool GetChildProcessesInherit() const;
void SetChildProcessesInherit(bool child_processes_inherit);

protected:
void OpenCommandPipe();

Expand Down Expand Up @@ -135,7 +132,6 @@ class ConnectionFileDescriptor : public Connection {
std::atomic<bool> m_shutting_down; // This marks that we are shutting down so
// if we get woken up from
// BytesAvailable to disconnect, we won't try to read again.
bool m_child_processes_inherit;

std::string m_uri;

Expand Down
29 changes: 8 additions & 21 deletions lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,15 @@
using namespace lldb;
using namespace lldb_private;

ConnectionFileDescriptor::ConnectionFileDescriptor(bool child_processes_inherit)
: Connection(), m_pipe(), m_mutex(), m_shutting_down(false),

m_child_processes_inherit(child_processes_inherit) {
ConnectionFileDescriptor::ConnectionFileDescriptor()
: Connection(), m_pipe(), m_mutex(), m_shutting_down(false) {
Log *log(GetLog(LLDBLog::Connection | LLDBLog::Object));
LLDB_LOGF(log, "%p ConnectionFileDescriptor::ConnectionFileDescriptor ()",
static_cast<void *>(this));
}

ConnectionFileDescriptor::ConnectionFileDescriptor(int fd, bool owns_fd)
: Connection(), m_pipe(), m_mutex(), m_shutting_down(false),
m_child_processes_inherit(false) {
: Connection(), m_pipe(), m_mutex(), m_shutting_down(false) {
m_io_sp =
std::make_shared<NativeFile>(fd, File::eOpenOptionReadWrite, owns_fd);

Expand All @@ -76,8 +73,7 @@ ConnectionFileDescriptor::ConnectionFileDescriptor(int fd, bool owns_fd)
}

ConnectionFileDescriptor::ConnectionFileDescriptor(Socket *socket)
: Connection(), m_pipe(), m_mutex(), m_shutting_down(false),
m_child_processes_inherit(false) {
: Connection(), m_pipe(), m_mutex(), m_shutting_down(false) {
InitializeSocket(socket);
}

Expand All @@ -94,7 +90,7 @@ void ConnectionFileDescriptor::OpenCommandPipe() {

Log *log = GetLog(LLDBLog::Connection);
// Make the command file descriptor here:
Status result = m_pipe.CreateNew(m_child_processes_inherit);
Status result = m_pipe.CreateNew(/*child_processes_inherit=*/false);
if (!result.Success()) {
LLDB_LOGF(log,
"%p ConnectionFileDescriptor::OpenCommandPipe () - could not "
Expand Down Expand Up @@ -539,7 +535,7 @@ lldb::ConnectionStatus ConnectionFileDescriptor::AcceptSocket(
Status *error_ptr) {
Status error;
std::unique_ptr<Socket> listening_socket =
Socket::Create(socket_protocol, m_child_processes_inherit, error);
Socket::Create(socket_protocol, /*child_processes_inherit=*/false, error);
Socket *accepted_socket;

if (!error.Fail())
Expand Down Expand Up @@ -567,7 +563,7 @@ ConnectionFileDescriptor::ConnectSocket(Socket::SocketProtocol socket_protocol,
Status *error_ptr) {
Status error;
std::unique_ptr<Socket> socket =
Socket::Create(socket_protocol, m_child_processes_inherit, error);
Socket::Create(socket_protocol, /*child_processes_inherit=*/false, error);

if (!error.Fail())
error = socket->Connect(socket_name);
Expand Down Expand Up @@ -649,7 +645,7 @@ ConnectionFileDescriptor::ConnectUDP(llvm::StringRef s,
if (error_ptr)
*error_ptr = Status();
llvm::Expected<std::unique_ptr<UDPSocket>> socket =
Socket::UdpConnect(s, m_child_processes_inherit);
Socket::UdpConnect(s, /*child_processes_inherit=*/false);
if (!socket) {
if (error_ptr)
*error_ptr = Status::FromError(socket.takeError());
Expand Down Expand Up @@ -798,15 +794,6 @@ ConnectionStatus ConnectionFileDescriptor::ConnectSerialPort(
llvm_unreachable("this function should be only called w/ LLDB_ENABLE_POSIX");
}

bool ConnectionFileDescriptor::GetChildProcessesInherit() const {
return m_child_processes_inherit;
}

void ConnectionFileDescriptor::SetChildProcessesInherit(
bool child_processes_inherit) {
m_child_processes_inherit = child_processes_inherit;
}

void ConnectionFileDescriptor::InitializeSocket(Socket *socket) {
m_io_sp.reset(socket);
m_uri = socket->GetRemoteConnectionURI();
Expand Down
Loading