Push down more common code into PlatformPOSIX

[labath]

Summary

• GetFileWithUUID: All platforms except PlatformDarwin had this.

However, I see no reason why this code would not apply there as well.

• GetProcessInfo, FindProcesses: The implementation was the same in all classes.

• GetFullNameForDylib: This code should apply to all non-darwin

platforms. I've kept the PlatformDarwin override as the situation is
different there.

[krytarowski]

Thank you for this patch.

[clayborg]

indeed very nice

lldb/trunk/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h

public:
   Error DisconnectRemote() override;
 
   const char *GetHostname() override;
 
   const char *GetUserName(uint32_t uid) override;
 
   const char *GetGroupName(uint32_t gid) override;
 
-  bool GetProcessInfo(lldb::pid_t pid, ProcessInstanceInfo &proc_info) override;
-
-  uint32_t FindProcesses(const ProcessInstanceInfoMatch &match_info,
-                         ProcessInstanceInfoList &process_infos) override;
-
   Error LaunchProcess(ProcessLaunchInfo &launch_info) override;
 
   lldb::ProcessSP Attach(ProcessAttachInfo &attach_info, Debugger &debugger,
                          Target *target, Error &error) override;
 
   // FreeBSD processes can not be launched by spawning and attaching.
   bool CanDebugProcess() override { return false; }
 
-  // Only on PlatformMacOSX:
-  Error GetFileWithUUID(const FileSpec &platform_file, const UUID *uuid,
-                        FileSpec &local_file) override;
-
   Error GetSharedModule(const ModuleSpec &module_spec, Process *process,
                         lldb::ModuleSP &module_sp,
                         const FileSpecList *module_search_paths_ptr,
                         lldb::ModuleSP *old_module_sp_ptr,
                         bool *did_create_ptr) override;
 
   bool GetSupportedArchitectureAtIndex(uint32_t idx, ArchSpec &arch) override;
 

lldb/trunk/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp

if (m_remote_platform_sp)
       return m_remote_platform_sp->RunShellCommand(command, working_dir,
                                                    status_ptr, signo_ptr,
                                                    command_output, timeout_sec);
     else
       return Error("unable to run a remote command without a platform");
   }
 }
 
-// From PlatformMacOSX only
-Error PlatformFreeBSD::GetFileWithUUID(const FileSpec &platform_file,
-                                       const UUID *uuid_ptr,
-                                       FileSpec &local_file) {
-  if (IsRemote()) {
-    if (m_remote_platform_sp)
-      return m_remote_platform_sp->GetFileWithUUID(platform_file, uuid_ptr,
-                                                   local_file);
-  }
-
-  // Default to the local case
-  local_file = platform_file;
-  return Error();
-}
-
 //------------------------------------------------------------------
 /// Default Constructor
 //------------------------------------------------------------------
 PlatformFreeBSD::PlatformFreeBSD(bool is_host)
     : Platform(is_host), m_remote_platform_sp() {}
 
 //------------------------------------------------------------------
 /// Destructor.
if (IsHost()) {
     if (m_remote_platform_sp)
       error = m_remote_platform_sp->DisconnectRemote();
     else
       error.SetErrorString("the platform is not currently connected");
   }
   return error;
 }
 
