handle edge cases better

Author: cs01

lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp

@@ -480,21 +480,30 @@ std::string PlatformAndroid::GetRunAs() {
 uint32_t
 PlatformAndroid::FindProcesses(const ProcessInstanceInfoMatch &match_info,
                                ProcessInstanceInfoList &proc_infos) {
-  // Use the parent implementation for host platform
+  proc_infos.clear();
+
+  // When LLDB is running natively on an Android device (IsHost() == true),
+  // use the parent class's standard Linux /proc enumeration. IsHost() is only
+  // true when compiled for Android (#if defined(__ANDROID__)), so calling
+  // PlatformLinux methods is safe (Android is Linux-based).
   if (IsHost())
     return PlatformLinux::FindProcesses(match_info, proc_infos);
 
-  // For remote Android platform, implement process name lookup using adb
-  proc_infos.clear();
+  // Remote Android platform: implement process name lookup using 'pidof' over
+  // adb.
 
-  // Check if we're looking for a process by name
+  // LLDB stores the search name in GetExecutableFile() (even though it's
+  // actually a process name like "com.android.chrome" rather than an
+  // executable path). If no search name is provided, we can't use
+  // 'pidof', so return early with no results.
   const ProcessInstanceInfo &match_process_info = match_info.GetProcessInfo();
   if (!match_process_info.GetExecutableFile() ||
       match_info.GetNameMatchType() == NameMatch::Ignore) {
-    // Fall back to the parent implementation if not searching by name
-    return PlatformLinux::FindProcesses(match_info, proc_infos);
+    return 0;
   }
 
+  // Extract the process name to search for (typically an Android package name
+  // like "com.example.app" or binary name like "app_process64")
   std::string process_name = match_process_info.GetExecutableFile().GetPath();
   if (process_name.empty())
     return 0;
@@ -509,10 +518,12 @@ PlatformAndroid::FindProcesses(const ProcessInstanceInfoMatch &match_info,
     return 0;
   }
 
-  // Use 'pidof' command to get the PID for the process name
+  // Use 'pidof' command to get PIDs for the process name.
+  // Quote the process name to handle special characters (spaces, etc.)
   std::string pidof_output;
-  std::string command = "pidof " + process_name;
-  error = adb->Shell(command.c_str(), seconds(5), &pidof_output);
+  StreamString command;
+  command.Printf("pidof '%s'", process_name.c_str());
+  error = adb->Shell(command.GetData(), seconds(5), &pidof_output);
 
   if (error.Fail()) {
     Log *log = GetLog(LLDBLog::Platform);
@@ -521,39 +532,54 @@ PlatformAndroid::FindProcesses(const ProcessInstanceInfoMatch &match_info,
     return 0;
   }
 
-  // Parse the PID from pidof output
+  // Parse PIDs from pidof output.
+  // Note: pidof can return multiple PIDs (space-separated) if multiple
+  // instances of the same executable are running.
   pidof_output = llvm::StringRef(pidof_output).trim().str();
   if (pidof_output.empty()) {
-    // No process found with that name
-    return 0;
-  }
-
-  // Parse the output as a single PID
-  lldb::pid_t pid;
-  if (!llvm::to_integer(pidof_output, pid)) {
     Log *log = GetLog(LLDBLog::Platform);
-    LLDB_LOGF(log, "PlatformAndroid::%s failed to parse PID from output: '%s'",
-              __FUNCTION__, pidof_output.c_str());
+    LLDB_LOGF(log, "PlatformAndroid::%s no process found with name '%s'",
+              __FUNCTION__, process_name.c_str());
     return 0;
   }
 
-  // Create ProcessInstanceInfo for the found process
-  ProcessInstanceInfo process_info;
-  process_info.SetProcessID(pid);
-  process_info.GetExecutableFile().SetFile(process_name,
-                                           FileSpec::Style::posix);
+  // Split the output by whitespace to handle multiple PIDs
+  llvm::SmallVector<llvm::StringRef, 8> pid_strings;
+  llvm::StringRef(pidof_output).split(pid_strings, ' ', -1, false);
 
-  // Check if this process matches the criteria
-  if (match_info.Matches(process_info)) {
-    proc_infos.push_back(process_info);
+  uint32_t num_matches = 0;
+  for (llvm::StringRef pid_str : pid_strings) {
+    pid_str = pid_str.trim();
+    if (pid_str.empty())
+      continue;
 
-    Log *log = GetLog(LLDBLog::Platform);
-    LLDB_LOGF(log, "PlatformAndroid::%s found process '%s' with PID %llu",
-              __FUNCTION__, process_name.c_str(), (unsigned long long)pid);
-    return 1;
+    lldb::pid_t pid;
+    if (!llvm::to_integer(pid_str, pid)) {
+      Log *log = GetLog(LLDBLog::Platform);
+      LLDB_LOGF(log,
+                "PlatformAndroid::%s failed to parse PID from output: '%s'",
+                __FUNCTION__, pid_str.str().c_str());
+      continue;
+    }
+
+    // Create ProcessInstanceInfo for the found process
+    ProcessInstanceInfo process_info;
+    process_info.SetProcessID(pid);
+    process_info.GetExecutableFile().SetFile(process_name,
+                                             FileSpec::Style::posix);
+
+    // Check if this process matches the criteria
+    if (match_info.Matches(process_info)) {
+      proc_infos.push_back(process_info);
+      num_matches++;
+
+      Log *log = GetLog(LLDBLog::Platform);
+      LLDB_LOGF(log, "PlatformAndroid::%s found process '%s' with PID %llu",
+                __FUNCTION__, process_name.c_str(), (unsigned long long)pid);
+    }
   }
 
-  return 0;
+  return num_matches;
 }
 
 std::unique_ptr<AdbSyncService> PlatformAndroid::GetSyncService(Status &error) {