Add support for enable/disable instrumentation-runtime plugins

Author: dmpots

lldb/include/lldb/Core/PluginManager.h

@@ -544,6 +544,12 @@ class PluginManager {
   static InstrumentationRuntimeCreateInstance
   GetInstrumentationRuntimeCreateCallbackAtIndex(uint32_t idx);
 
+  static std::vector<RegisteredPluginInfo>
+  GetInstrumentationRuntimePluginInfo();
+
+  static bool SetInstrumentationRuntimePluginEnabled(llvm::StringRef name,
+                                                     bool enabled);
+
   // TypeSystem
   static bool RegisterPlugin(llvm::StringRef name, llvm::StringRef description,
                              TypeSystemCreateInstance create_callback,

lldb/source/Core/PluginManager.cpp

@@ -186,7 +186,10 @@ llvm::ArrayRef<PluginNamespace> PluginManager::GetPluginNamespaces() {
   // over time.
   static PluginNamespace PluginNamespaces[] = {
       {"system-runtime", PluginManager::GetSystemRuntimePluginInfo,
-       PluginManager::SetSystemRuntimePluginEnabled}};
+       PluginManager::SetSystemRuntimePluginEnabled},
+      {"instrumentation-runtime",
+       PluginManager::GetInstrumentationRuntimePluginInfo,
+       PluginManager::SetInstrumentationRuntimePluginEnabled}};
 
   return PluginNamespaces;
 }
@@ -1546,6 +1549,16 @@ PluginManager::GetInstrumentationRuntimeCreateCallbackAtIndex(uint32_t idx) {
   return GetInstrumentationRuntimeInstances().GetCallbackAtIndex(idx);
 }
 
+std::vector<RegisteredPluginInfo>
+PluginManager::GetInstrumentationRuntimePluginInfo() {
+  return GetInstrumentationRuntimeInstances().GetPluginInfoForAllInstances();
+}
+
+bool PluginManager::SetInstrumentationRuntimePluginEnabled(llvm::StringRef name,
+                                                           bool enable) {
+  return GetInstrumentationRuntimeInstances().SetInstanceEnabled(name, enable);
+}
+
 #pragma mark TypeSystem
 
 struct TypeSystemInstance : public PluginInstance<TypeSystemCreateInstance> {

lldb/test/Shell/Commands/command-plugin-enable+disable.test

@@ -47,6 +47,16 @@ plugin enable system-runtime
 # CHECK: system-runtime
 # CHECK:  [+] systemruntime-macosx           System runtime plugin for Mac OS X native libraries
 
+# Test plugin enable/disable for instrumentation plugin works.
+plugin enable instrumentation-runtime
+# CHECK-LABEL: plugin enable instrumentation-runtime
+# CHECK: instrumentation-runtime
+# CHECK:  [+] AddressSanitizer
+plugin disable instrumentation-runtime
+# CHECK-LABEL: plugin disable instrumentation-runtime
+# CHECK: instrumentation-runtime
+# CHECK:  [-] AddressSanitizer
+
 # Test plugin enable/disable for unknown plugin returns an error.
 # RUN: %lldb -o "plugin enable some-plugin-that-does-not-exist" 2>&1 | FileCheck %s --check-prefix=ERROR_PLUGIN_NOT_FOUND
 # RUN: %lldb -o "plugin disable some-plugin-that-does-not-exist" 2>&1 | FileCheck %s --check-prefix=ERROR_PLUGIN_NOT_FOUND

lldb/test/Shell/Commands/command-plugin-list.test

@@ -12,6 +12,8 @@ plugin list
 # CHECK-LABEL: plugin list
 # CHECK: system-runtime
 # CHECK:  [+] systemruntime-macosx           System runtime plugin for Mac OS X native libraries
+# CHECK: instrumentation-runtime
+# CHECK:  [+] AddressSanitizer               AddressSanitizer instrumentation runtime plugin.
 
 # Test plugin list works with fully qualified name.
 plugin list system-runtime.systemruntime-macosx
@@ -29,14 +31,23 @@ plugin list system-runtime
 plugin list --json
 # CHECK-LABEL plugin list --json
 # CHECK: {
+# CHECK-DAG:  "system-runtime":
+# CHECK-DAG:  "instrumentation-runtime":
+# CHECK: }
+
+# Test json output for plugin list with a namespace
+plugin list system-runtime --json
+# CHECK-LABEL plugin list --json
+# CHECK: {
 # CHECK:  "system-runtime": [
 # CHECK:    {
-# CHECK-DAG:  "enabled": true,
+# CHECK-DAG:  "enabled": true
 # CHECK-DAG:  "name": "systemruntime-macosx"
 # CHECK:    }
 # CHECK:  ]
 # CHECK: }
 
+
 # Test plugin list does not match a plugin name by substring.
 # RUN: %lldb -o "plugin list macosx" 2>&1 | FileCheck %s --check-prefix=ERROR_PLUGIN_NOT_FOUND