reconcile with main

Author: oontvoo

lldb/include/lldb/Core/Telemetry.h

@@ -89,7 +89,6 @@ struct LLDBBaseTelemetryInfo : public llvm::telemetry::TelemetryInfo {
   void serialize(llvm::telemetry::Serializer &serializer) const override;
 };
 
-
 /// Describes an exit status.
 struct ExitDescription {
   int exit_code;
@@ -101,6 +100,8 @@ struct TargetInfo : public LLDBBaseTelemetryInfo {
 
   /// The same as the executable-module's UUID.
   UUID target_uuid;
+  /// PID of the process owned by this target.
+  lldb::pid_t pid;
   std::string arch_name;
 
   /// If true, this entry was emitted at the beginning of an event (eg., before
@@ -123,7 +124,7 @@ struct TargetInfo : public LLDBBaseTelemetryInfo {
   }
   void serialize(llvm::telemetry::Serializer &serializer) const override;
 };
-  
+
 struct CommandInfo : public LLDBBaseTelemetryInfo {
   /// If the command is/can be associated with a target entry this field
   /// contains that target's UUID. <EMPTY> otherwise.

lldb/source/Core/Telemetry.cpp

@@ -77,7 +77,6 @@ void CommandInfo::serialize(Serializer &serializer) const {
     serializer.write("error_data", error_data.value());
 }
 
-  
 std::atomic<uint64_t> CommandInfo::g_command_id_seed = 0;
 uint64_t CommandInfo::GetNextId() { return g_command_id_seed.fetch_add(1); }
 
@@ -136,7 +135,6 @@ class NoOpTelemetryManager : public TelemetryManager {
     static std::unique_ptr<NoOpTelemetryManager> g_ins =
         std::make_unique<NoOpTelemetryManager>();
     return g_ins.get();
-
   }
 };
 

lldb/source/Target/Process.cpp

@@ -1065,18 +1065,24 @@ const char *Process::GetExitDescription() {
 bool Process::SetExitStatus(int status, llvm::StringRef exit_string) {
   // Use a mutex to protect setting the exit status.
   std::lock_guard<std::mutex> guard(m_exit_status_mutex);
-  Debugger *debugger = &(GetTarget().GetDebugger());
-  telemetry::ScopedDispatcher<telemetry::TargetInfo> helper(debugger);
-  // Save the Module UUID since the Module might be gone by end of scope.
-  UUID target_uuid = GetTarget().GetExecutableModule()->GetUUID();
+  telemetry::ScopedDispatcher<telemetry::TargetInfo> helper;
 
+  // Check if there is (still) a valid target and get the debugger from it.
+  TargetSP target_sp(Debugger::FindTargetWithProcessID(m_pid));
+  if (target_sp)
+    helper.SetDebugger(&(target_sp->GetDebugger()));
+
+  // TODO: Find the executable-module's UUID somehow. (Maybe save the UUID in
+  // Target?) We might not have a valid executable-mod anymore.
   helper.DispatchNow([&](telemetry::TargetInfo *info) {
-    info->target_uuid = target_uuid;
+    // info->target_uuid = target_uuid;
+    info->pid = m_pid;
     info->is_start_entry = true;
   });
 
   helper.DispatchOnExit([&](telemetry::TargetInfo *info) {
-    info->target_uuid = target_uuid;
+    // info->target_uuid = target_uuid;
+    info->pid = m_pid;
     info->exit_desc = {status, exit_string.str()};
   });
 

lldb/source/Target/Target.cpp

@@ -1565,16 +1565,21 @@ void Target::SetExecutableModule(ModuleSP &executable_sp,
   ClearModules(false);
 
   if (executable_sp) {
+    lldb::pid_t pid;
+    if (ProcessSP proc = GetProcessSP())
+      pid = proc->GetID();
     helper.DispatchNow([&](telemetry::TargetInfo *info) {
       info->exec_mod = executable_sp;
       info->target_uuid = executable_sp->GetUUID();
+      info->pid = pid;
       info->arch_name = executable_sp->GetArchitecture().GetArchitectureName();
       info->is_start_entry = true;
     });
 
     helper.DispatchOnExit([&](telemetry::TargetInfo *info) {
       info->exec_mod = executable_sp;
       info->target_uuid = executable_sp->GetUUID();
+      info->pid = pid;
     });
 
     ElapsedTime elapsed(m_stats.GetCreateTime());