Skip to content

[lldb][NFC] Separated GDBRemoteCommunication::GetDebugserverPath() #107388

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
slydiman merged 2 commits into from
Sep 6, 2024
Merged

[lldb][NFC] Separated GDBRemoteCommunication::GetDebugserverPath() #107388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f16125
[lldb][NFC] Separated GDBRemoteCommunication::GetDebugserverPath()
slydiman Sep 5, 2024
a697609
Updated std::string debugserver_path = debugserver_file_spec.GetPath()
slydiman Sep 6, 2024
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
29 changes: 17 additions & 12 deletions lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,19 +879,11 @@ lldb::thread_result_t GDBRemoteCommunication::ListenThread() {
return {};
}

Status GDBRemoteCommunication::StartDebugserverProcess(
const char *url, Platform *platform, ProcessLaunchInfo &launch_info,
uint16_t *port, const Args *inferior_args, int pass_comm_fd) {
FileSpec GDBRemoteCommunication::GetDebugserverPath(Platform *platform) {
Log *log = GetLog(GDBRLog::Process);
LLDB_LOGF(log, "GDBRemoteCommunication::%s(url=%s, port=%" PRIu16 ")",
__FUNCTION__, url ? url : "<empty>", port ? *port : uint16_t(0));

Status error;
// If we locate debugserver, keep that located version around
static FileSpec g_debugserver_file_spec;

char debugserver_path[PATH_MAX];
FileSpec &debugserver_file_spec = launch_info.GetExecutableFile();
FileSpec debugserver_file_spec;

Environment host_env = Host::GetEnvironment();

Expand Down Expand Up @@ -943,9 +935,20 @@ Status GDBRemoteCommunication::StartDebugserverProcess(
}
}
}
return debugserver_file_spec;
}

if (debugserver_exists) {
debugserver_file_spec.GetPath(debugserver_path, sizeof(debugserver_path));
Status GDBRemoteCommunication::StartDebugserverProcess(
const char *url, Platform *platform, ProcessLaunchInfo &launch_info,
uint16_t *port, const Args *inferior_args, shared_fd_t pass_comm_fd) {
Log *log = GetLog(GDBRLog::Process);
LLDB_LOGF(log, "GDBRemoteCommunication::%s(url=%s, port=%" PRIu16 ")",
__FUNCTION__, url ? url : "<empty>", port ? *port : uint16_t(0));

Status error;
FileSpec &debugserver_file_spec = launch_info.GetExecutableFile();
if (debugserver_file_spec = GetDebugserverPath(platform)) {
std::string debugserver_path = debugserver_file_spec.GetPath();

Args &debugserver_args = launch_info.GetArguments();
debugserver_args.Clear();
Expand Down Expand Up @@ -1059,6 +1062,8 @@ Status GDBRemoteCommunication::StartDebugserverProcess(
}
}
}

Environment host_env = Host::GetEnvironment();
std::string env_debugserver_log_file =
host_env.lookup("LLDB_DEBUGSERVER_LOG_FILE");
if (!env_debugserver_log_file.empty()) {
Expand Down
3 changes: 3 additions & 0 deletions lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ class GDBRemoteCommunication : public Communication {

std::chrono::seconds GetPacketTimeout() const { return m_packet_timeout; }

// Get the debugserver path and check that it exist.
FileSpec GetDebugserverPath(Platform *platform);

// Start a debugserver instance on the current host using the
// supplied connection URL.
Status StartDebugserverProcess(
Expand Down