Cleanup HostInfoAIX

Author: DhruvSrivastavaX

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
 

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());
-  }
-}