-bool PlatformFreeBSD::GetProcessInfo(lldb::pid_t pid,
-                                     ProcessInstanceInfo &process_info) {
-  bool success = false;
-  if (IsHost()) {
-    success = Platform::GetProcessInfo(pid, process_info);
-  } else if (m_remote_platform_sp) {
-    success = m_remote_platform_sp->GetProcessInfo(pid, process_info);
-  }
-  return success;
-}
-
-uint32_t
-PlatformFreeBSD::FindProcesses(const ProcessInstanceInfoMatch &match_info,
-                               ProcessInstanceInfoList &process_infos) {
-  uint32_t match_count = 0;
-  if (IsHost()) {
-    // Let the base class figure out the host details
-    match_count = Platform::FindProcesses(match_info, process_infos);
-  } else {
-    // If we are remote, we can only return results if we are connected
-    if (m_remote_platform_sp)
-      match_count =
-          m_remote_platform_sp->FindProcesses(match_info, process_infos);
-  }
-  return match_count;
-}
-
 const char *PlatformFreeBSD::GetUserName(uint32_t uid) {
   // Check the cache in Platform in case we have already looked this uid up
   const char *user_name = Platform::GetUserName(uid);
   if (user_name)
     return user_name;
 
   if (IsRemote() && m_remote_platform_sp)
     return m_remote_platform_sp->GetUserName(uid);

lldb/trunk/source/Plugins/Platform/Kalimba/PlatformKalimba.h

public:
   // lldb_private::Platform functions
   //------------------------------------------------------------
   const char *GetDescription() override {
     return GetPluginDescriptionStatic(IsHost());
   }
 
   void GetStatus(Stream &strm) override;
 
-  Error GetFileWithUUID(const FileSpec &platform_file, const UUID *uuid,
-                        FileSpec &local_file) override;
-
-  bool GetProcessInfo(lldb::pid_t pid, ProcessInstanceInfo &proc_info) override;
-
   bool GetSupportedArchitectureAtIndex(uint32_t idx, ArchSpec &arch) override;
 
   size_t GetSoftwareBreakpointTrapOpcode(Target &target,
                                          BreakpointSite *bp_site) override;
 
   lldb_private::Error
   LaunchProcess(lldb_private::ProcessLaunchInfo &launch_info) override;
 

lldb/trunk/source/Plugins/Platform/Kalimba/PlatformKalimba.cpp

if (g_initialize_count > 0) {
     if (--g_initialize_count == 0) {
       PluginManager::UnregisterPlugin(PlatformKalimba::CreateInstance);
     }
   }
 
   Platform::Terminate();
 }
 
-Error PlatformKalimba::GetFileWithUUID(const FileSpec & /*platform_file*/,
-                                       const UUID * /*uuid_ptr*/,
-                                       FileSpec & /*local_file*/) {
-  return Error();
-}
-
 //------------------------------------------------------------------
 /// Default Constructor
 //------------------------------------------------------------------
 PlatformKalimba::PlatformKalimba(bool is_host)
     : Platform(is_host), // This is the local host platform
       m_remote_platform_sp() {}
 
 //------------------------------------------------------------------
 /// Destructor.
 ///
 /// The destructor is virtual since this class is designed to be
 /// inherited from by the plug-in instance.
 //------------------------------------------------------------------
 PlatformKalimba::~PlatformKalimba() {}
 
-bool PlatformKalimba::GetProcessInfo(lldb::pid_t pid,
-                                     ProcessInstanceInfo &process_info) {
-  bool success = false;
-  if (IsHost()) {
-    success = false;
-  } else {
-    if (m_remote_platform_sp)
-      success = m_remote_platform_sp->GetProcessInfo(pid, process_info);
-  }
-  return success;
-}
-
 bool PlatformKalimba::GetSupportedArchitectureAtIndex(uint32_t idx,
                                                       ArchSpec &arch) {
   if (idx == 0) {
     arch = ArchSpec("kalimba3-csr-unknown");
     return true;
   }
   if (idx == 1) {
     arch = ArchSpec("kalimba4-csr-unknown");

lldb/trunk/source/Plugins/Platform/Linux/PlatformLinux.h

public:
   // lldb_private::Platform functions
   //------------------------------------------------------------
   const char *GetDescription() override {
     return GetPluginDescriptionStatic(IsHost());
   }
 
   void GetStatus(Stream &strm) override;
 
-  Error GetFileWithUUID(const FileSpec &platform_file, const UUID *uuid,
-                        FileSpec &local_file) override;
-
-  bool GetProcessInfo(lldb::pid_t pid, ProcessInstanceInfo &proc_info) override;
-
-  uint32_t FindProcesses(const ProcessInstanceInfoMatch &match_info,
-                         ProcessInstanceInfoList &process_infos) override;
-
   bool GetSupportedArchitectureAtIndex(uint32_t idx, ArchSpec &arch) override;
 
   int32_t GetResumeCountForLaunchInfo(ProcessLaunchInfo &launch_info) override;
 
   bool CanDebugProcess() override;
 
   lldb::ProcessSP DebugProcess(ProcessLaunchInfo &launch_info,
                                Debugger &debugger, Target *target,
                                Error &error) override;
 
   void CalculateTrapHandlerSymbolNames() override;
 
   uint64_t ConvertMmapFlagsToPlatform(const ArchSpec &arch,
                                       unsigned flags) override;
 
-  ConstString GetFullNameForDylib(ConstString basename) override;
-
 private:
   DISALLOW_COPY_AND_ASSIGN(PlatformLinux);
 };
 
 } // namespace platform_linux
 } // namespace lldb_private
 
 #endif // liblldb_PlatformLinux_h_

