[Lldb-commits] [lldb] [lldb][AIX] HostInfoAIX Support (PR #117906)
Dhruv Srivastava via lldb-commits
lldb-commits at lists.llvm.org
Sun Jan 5 03:42:44 PST 2025
https://github.com/DhruvSrivastavaX updated https://github.com/llvm/llvm-project/pull/117906
>From d05de47c87362b54760f65c294c30c80b2d5bc9b Mon Sep 17 00:00:00 2001
From: Dhruv-Srivastava <dhruv.srivastava at ibm.com>
Date: Wed, 27 Nov 2024 10:10:32 -0600
Subject: [PATCH 1/3] HostInfoAIX
---
lldb/include/lldb/Host/aix/HostInfoAIX.h | 43 +++++
lldb/source/Host/CMakeLists.txt | 5 +
lldb/source/Host/aix/HostInfoAIX.cpp | 213 +++++++++++++++++++++++
3 files changed, 261 insertions(+)
create mode 100644 lldb/include/lldb/Host/aix/HostInfoAIX.h
create mode 100644 lldb/source/Host/aix/HostInfoAIX.cpp
diff --git a/lldb/include/lldb/Host/aix/HostInfoAIX.h b/lldb/include/lldb/Host/aix/HostInfoAIX.h
new file mode 100644
index 00000000000000..c797b36f3dcc8d
--- /dev/null
+++ b/lldb/include/lldb/Host/aix/HostInfoAIX.h
@@ -0,0 +1,43 @@
+//===-- HostInfoAIX.h -----------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_HOST_AIX_HOSTINFOAIX_H_
+#define LLDB_HOST_AIX_HOSTINFOAIX_H_
+
+#include "lldb/Host/posix/HostInfoPosix.h"
+#include "lldb/Utility/FileSpec.h"
+#include "llvm/ADT/StringRef.h"
+#include "llvm/Support/VersionTuple.h"
+
+#include <optional>
+#include <string>
+
+namespace lldb_private {
+
+class HostInfoAIX : public HostInfoPosix {
+ friend class HostInfoBase;
+
+public:
+ static void Initialize(SharedLibraryDirectoryHelper *helper = nullptr);
+ static void Terminate();
+
+ static llvm::VersionTuple GetOSVersion();
+ static std::optional<std::string> GetOSBuildString();
+ static llvm::StringRef GetDistributionId();
+ static FileSpec GetProgramFileSpec();
+
+protected:
+ static bool ComputeSupportExeDirectory(FileSpec &file_spec);
+ static bool ComputeSystemPluginsDirectory(FileSpec &file_spec);
+ static bool ComputeUserPluginsDirectory(FileSpec &file_spec);
+ static void ComputeHostArchitectureSupport(ArchSpec &arch_32,
+ ArchSpec &arch_64);
+};
+} // namespace lldb_private
+
+#endif // LLDB_HOST_AIX_HOSTINFOAIX_H_
diff --git a/lldb/source/Host/CMakeLists.txt b/lldb/source/Host/CMakeLists.txt
index c2e091ee8555b7..e0cd8569bf9575 100644
--- a/lldb/source/Host/CMakeLists.txt
+++ b/lldb/source/Host/CMakeLists.txt
@@ -133,6 +133,11 @@ else()
openbsd/Host.cpp
openbsd/HostInfoOpenBSD.cpp
)
+
+ elseif (CMAKE_SYSTEM_NAME MATCHES "AIX")
+ add_host_subdirectory(aix
+ aix/HostInfoAIX.cpp
+ )
endif()
endif()
diff --git a/lldb/source/Host/aix/HostInfoAIX.cpp b/lldb/source/Host/aix/HostInfoAIX.cpp
new file mode 100644
index 00000000000000..e43ab3afd94657
--- /dev/null
+++ b/lldb/source/Host/aix/HostInfoAIX.cpp
@@ -0,0 +1,213 @@
+//===-- HostInfoAIX.cpp -------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/Host/aix/HostInfoAIX.h"
+#include "lldb/Host/Config.h"
+#include "lldb/Host/FileSystem.h"
+#include "lldb/Utility/LLDBLog.h"
+#include "lldb/Utility/Log.h"
+
+#include "llvm/Support/Threading.h"
+
+#include <climits>
+#include <cstdio>
+#include <cstring>
+#include <sys/utsname.h>
+#include <unistd.h>
+
+#include <algorithm>
+#include <mutex>
+#include <optional>
+
+using namespace lldb_private;
+
+namespace {
+struct HostInfoAIXFields {
+ llvm::once_flag m_distribution_once_flag;
+ std::string m_distribution_id;
+ llvm::once_flag m_os_version_once_flag;
+ llvm::VersionTuple m_os_version;
+};
+} // namespace
+
+static HostInfoAIXFields *g_fields = nullptr;
+
+void HostInfoAIX::Initialize(SharedLibraryDirectoryHelper *helper) {
+ HostInfoPosix::Initialize(helper);
+
+ g_fields = new HostInfoAIXFields();
+}
+
+void HostInfoAIX::Terminate() {
+ assert(g_fields && "Missing call to Initialize?");
+ delete g_fields;
+ g_fields = nullptr;
+ HostInfoBase::Terminate();
+}
+
+llvm::VersionTuple HostInfoAIX::GetOSVersion() {
+ assert(g_fields && "Missing call to Initialize?");
+ llvm::call_once(g_fields->m_os_version_once_flag, []() {
+ struct utsname un;
+ if (uname(&un) != 0)
+ return;
+
+ llvm::StringRef release = un.release;
+ // The kernel release string can include a lot of stuff (e.g.
+ // 4.9.0-6-amd64). We're only interested in the numbered prefix.
+ release = release.substr(0, release.find_first_not_of("0123456789."));
+ g_fields->m_os_version.tryParse(release);
+ });
+
+ return g_fields->m_os_version;
+}
+
+std::optional<std::string> HostInfoAIX::GetOSBuildString() {
+ struct utsname un;
+ ::memset(&un, 0, sizeof(utsname));
+
+ if (uname(&un) < 0)
+ return std::nullopt;
+
+ return std::string(un.release);
+}
+
+llvm::StringRef HostInfoAIX::GetDistributionId() {
+ assert(g_fields && "Missing call to Initialize?");
+ // Try to run 'lbs_release -i', and use that response for the distribution
+ // id.
+ llvm::call_once(g_fields->m_distribution_once_flag, []() {
+ Log *log = GetLog(LLDBLog::Host);
+ LLDB_LOGF(log, "attempting to determine AIX distribution...");
+
+ // check if the lsb_release command exists at one of the following paths
+ const char *const exe_paths[] = {"/bin/lsb_release",
+ "/usr/bin/lsb_release"};
+
+ for (size_t exe_index = 0;
+ exe_index < sizeof(exe_paths) / sizeof(exe_paths[0]); ++exe_index) {
+ const char *const get_distribution_info_exe = exe_paths[exe_index];
+ if (access(get_distribution_info_exe, F_OK)) {
+ // this exe doesn't exist, move on to next exe
+ LLDB_LOGF(log, "executable doesn't exist: %s",
+ get_distribution_info_exe);
+ continue;
+ }
+
+ // execute the distribution-retrieval command, read output
+ std::string get_distribution_id_command(get_distribution_info_exe);
+ get_distribution_id_command += " -i";
+
+ FILE *file = popen(get_distribution_id_command.c_str(), "r");
+ if (!file) {
+ LLDB_LOGF(log,
+ "failed to run command: \"%s\", cannot retrieve "
+ "platform information",
+ get_distribution_id_command.c_str());
+ break;
+ }
+
+ // retrieve the distribution id string.
+ char distribution_id[256] = {'\0'};
+ if (fgets(distribution_id, sizeof(distribution_id) - 1, file) !=
+ nullptr) {
+ LLDB_LOGF(log, "distribution id command returned \"%s\"",
+ distribution_id);
+
+ const char *const distributor_id_key = "Distributor ID:\t";
+ if (strstr(distribution_id, distributor_id_key)) {
+ // strip newlines
+ std::string id_string(distribution_id + strlen(distributor_id_key));
+ llvm::erase(id_string, '\n');
+
+ // lower case it and convert whitespace to underscores
+ std::transform(
+ id_string.begin(), id_string.end(), id_string.begin(),
+ [](char ch) { return tolower(isspace(ch) ? '_' : ch); });
+
+ g_fields->m_distribution_id = id_string;
+ LLDB_LOGF(log, "distribution id set to \"%s\"",
+ g_fields->m_distribution_id.c_str());
+ } else {
+ LLDB_LOGF(log, "failed to find \"%s\" field in \"%s\"",
+ distributor_id_key, distribution_id);
+ }
+ } else {
+ LLDB_LOGF(log,
+ "failed to retrieve distribution id, \"%s\" returned no"
+ " lines",
+ get_distribution_id_command.c_str());
+ }
+
+ // clean up the file
+ pclose(file);
+ }
+ });
+
+ return g_fields->m_distribution_id;
+}
+
+FileSpec HostInfoAIX::GetProgramFileSpec() {
+ static FileSpec g_program_filespec;
+
+ if (!g_program_filespec) {
+ char exe_path[PATH_MAX];
+ ssize_t len = readlink("/proc/self/exe", exe_path, sizeof(exe_path) - 1);
+ if (len > 0) {
+ exe_path[len] = 0;
+ g_program_filespec.SetFile(exe_path, FileSpec::Style::native);
+ }
+ }
+
+ return g_program_filespec;
+}
+
+bool HostInfoAIX::ComputeSupportExeDirectory(FileSpec &file_spec) {
+ if (HostInfoPosix::ComputeSupportExeDirectory(file_spec) &&
+ file_spec.IsAbsolute() && FileSystem::Instance().Exists(file_spec))
+ return true;
+ file_spec.SetDirectory(GetProgramFileSpec().GetDirectory());
+ return !file_spec.GetDirectory().IsEmpty();
+}
+
+bool HostInfoAIX::ComputeSystemPluginsDirectory(FileSpec &file_spec) {
+ FileSpec temp_file("/usr/" LLDB_INSTALL_LIBDIR_BASENAME "/lldb/plugins");
+ FileSystem::Instance().Resolve(temp_file);
+ file_spec.SetDirectory(temp_file.GetPath());
+ return true;
+}
+
+bool HostInfoAIX::ComputeUserPluginsDirectory(FileSpec &file_spec) {
+ // XDG Base Directory Specification
+ // http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html If
+ // XDG_DATA_HOME exists, use that, otherwise use ~/.local/share/lldb.
+ const char *xdg_data_home = getenv("XDG_DATA_HOME");
+ if (xdg_data_home && xdg_data_home[0]) {
+ std::string user_plugin_dir(xdg_data_home);
+ user_plugin_dir += "/lldb";
+ file_spec.SetDirectory(user_plugin_dir.c_str());
+ } else
+ file_spec.SetDirectory("~/.local/share/lldb");
+ return true;
+}
+
+void HostInfoAIX::ComputeHostArchitectureSupport(ArchSpec &arch_32,
+ ArchSpec &arch_64) {
+ HostInfoPosix::ComputeHostArchitectureSupport(arch_32, arch_64);
+
+ // On AIX, "unknown" in the vendor slot isn't what we want for the default
+ // triple. It's probably an artifact of config.guess.
+ if (arch_32.IsValid()) {
+ if (arch_32.GetTriple().getVendor() == llvm::Triple::UnknownVendor)
+ arch_32.GetTriple().setVendorName(llvm::StringRef());
+ }
+ if (arch_64.IsValid()) {
+ if (arch_64.GetTriple().getVendor() == llvm::Triple::UnknownVendor)
+ arch_64.GetTriple().setVendorName(llvm::StringRef());
+ }
+}
>From e94f31bb7eec2d0ba01ea984801c1575818d9ddf Mon Sep 17 00:00:00 2001
From: Dhruv-Srivastava <dhruv.srivastava at ibm.com>
Date: Fri, 27 Dec 2024 04:54:34 -0600
Subject: [PATCH 2/3] Updated according to new HostInfoPosix
---
lldb/include/lldb/Host/aix/HostInfoAIX.h | 8 ----
lldb/source/Host/aix/HostInfoAIX.cpp | 59 ------------------------
2 files changed, 67 deletions(-)
diff --git a/lldb/include/lldb/Host/aix/HostInfoAIX.h b/lldb/include/lldb/Host/aix/HostInfoAIX.h
index c797b36f3dcc8d..cc054a788c388b 100644
--- a/lldb/include/lldb/Host/aix/HostInfoAIX.h
+++ b/lldb/include/lldb/Host/aix/HostInfoAIX.h
@@ -14,9 +14,6 @@
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/VersionTuple.h"
-#include <optional>
-#include <string>
-
namespace lldb_private {
class HostInfoAIX : public HostInfoPosix {
@@ -26,15 +23,10 @@ class HostInfoAIX : public HostInfoPosix {
static void Initialize(SharedLibraryDirectoryHelper *helper = nullptr);
static void Terminate();
- static llvm::VersionTuple GetOSVersion();
- static std::optional<std::string> GetOSBuildString();
static llvm::StringRef GetDistributionId();
static FileSpec GetProgramFileSpec();
protected:
- static bool ComputeSupportExeDirectory(FileSpec &file_spec);
- static bool ComputeSystemPluginsDirectory(FileSpec &file_spec);
- static bool ComputeUserPluginsDirectory(FileSpec &file_spec);
static void ComputeHostArchitectureSupport(ArchSpec &arch_32,
ArchSpec &arch_64);
};
diff --git a/lldb/source/Host/aix/HostInfoAIX.cpp b/lldb/source/Host/aix/HostInfoAIX.cpp
index e43ab3afd94657..7dfd31e6e9d47c 100644
--- a/lldb/source/Host/aix/HostInfoAIX.cpp
+++ b/lldb/source/Host/aix/HostInfoAIX.cpp
@@ -22,7 +22,6 @@
#include <algorithm>
#include <mutex>
-#include <optional>
using namespace lldb_private;
@@ -30,8 +29,6 @@ namespace {
struct HostInfoAIXFields {
llvm::once_flag m_distribution_once_flag;
std::string m_distribution_id;
- llvm::once_flag m_os_version_once_flag;
- llvm::VersionTuple m_os_version;
};
} // namespace
@@ -50,33 +47,6 @@ void HostInfoAIX::Terminate() {
HostInfoBase::Terminate();
}
-llvm::VersionTuple HostInfoAIX::GetOSVersion() {
- assert(g_fields && "Missing call to Initialize?");
- llvm::call_once(g_fields->m_os_version_once_flag, []() {
- struct utsname un;
- if (uname(&un) != 0)
- return;
-
- llvm::StringRef release = un.release;
- // The kernel release string can include a lot of stuff (e.g.
- // 4.9.0-6-amd64). We're only interested in the numbered prefix.
- release = release.substr(0, release.find_first_not_of("0123456789."));
- g_fields->m_os_version.tryParse(release);
- });
-
- return g_fields->m_os_version;
-}
-
-std::optional<std::string> HostInfoAIX::GetOSBuildString() {
- struct utsname un;
- ::memset(&un, 0, sizeof(utsname));
-
- if (uname(&un) < 0)
- return std::nullopt;
-
- return std::string(un.release);
-}
-
llvm::StringRef HostInfoAIX::GetDistributionId() {
assert(g_fields && "Missing call to Initialize?");
// Try to run 'lbs_release -i', and use that response for the distribution
@@ -167,35 +137,6 @@ FileSpec HostInfoAIX::GetProgramFileSpec() {
return g_program_filespec;
}
-bool HostInfoAIX::ComputeSupportExeDirectory(FileSpec &file_spec) {
- if (HostInfoPosix::ComputeSupportExeDirectory(file_spec) &&
- file_spec.IsAbsolute() && FileSystem::Instance().Exists(file_spec))
- return true;
- file_spec.SetDirectory(GetProgramFileSpec().GetDirectory());
- return !file_spec.GetDirectory().IsEmpty();
-}
-
-bool HostInfoAIX::ComputeSystemPluginsDirectory(FileSpec &file_spec) {
- FileSpec temp_file("/usr/" LLDB_INSTALL_LIBDIR_BASENAME "/lldb/plugins");
- FileSystem::Instance().Resolve(temp_file);
- file_spec.SetDirectory(temp_file.GetPath());
- return true;
-}
-
-bool HostInfoAIX::ComputeUserPluginsDirectory(FileSpec &file_spec) {
- // XDG Base Directory Specification
- // http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html If
- // XDG_DATA_HOME exists, use that, otherwise use ~/.local/share/lldb.
- const char *xdg_data_home = getenv("XDG_DATA_HOME");
- if (xdg_data_home && xdg_data_home[0]) {
- std::string user_plugin_dir(xdg_data_home);
- user_plugin_dir += "/lldb";
- file_spec.SetDirectory(user_plugin_dir.c_str());
- } else
- file_spec.SetDirectory("~/.local/share/lldb");
- return true;
-}
-
void HostInfoAIX::ComputeHostArchitectureSupport(ArchSpec &arch_32,
ArchSpec &arch_64) {
HostInfoPosix::ComputeHostArchitectureSupport(arch_32, arch_64);
>From 66b49ad51fd373b9f99886a3b5aa748a795f53ee Mon Sep 17 00:00:00 2001
From: Dhruv-Srivastava <dhruv.srivastava at ibm.com>
Date: Sun, 5 Jan 2025 05:40:54 -0600
Subject: [PATCH 3/3] Cleanup HostInfoAIX
---
lldb/include/lldb/Host/aix/HostInfoAIX.h | 5 -
lldb/source/Host/aix/HostInfoAIX.cpp | 126 +----------------------
2 files changed, 3 insertions(+), 128 deletions(-)
diff --git a/lldb/include/lldb/Host/aix/HostInfoAIX.h b/lldb/include/lldb/Host/aix/HostInfoAIX.h
index cc054a788c388b..1c28c2f56a3778 100644
--- a/lldb/include/lldb/Host/aix/HostInfoAIX.h
+++ b/lldb/include/lldb/Host/aix/HostInfoAIX.h
@@ -23,12 +23,7 @@ class HostInfoAIX : public HostInfoPosix {
static void Initialize(SharedLibraryDirectoryHelper *helper = nullptr);
static void Terminate();
- static llvm::StringRef GetDistributionId();
static FileSpec GetProgramFileSpec();
-
-protected:
- static void ComputeHostArchitectureSupport(ArchSpec &arch_32,
- ArchSpec &arch_64);
};
} // namespace lldb_private
diff --git a/lldb/source/Host/aix/HostInfoAIX.cpp b/lldb/source/Host/aix/HostInfoAIX.cpp
index 7dfd31e6e9d47c..ba4f7a59d80fcf 100644
--- a/lldb/source/Host/aix/HostInfoAIX.cpp
+++ b/lldb/source/Host/aix/HostInfoAIX.cpp
@@ -11,144 +11,24 @@
#include "lldb/Host/FileSystem.h"
#include "lldb/Utility/LLDBLog.h"
#include "lldb/Utility/Log.h"
-
#include "llvm/Support/Threading.h"
-
+#include <algorithm>
#include <climits>
#include <cstdio>
#include <cstring>
+#include <mutex>
#include <sys/utsname.h>
#include <unistd.h>
-#include <algorithm>
-#include <mutex>
-
using namespace lldb_private;
-namespace {
-struct HostInfoAIXFields {
- llvm::once_flag m_distribution_once_flag;
- std::string m_distribution_id;
-};
-} // namespace
-
-static HostInfoAIXFields *g_fields = nullptr;
-
void HostInfoAIX::Initialize(SharedLibraryDirectoryHelper *helper) {
HostInfoPosix::Initialize(helper);
-
- g_fields = new HostInfoAIXFields();
}
-void HostInfoAIX::Terminate() {
- assert(g_fields && "Missing call to Initialize?");
- delete g_fields;
- g_fields = nullptr;
- HostInfoBase::Terminate();
-}
-
-llvm::StringRef HostInfoAIX::GetDistributionId() {
- assert(g_fields && "Missing call to Initialize?");
- // Try to run 'lbs_release -i', and use that response for the distribution
- // id.
- llvm::call_once(g_fields->m_distribution_once_flag, []() {
- Log *log = GetLog(LLDBLog::Host);
- LLDB_LOGF(log, "attempting to determine AIX distribution...");
-
- // check if the lsb_release command exists at one of the following paths
- const char *const exe_paths[] = {"/bin/lsb_release",
- "/usr/bin/lsb_release"};
-
- for (size_t exe_index = 0;
- exe_index < sizeof(exe_paths) / sizeof(exe_paths[0]); ++exe_index) {
- const char *const get_distribution_info_exe = exe_paths[exe_index];
- if (access(get_distribution_info_exe, F_OK)) {
- // this exe doesn't exist, move on to next exe
- LLDB_LOGF(log, "executable doesn't exist: %s",
- get_distribution_info_exe);
- continue;
- }
-
- // execute the distribution-retrieval command, read output
- std::string get_distribution_id_command(get_distribution_info_exe);
- get_distribution_id_command += " -i";
-
- FILE *file = popen(get_distribution_id_command.c_str(), "r");
- if (!file) {
- LLDB_LOGF(log,
- "failed to run command: \"%s\", cannot retrieve "
- "platform information",
- get_distribution_id_command.c_str());
- break;
- }
-
- // retrieve the distribution id string.
- char distribution_id[256] = {'\0'};
- if (fgets(distribution_id, sizeof(distribution_id) - 1, file) !=
- nullptr) {
- LLDB_LOGF(log, "distribution id command returned \"%s\"",
- distribution_id);
-
- const char *const distributor_id_key = "Distributor ID:\t";
- if (strstr(distribution_id, distributor_id_key)) {
- // strip newlines
- std::string id_string(distribution_id + strlen(distributor_id_key));
- llvm::erase(id_string, '\n');
-
- // lower case it and convert whitespace to underscores
- std::transform(
- id_string.begin(), id_string.end(), id_string.begin(),
- [](char ch) { return tolower(isspace(ch) ? '_' : ch); });
-
- g_fields->m_distribution_id = id_string;
- LLDB_LOGF(log, "distribution id set to \"%s\"",
- g_fields->m_distribution_id.c_str());
- } else {
- LLDB_LOGF(log, "failed to find \"%s\" field in \"%s\"",
- distributor_id_key, distribution_id);
- }
- } else {
- LLDB_LOGF(log,
- "failed to retrieve distribution id, \"%s\" returned no"
- " lines",
- get_distribution_id_command.c_str());
- }
-
- // clean up the file
- pclose(file);
- }
- });
-
- return g_fields->m_distribution_id;
-}
+void HostInfoAIX::Terminate() { HostInfoBase::Terminate(); }
FileSpec HostInfoAIX::GetProgramFileSpec() {
static FileSpec g_program_filespec;
-
- if (!g_program_filespec) {
- char exe_path[PATH_MAX];
- ssize_t len = readlink("/proc/self/exe", exe_path, sizeof(exe_path) - 1);
- if (len > 0) {
- exe_path[len] = 0;
- g_program_filespec.SetFile(exe_path, FileSpec::Style::native);
- }
- }
-
return g_program_filespec;
}
-
-void HostInfoAIX::ComputeHostArchitectureSupport(ArchSpec &arch_32,
- ArchSpec &arch_64) {
- HostInfoPosix::ComputeHostArchitectureSupport(arch_32, arch_64);
-
- // On AIX, "unknown" in the vendor slot isn't what we want for the default
- // triple. It's probably an artifact of config.guess.
- if (arch_32.IsValid()) {
- if (arch_32.GetTriple().getVendor() == llvm::Triple::UnknownVendor)
- arch_32.GetTriple().setVendorName(llvm::StringRef());
- }
- if (arch_64.IsValid()) {
- if (arch_64.GetTriple().getVendor() == llvm::Triple::UnknownVendor)
- arch_64.GetTriple().setVendorName(llvm::StringRef());
- }
-}
More information about the lldb-commits
mailing list