Revert "[lldb-vscode] Send Statistics Dump in terminated event"

This reverts commit e3ccbae.

There is a bug which is failing the test running on mac.

Author: GeorgeHuyubo

lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py

@@ -369,13 +369,7 @@ def wait_for_stopped(self, timeout=None):
     def wait_for_exited(self):
         event_dict = self.wait_for_event('exited')
         if event_dict is None:
-            raise ValueError("didn't get exited event")
-        return event_dict
-
-    def wait_for_terminated(self):
-        event_dict = self.wait_for_event('terminated')
-        if event_dict is None:
-            raise ValueError("didn't get terminated event")
+            raise ValueError("didn't get stopped event")
         return event_dict
 
     def get_initialize_value(self, key):

lldb/test/API/tools/lldb-vscode/terminated-event/Makefile

@@ -19,8 +19,6 @@
 #include "lldb/API/SBBreakpoint.h"
 #include "lldb/API/SBBreakpointLocation.h"
 #include "lldb/API/SBDeclaration.h"
-#include "lldb/API/SBStringList.h"
-#include "lldb/API/SBStructuredData.h"
 #include "lldb/API/SBValue.h"
 #include "lldb/Host/PosixApi.h"
 
@@ -1142,73 +1140,6 @@ CreateRunInTerminalReverseRequest(const llvm::json::Object &launch_request,
   return reverse_request;
 }
 
-// Keep all the top level items from the statistics dump, except for the
-// "modules" array. It can be huge and cause delay
-// Array and dictionary value will return as <key, JSON string> pairs
-void FilterAndGetValueForKey(const lldb::SBStructuredData data, const char *key,
-                             llvm::json::Object &out) {
-  lldb::SBStructuredData value = data.GetValueForKey(key);
-  std::string key_utf8 = llvm::json::fixUTF8(key);
-  if (strcmp(key, "modules") == 0)
-    return;
-  switch (value.GetType()) {
-  case lldb::eStructuredDataTypeFloat:
-    out.try_emplace(key_utf8, value.GetFloatValue());
-    break;
-  case lldb::eStructuredDataTypeInteger:
-    out.try_emplace(key_utf8, value.GetIntegerValue());
-    break;
-  case lldb::eStructuredDataTypeArray: {
-    lldb::SBStream contents;
-    value.GetAsJSON(contents);
-    EmplaceSafeString(out, key, contents.GetData());
-  } break;
-  case lldb::eStructuredDataTypeBoolean:
-    out.try_emplace(key_utf8, value.GetBooleanValue());
-    break;
-  case lldb::eStructuredDataTypeString: {
-    // Get the string size before reading
-    const size_t str_length = value.GetStringValue(nullptr, 0);
-    std::string str(str_length + 1, 0);
-    value.GetStringValue(&str[0], str_length);
-    EmplaceSafeString(out, key, str);
-  } break;
-  case lldb::eStructuredDataTypeDictionary: {
-    lldb::SBStream contents;
-    value.GetAsJSON(contents);
-    EmplaceSafeString(out, key, contents.GetData());
-  } break;
-  case lldb::eStructuredDataTypeNull:
-  case lldb::eStructuredDataTypeGeneric:
-  case lldb::eStructuredDataTypeInvalid:
-    break;
-  }
-}
-
-void addStatistic(llvm::json::Object &event) {
-  lldb::SBStructuredData statistics = g_vsc.target.GetStatistics();
-  bool is_dictionary =
-      statistics.GetType() == lldb::eStructuredDataTypeDictionary;
-  if (!is_dictionary)
-    return;
-  llvm::json::Object stats_body;
-
-  lldb::SBStringList keys;
-  if (!statistics.GetKeys(keys))
-    return;
-  for (size_t i = 0; i < keys.GetSize(); i++) {
-    const char *key = keys.GetStringAtIndex(i);
-    FilterAndGetValueForKey(statistics, key, stats_body);
-  }
-  event.try_emplace("statistics", std::move(stats_body));
-}
-
-llvm::json::Object CreateTerminatedEventObject() {
-  llvm::json::Object event(CreateEventObject("terminated"));
-  addStatistic(event);
-  return event;
-}
-
 std::string JSONToString(const llvm::json::Value &json) {
   std::string data;
   llvm::raw_string_ostream os(data);

lldb/test/API/tools/lldb-vscode/terminated-event/TestVSCode_terminatedEvent.py

@@ -485,12 +485,6 @@ CreateRunInTerminalReverseRequest(const llvm::json::Object &launch_request,
                                   llvm::StringRef debug_adaptor_path,
                                   llvm::StringRef comm_file);
 
-/// Create a "Terminated" JSON object that contains statistics
-///
-/// \return
-///     A body JSON object with debug info and breakpoint info
-llvm::json::Object CreateTerminatedEventObject();
-
 /// Convert a given JSON object to a string.
 std::string JSONToString(const llvm::json::Value &json);
 

lldb/test/API/tools/lldb-vscode/terminated-event/foo.cpp

@@ -204,7 +204,7 @@ void SendTerminatedEvent() {
     g_vsc.sent_terminated_event = true;
     g_vsc.RunTerminateCommands();
     // Send a "terminated" event
-    llvm::json::Object event(CreateTerminatedEventObject());
+    llvm::json::Object event(CreateEventObject("terminated"));
     g_vsc.SendJSON(llvm::json::Value(std::move(event)));
   }
 }
@@ -2949,7 +2949,7 @@ void request_variables(const llvm::json::Object &request) {
       const uint32_t addr_size = g_vsc.target.GetProcess().GetAddressByteSize();
       lldb::SBValue reg_set = g_vsc.variables.registers.GetValueAtIndex(0);
       const uint32_t num_regs = reg_set.GetNumChildren();
-      for (uint32_t reg_idx = 0; reg_idx < num_regs; ++reg_idx) {
+      for (uint32_t reg_idx=0; reg_idx<num_regs; ++reg_idx) {
         lldb::SBValue reg = reg_set.GetChildAtIndex(reg_idx);
         const lldb::Format format = reg.GetFormat();
         if (format == lldb::eFormatDefault || format == lldb::eFormatHex) {