lldb/trunk/source/Plugins/Platform/Linux/PlatformLinux.cpp

if (g_initialize_count > 0) {
     if (--g_initialize_count == 0) {
       PluginManager::UnregisterPlugin(PlatformLinux::CreateInstance);
     }
   }
 
   PlatformPOSIX::Terminate();
 }
 
-Error PlatformLinux::GetFileWithUUID(const FileSpec &platform_file,
-                                     const UUID *uuid_ptr,
-                                     FileSpec &local_file) {
-  if (IsRemote()) {
-    if (m_remote_platform_sp)
-      return m_remote_platform_sp->GetFileWithUUID(platform_file, uuid_ptr,
-                                                   local_file);
-  }
-
-  // Default to the local case
-  local_file = platform_file;
-  return Error();
-}
-
 //------------------------------------------------------------------
 /// Default Constructor
 //------------------------------------------------------------------
 PlatformLinux::PlatformLinux(bool is_host)
     : PlatformPOSIX(is_host) // This is the local host platform
 {}
 
-//------------------------------------------------------------------
-/// Destructor.
-///
-/// The destructor is virtual since this class is designed to be
-/// inherited from by the plug-in instance.
-//------------------------------------------------------------------
 PlatformLinux::~PlatformLinux() = default;
 
-bool PlatformLinux::GetProcessInfo(lldb::pid_t pid,
-                                   ProcessInstanceInfo &process_info) {
-  bool success = false;
-  if (IsHost()) {
-    success = Platform::GetProcessInfo(pid, process_info);
-  } else {
-    if (m_remote_platform_sp)
-      success = m_remote_platform_sp->GetProcessInfo(pid, process_info);
-  }
-  return success;
-}
-
-uint32_t
-PlatformLinux::FindProcesses(const ProcessInstanceInfoMatch &match_info,
-                             ProcessInstanceInfoList &process_infos) {
-  uint32_t match_count = 0;
-  if (IsHost()) {
-    // Let the base class figure out the host details
-    match_count = Platform::FindProcesses(match_info, process_infos);
-  } else {
-    // If we are remote, we can only return results if we are connected
-    if (m_remote_platform_sp)
-      match_count =
-          m_remote_platform_sp->FindProcesses(match_info, process_infos);
-  }
-  return match_count;
-}
-
 bool PlatformLinux::GetSupportedArchitectureAtIndex(uint32_t idx,
                                                     ArchSpec &arch) {
   if (IsHost()) {
     ArchSpec hostArch = HostInfo::GetArchitecture(HostInfo::eArchKindDefault);
     if (hostArch.GetTriple().isOSLinux()) {
       if (idx == 0) {
         arch = hostArch;
         return arch.IsValid();
uint64_t PlatformLinux::ConvertMmapFlagsToPlatform(const ArchSpec &arch,
 
   if (flags & eMmapFlagsPrivate)
     flags_platform |= MAP_PRIVATE;
   if (flags & eMmapFlagsAnon)
     flags_platform |= map_anon;
   return flags_platform;
 }
 
-ConstString PlatformLinux::GetFullNameForDylib(ConstString basename) {
-  if (basename.IsEmpty())
-    return basename;
-
-  StreamString stream;
-  stream.Printf("lib%s.so", basename.GetCString());
-  return ConstString(stream.GetString());
-}

lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.h

GetSharedModule(const lldb_private::ModuleSpec &module_spec,
                   const lldb_private::FileSpecList *module_search_paths_ptr,
                   lldb::ModuleSP *old_module_sp_ptr,
                   bool *did_create_ptr) override;
 
   size_t GetSoftwareBreakpointTrapOpcode(
       lldb_private::Target &target,
       lldb_private::BreakpointSite *bp_site) override;
 
-  bool GetProcessInfo(lldb::pid_t pid,
-                      lldb_private::ProcessInstanceInfo &proc_info) override;
-
   lldb::BreakpointSP
   SetThreadCreationBreakpoint(lldb_private::Target &target) override;
 
-  uint32_t
-  FindProcesses(const lldb_private::ProcessInstanceInfoMatch &match_info,
-                lldb_private::ProcessInstanceInfoList &process_infos) override;
-
   bool ModuleIsExcludedForUnconstrainedSearches(
       lldb_private::Target &target, const lldb::ModuleSP &module_sp) override;
 
   bool ARMGetSupportedArchitectureAtIndex(uint32_t idx,
                                           lldb_private::ArchSpec &arch);
 
   bool x86GetSupportedArchitectureAtIndex(uint32_t idx,
                                           lldb_private::ArchSpec &arch);

lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp

PlatformDarwin::GetSoftwareBreakpointTrapOpcode(Target &target,
 
   if (trap_opcode && trap_opcode_size) {
     if (bp_site->SetTrapOpcode(trap_opcode, trap_opcode_size))
       return trap_opcode_size;
   }
   return 0;
 }
 
-bool PlatformDarwin::GetProcessInfo(lldb::pid_t pid,
-                                    ProcessInstanceInfo &process_info) {
-  bool success = false;
-  if (IsHost()) {
-    success = Platform::GetProcessInfo(pid, process_info);
-  } else {
-    if (m_remote_platform_sp)
-      success = m_remote_platform_sp->GetProcessInfo(pid, process_info);
-  }
-  return success;
-}
-
-uint32_t
-PlatformDarwin::FindProcesses(const ProcessInstanceInfoMatch &match_info,
-                              ProcessInstanceInfoList &process_infos) {
-  uint32_t match_count = 0;
-  if (IsHost()) {
-    // Let the base class figure out the host details
-    match_count = Platform::FindProcesses(match_info, process_infos);
-  } else {
-    // If we are remote, we can only return results if we are connected
-    if (m_remote_platform_sp)
-      match_count =
-          m_remote_platform_sp->FindProcesses(match_info, process_infos);
-  }
-  return match_count;
-}
-
 bool PlatformDarwin::ModuleIsExcludedForUnconstrainedSearches(
     lldb_private::Target &target, const lldb::ModuleSP &module_sp) {
   if (!module_sp)
     return false;
 
   ObjectFile *obj_file = module_sp->GetObjectFile();
   if (!obj_file)
     return false;

lldb/trunk/source/Plugins/Platform/NetBSD/PlatformNetBSD.h

public:
   Error DisconnectRemote() override;
 
   const char *GetHostname() override;
 
   const char *GetUserName(uint32_t uid) override;
 
   const char *GetGroupName(uint32_t gid) override;
 
-  bool GetProcessInfo(lldb::pid_t pid, ProcessInstanceInfo &proc_info) override;
-
-  uint32_t FindProcesses(const ProcessInstanceInfoMatch &match_info,
-                         ProcessInstanceInfoList &process_infos) override;
-
   Error LaunchProcess(ProcessLaunchInfo &launch_info) override;
 
   lldb::ProcessSP Attach(ProcessAttachInfo &attach_info, Debugger &debugger,
                          Target *target, Error &error) override;
 
   // NetBSD processes can not be launched by spawning and attaching.
   bool CanDebugProcess() override { return false; }
 
-  // Only on PlatformMacOSX:
-  Error GetFileWithUUID(const FileSpec &platform_file, const UUID *uuid,
-                        FileSpec &local_file) override;
-
   Error GetSharedModule(const ModuleSpec &module_spec, Process *process,
                         lldb::ModuleSP &module_sp,
                         const FileSpecList *module_search_paths_ptr,
                         lldb::ModuleSP *old_module_sp_ptr,
                         bool *did_create_ptr) override;
 
   bool GetSupportedArchitectureAtIndex(uint32_t idx, ArchSpec &arch) override;
 

lldb/trunk/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp

if (m_remote_platform_sp)
       return m_remote_platform_sp->RunShellCommand(command, working_dir,
                                                    status_ptr, signo_ptr,
                                                    command_output, timeout_sec);
     else
       return Error("unable to run a remote command without a platform");
   }
 }
 
-// From PlatformMacOSX only
-Error PlatformNetBSD::GetFileWithUUID(const FileSpec &platform_file,
-                                      const UUID *uuid_ptr,
-                                      FileSpec &local_file) {
-  if (IsRemote()) {
-    if (m_remote_platform_sp)
-      return m_remote_platform_sp->GetFileWithUUID(platform_file, uuid_ptr,
-                                                   local_file);
-  }
-
-  // Default to the local case
-  local_file = platform_file;
-  return Error();
-}
-
 //------------------------------------------------------------------
 /// Default Constructor
 //------------------------------------------------------------------
 PlatformNetBSD::PlatformNetBSD(bool is_host)
     : Platform(is_host), m_remote_platform_sp() {}
 
 bool PlatformNetBSD::GetRemoteOSVersion() {
   if (m_remote_platform_sp)
if (IsHost()) {
     if (m_remote_platform_sp)
       error = m_remote_platform_sp->DisconnectRemote();
     else
       error.SetErrorString("the platform is not currently connected");
   }
   return error;
 }
 
-bool PlatformNetBSD::GetProcessInfo(lldb::pid_t pid,
-                                    ProcessInstanceInfo &process_info) {
-  bool success = false;
-  if (IsHost()) {
-    success = Platform::GetProcessInfo(pid, process_info);
-  } else if (m_remote_platform_sp) {
-    success = m_remote_platform_sp->GetProcessInfo(pid, process_info);
-  }
-  return success;
-}
-
-uint32_t
-PlatformNetBSD::FindProcesses(const ProcessInstanceInfoMatch &match_info,
-                              ProcessInstanceInfoList &process_infos) {
-  uint32_t match_count = 0;
-  if (IsHost()) {
-    // Let the base class figure out the host details
-    match_count = Platform::FindProcesses(match_info, process_infos);
-  } else {
-    // If we are remote, we can only return results if we are connected
-    if (m_remote_platform_sp)
-      match_count =
-          m_remote_platform_sp->FindProcesses(match_info, process_infos);
-  }
-  return match_count;
-}
-
 const char *PlatformNetBSD::GetUserName(uint32_t uid) {
   // Check the cache in Platform in case we have already looked this uid up
   const char *user_name = Platform::GetUserName(uid);
   if (user_name)
     return user_name;
 
   if (IsRemote() && m_remote_platform_sp)
     return m_remote_platform_sp->GetUserName(uid);

lldb/trunk/source/Plugins/Platform/POSIX/PlatformPOSIX.h

lldb_private::Error RunShellCommand(
           *command_output, // Pass nullptr if you don't want the command output
       uint32_t timeout_sec)
       override; // Timeout in seconds to wait for shell program to finish
 
   lldb_private::Error ResolveExecutable(const lldb_private::ModuleSpec &module_spec,
       lldb::ModuleSP &module_sp,
       const lldb_private::FileSpecList *module_search_paths_ptr) override;
 
+  lldb_private::Error GetFileWithUUID(const lldb_private::FileSpec &platform_file, const lldb_private::UUID *uuid,
+                        lldb_private::FileSpec &local_file) override;
+
+  bool GetProcessInfo(lldb::pid_t pid, lldb_private::ProcessInstanceInfo &proc_info) override;
+
+  uint32_t FindProcesses(const lldb_private::ProcessInstanceInfoMatch &match_info,
+                         lldb_private::ProcessInstanceInfoList &process_infos) override;
+
   lldb_private::Error MakeDirectory(const lldb_private::FileSpec &file_spec,
                                     uint32_t mode) override;
 
   lldb_private::Error
   GetFilePermissions(const lldb_private::FileSpec &file_spec,
                      uint32_t &file_permissions) override;
 
   lldb_private::Error
lldb::ProcessSP ConnectProcess(llvm::StringRef connect_url,
                                  llvm::StringRef plugin_name,
                                  lldb_private::Debugger &debugger,
                                  lldb_private::Target *target,
                                  lldb_private::Error &error) override;
 
   size_t ConnectToWaitingProcesses(lldb_private::Debugger &debugger,
                                    lldb_private::Error &error) override;
 
+  lldb_private::ConstString GetFullNameForDylib(lldb_private::ConstString basename) override;
+
 protected:
   std::unique_ptr<lldb_private::OptionGroupPlatformRSync>
       m_option_group_platform_rsync;
   std::unique_ptr<lldb_private::OptionGroupPlatformSSH>
       m_option_group_platform_ssh;
   std::unique_ptr<lldb_private::OptionGroupPlatformCaching>
       m_option_group_platform_caching;
 

lldb/trunk/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp

// it another try.
         }
       }
     }
   }
 
   return error;
 }
 
