https://github.com/satyajanga created
https://github.com/llvm/llvm-project/pull/142875
Summary:
when the unix-socket connections on localhost are used to for platform connect
i.e.
`platform connect unix-connect:///path/to/socket.sock`
then `PlatformRemoteGDBServer.m_platform_hostname` is empty.
Based on the current logic, for the process attach, when the connection param
returned by platform server as qLaunchGDBServer is this
`socket_name:/path/to/processgdbserver.sock`
then the subsequent connect url for the process url looks like this
`unix-connect://[]/path/to/processgdbserver.sock` and the connection fail.
This change is only adding the braces when the hostname is not empty.
Test Plan:
Added unittest and existing tests pass.
Reviewers:
Subscribers:
Tasks:
Tags:
>From db795bd3b742ea6047d37d1aab86f02ef9238ea3 Mon Sep 17 00:00:00 2001
From: satya janga <satyaja...@fb.com>
Date: Wed, 4 Jun 2025 09:40:51 -0700
Subject: [PATCH] Minor fix to connect-url to support unix-connect sockets on
localhost Summary:
Test Plan:
Reviewers:
Subscribers:
Tasks:
Tags:
---
.../gdb-server/PlatformRemoteGDBServer.cpp | 6 ++-
.../GDBRemoteCommunicationClient.cpp | 4 +-
.../platform/connect/TestPlatformConnect.py | 47 +++++++++++++++++++
3 files changed, 54 insertions(+), 3 deletions(-)
diff --git
a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
index 26ca6ed128972..7eebe8220e016 100644
--- a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
+++ b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
@@ -800,7 +800,11 @@ std::string PlatformRemoteGDBServer::MakeUrl(const char
*scheme,
const char *hostname,
uint16_t port, const char *path) {
StreamString result;
- result.Printf("%s://[%s]", scheme, hostname);
+ if (strlen(hostname) > 0)
+ result.Printf("%s://[%s]", scheme, hostname);
+ else
+ result.Printf("%s://", scheme);
+
if (port != 0)
result.Printf(":%u", port);
if (path)
diff --git
a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
index adbf06b9a19a0..f7fed3b45f8ad 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
@@ -538,8 +538,8 @@
GDBRemoteCommunicationClient::SendThreadSpecificPacketAndWaitForResponse(
if (Log *log = GetLog(GDBRLog::Process | GDBRLog::Packets))
LLDB_LOGF(log,
"GDBRemoteCommunicationClient::%s: Didn't get sequence mutex "
- "for %s packet.",
- __FUNCTION__, payload.GetData());
+ "for %s packet for thread %lu.",
+ __FUNCTION__, payload.GetData(), tid);
return PacketResult::ErrorNoSequenceLock;
}
diff --git a/lldb/test/API/commands/platform/connect/TestPlatformConnect.py
b/lldb/test/API/commands/platform/connect/TestPlatformConnect.py
index fc6c2ee98df44..68fa22afaed32 100644
--- a/lldb/test/API/commands/platform/connect/TestPlatformConnect.py
+++ b/lldb/test/API/commands/platform/connect/TestPlatformConnect.py
@@ -57,3 +57,50 @@ def test_platform_process_connect(self):
self.assertEqual(frame.GetFunction().GetName(), "main")
self.assertEqual(frame.FindVariable("argc").GetValueAsSigned(), 2)
process.Continue()
+
+
+ @skipIfRemote
+ @expectedFailureAll(hostoslist=["windows"], triple=".*-android")
+ @skipIfDarwin # lldb-server not found correctly
+ @expectedFailureAll(oslist=["windows"]) # process modules not loaded
+ # lldb-server platform times out waiting for the gdbserver port number to
be
+ # written to the pipe, yet it seems the gdbserver already has written it.
+ @expectedFailureAll(
+ archs=["aarch64"],
+ oslist=["freebsd"],
+ bugnumber="https://github.com/llvm/llvm-project/issues/84327";,
+ )
+ @add_test_categories(["lldb-server"])
+ def test_platform_process_connect_with_unix_connect(self):
+ self.build()
+ import time
+ timestamp = int(time.time())
+ listen_url = "/tmp/listen_url_%s" % timestamp
+ port_file = "/tmp/port_file_%s" % timestamp
+ commandline_args = [
+ "platform",
+ "--listen",
+ listen_url,
+ "--socket-file",
+ port_file,
+ "--",
+ self.getBuildArtifact("a.out"),
+ "foo",
+ ]
+ self.spawnSubprocess(lldbgdbserverutils.get_lldb_server_exe(),
commandline_args)
+
+ socket_file = lldbutil.wait_for_file_on_target(self, port_file)
+ new_platform = lldb.SBPlatform("remote-" + self.getPlatform())
+ self.dbg.SetSelectedPlatform(new_platform)
+ connect_url = "unix-connect://%s" % socket_file
+ self.runCmd("platform connect %s" % connect_url)
+
+ lldbutil.run_break_set_by_symbol(self, "main")
+ process = self.process()
+
+ process.Continue()
+
+ frame = self.frame()
+ self.assertEqual(frame.GetFunction().GetName(), "main")
+ self.assertEqual(frame.FindVariable("argc").GetValueAsSigned(), 2)
+ process.Continue()
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
