more fixing

Author: oontvoo

lldb/include/lldb/Core/Telemetry.h

@@ -155,11 +155,10 @@ struct DebuggerInfo : public LLDBBaseTelemetryInfo {
   void serialize(llvm::telemetry::Serializer &serializer) const override;
 };
 
-struct ExecModuleInfo : public LLDBBaseTelemetryInfo {
+struct ExecutableModuleInfo : public LLDBBaseTelemetryInfo {
   lldb::ModuleSP exec_mod;
-
   /// The same as the executable-module's UUID.
-  UUID exec_uuid;
+  UUID uuid;
   /// PID of the process owned by this target.
   lldb::pid_t pid = LLDB_INVALID_PROCESS_ID;
   /// The triple of this executable module.
@@ -170,7 +169,7 @@ struct ExecModuleInfo : public LLDBBaseTelemetryInfo {
   /// event (eg., after the module and any dependency were loaded.)
   bool is_start_entry = false;
 
-  ExecModuleInfo() = default;
+  ExecutableModuleInfo() = default;
 
   llvm::telemetry::KindType getKind() const override {
     return LLDBEntryKind::ExecModuleInfo;
@@ -191,7 +190,8 @@ struct ExitDescription {
 };
 
 struct ProcessExitInfo : public LLDBBaseTelemetryInfo {
-  UUID exec_uuid;
+  // The executable-module's UUID.
+  UUID module_uuid;
   lldb::pid_t pid = LLDB_INVALID_PROCESS_ID;
   bool is_start_entry = false;
   std::optional<ExitDescription> exit_desc;

lldb/source/Core/Telemetry.cpp

@@ -86,10 +86,10 @@ void DebuggerInfo::serialize(Serializer &serializer) const {
   serializer.write("is_exit_entry", is_exit_entry);
 }
 
-void ExecModuleInfo::serialize(Serializer &serializer) const {
+void ExecutableModuleInfo::serialize(Serializer &serializer) const {
   LLDBBaseTelemetryInfo::serialize(serializer);
 
-  serializer.write("exec_uuid", exec_uuid.GetAsString());
+  serializer.write("uuid", uuid.GetAsString());
   serializer.write("pid", pid);
   serializer.write("triple", triple);
   serializer.write("is_start_entry", is_start_entry);
@@ -98,7 +98,7 @@ void ExecModuleInfo::serialize(Serializer &serializer) const {
 void ProcessExitInfo::serialize(Serializer &serializer) const {
   LLDBBaseTelemetryInfo::serialize(serializer);
 
-  serializer.write("exec_uuid", exec_uuid.GetAsString());
+  serializer.write("module_uuid", module_uuid.GetAsString());
   serializer.write("pid", pid);
   serializer.write("is_start_entry", is_start_entry);
   if (exit_desc.has_value()) {

lldb/source/Target/Process.cpp

@@ -1072,19 +1072,19 @@ bool Process::SetExitStatus(int status, llvm::StringRef exit_string) {
   // Find the executable-module's UUID, if available.
   Target &target = GetTarget();
   helper.SetDebugger(&(target.GetDebugger()));
-  UUID exec_uuid;
-  if (ModuleSP exec_mod = target.GetExecutableModule())
-    exec_uuid = exec_mod->GetUUID();
+  UUID module_uuid;
+  if (ModuleSP mod = target.GetExecutableModule())
+    module_uuid = mod->GetUUID();
 
   helper.DispatchNow([&](telemetry::ProcessExitInfo *info) {
-    info->exec_uuid = exec_uuid;
+    info->module_uuid = module_uuid;
     info->pid = m_pid;
     info->is_start_entry = true;
     info->exit_desc = {status, exit_string.str()};
   });
 
   helper.DispatchOnExit([&](telemetry::ProcessExitInfo *info) {
-    info->exec_uuid = exec_uuid;
+    info->module_uuid = module_uuid;
     info->pid = m_pid;
   });
 

lldb/source/Target/Target.cpp

@@ -1560,7 +1560,7 @@ void Target::DidExec() {
 
 void Target::SetExecutableModule(ModuleSP &executable_sp,
                                  LoadDependentFiles load_dependent_files) {
-  telemetry::ScopedDispatcher<telemetry::ExecModuleInfo> helper(&m_debugger);
+  telemetry::ScopedDispatcher<telemetry::ExecutableModuleInfo> helper(&m_debugger);
   Log *log = GetLog(LLDBLog::Target);
   ClearModules(false);
 
@@ -1569,17 +1569,17 @@ void Target::SetExecutableModule(ModuleSP &executable_sp,
     if (ProcessSP proc = GetProcessSP())
       pid = proc->GetID();
 
-    helper.DispatchNow([&](telemetry::ExecModuleInfo *info) {
+    helper.DispatchNow([&](telemetry::ExecutableModuleInfo *info) {
       info->exec_mod = executable_sp;
-      info->exec_uuid = executable_sp->GetUUID();
+      info->uuid = executable_sp->GetUUID();
       info->pid = pid;
       info->triple = executable_sp->GetArchitecture().GetTriple().getTriple();
       info->is_start_entry = true;
     });
 
-    helper.DispatchOnExit([&](telemetry::ExecModuleInfo *info) {
+    helper.DispatchOnExit([&](telemetry::ExecutableModuleInfo *info) {
       info->exec_mod = executable_sp;
-      info->exec_uuid = executable_sp->GetUUID();
+      info->uuid = executable_sp->GetUUID();
       info->pid = pid;
     });