+Error PlatformPOSIX::GetFileWithUUID(const FileSpec &platform_file,
+                                       const UUID *uuid_ptr,
+                                       FileSpec &local_file) {
+  if (IsRemote() && m_remote_platform_sp)
+      return m_remote_platform_sp->GetFileWithUUID(platform_file, uuid_ptr,
+                                                   local_file);
+
+  // Default to the local case
+  local_file = platform_file;
+  return Error();
+}
+
+bool PlatformPOSIX::GetProcessInfo(lldb::pid_t pid,
+                                     ProcessInstanceInfo &process_info) {
+  if (IsHost())
+    return Platform::GetProcessInfo(pid, process_info);
+  if (m_remote_platform_sp)
+    return m_remote_platform_sp->GetProcessInfo(pid, process_info);
+  return false;
+}
+
+uint32_t
+PlatformPOSIX::FindProcesses(const ProcessInstanceInfoMatch &match_info,
+                               ProcessInstanceInfoList &process_infos) {
+  if (IsHost())
+    return Platform::FindProcesses(match_info, process_infos);
+  if (m_remote_platform_sp)
+    return
+      m_remote_platform_sp->FindProcesses(match_info, process_infos);
+  return 0;
+}
+
 Error PlatformPOSIX::MakeDirectory(const FileSpec &file_spec,
                                    uint32_t file_permissions) {
   if (m_remote_platform_sp)
     return m_remote_platform_sp->MakeDirectory(file_spec, file_permissions);
   else
     return Platform::MakeDirectory(file_spec, file_permissions);
 }
 

 }
 
 size_t PlatformPOSIX::ConnectToWaitingProcesses(Debugger &debugger,
                                                 Error &error) {
   if (m_remote_platform_sp)
     return m_remote_platform_sp->ConnectToWaitingProcesses(debugger, error);
   return Platform::ConnectToWaitingProcesses(debugger, error);
 }
+
+ConstString PlatformPOSIX::GetFullNameForDylib(ConstString basename) {
+  if (basename.IsEmpty())
+    return basename;
+
+  StreamString stream;
+  stream.Printf("lib%s.so", basename.GetCString());
+  return ConstString(stream.GetString());
+}