Expose GPU information to Telemetry.

content/browser/devtools/devtools_system_info_handler.cc

Index: content/browser/devtools/devtools_system_info_handler.cc
diff --git a/content/browser/devtools/devtools_system_info_handler.cc b/content/browser/devtools/devtools_system_info_handler.cc
new file mode 100644
index 0000000000000000000000000000000000000000..0351f9cb8c9d9abad798369663fa709ad1e7bd7b
--- /dev/null
+++ b/content/browser/devtools/devtools_system_info_handler.cc
@@ -0,0 +1,104 @@
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/browser/devtools/devtools_system_info_handler.h"
+
+#include "base/bind.h"
+#include "base/callback.h"
+#include "base/values.h"
+#include "content/browser/devtools/devtools_protocol_constants.h"
+#include "content/browser/gpu/gpu_data_manager_impl.h"
+#include "gpu/config/gpu_info.h"
+
+namespace content {
+
+namespace {
+
+const char kGPU[] = "gpu";
+const char kVendorId[] = "vendorId";
+const char kDeviceId[] = "deviceId";
+const char kVendorString[] = "vendorString";
+const char kDeviceString[] = "deviceString";
+const char kSecondaryGPUs[] = "secondaryGpus";

[pfeldman, 2013/08/14 09:18:20]

I don't see neither aux gpu attributes nor machine name declared in the schema.
Do they exit? I'd rather return plain list of what you have and declare machine
/ gpu attrs when you have them.

[Ken Russell (switch to Gerrit), 2013/08/14 19:33:16]

Sorry, this was a mistake on my part. The code's been fixed to conform to the
protocol.

+
+class GPUInfoEnumerator : public gpu::GPUInfo::Enumerator {
+ public:
+  GPUInfoEnumerator(base::DictionaryValue* dictionary)
+      : dictionary_(dictionary) { }
+
+  virtual void AddInt64(const char* name, int64 value) OVERRIDE {
+    dictionary_->SetDouble(name, value);

[pfeldman, 2013/08/14 09:18:20]

I don't see these in the schema.

[Ken Russell (switch to Gerrit), 2013/08/14 19:33:16]

Fixed.

+  }
+
+  virtual void AddInt(const char* name, int value) OVERRIDE {
+    dictionary_->SetInteger(name, value);
+  }
+
+  virtual void AddString(const char* name, const std::string& value) OVERRIDE {
+    dictionary_->SetString(name, value);
+  }
+
+  virtual void AddBool(const char* name, bool value) OVERRIDE {
+    dictionary_->SetBoolean(name, value);
+  }
+
+  virtual void AddTimeDeltaInSecondsF(const char* name,
+                                      const base::TimeDelta& value) OVERRIDE {
+    dictionary_->SetDouble(name, value.InSecondsF());
+  }
+
+  virtual void AddGPUDevice(const gpu::GPUInfo::GPUDevice& device) OVERRIDE {
+    base::DictionaryValue* gpu_device = new base::DictionaryValue;
+
+    // Ideally this logic would be in GPUInfo::EnumerateFields, but
+    // describing nested objects would be difficult, and add
+    // undesirable state to the Enumerator.
+    gpu_device->SetInteger(kVendorId, device.vendor_id);
+    gpu_device->SetInteger(kDeviceId, device.device_id);
+    gpu_device->SetString(kVendorString, device.vendor_string);
+    gpu_device->SetString(kDeviceString, device.device_string);
+
+    if (!dictionary_->HasKey(kGPU)) {

[pfeldman, 2013/08/14 09:18:20]

This code would go away if you simply enumerate the devices.

[Ken Russell (switch to Gerrit), 2013/08/14 19:33:16]

Restructured so (nearly) all the enumeration code is in gpu_info.cc.

+      dictionary_->Set(kGPU, gpu_device);
+      return;
+    }
+
+    base::ListValue* secondary_gpus = NULL;
+    if (dictionary_->HasKey(kSecondaryGPUs)) {
+      bool success = dictionary_->GetList(kSecondaryGPUs, &secondary_gpus);
+      DCHECK(success);
+    } else {
+      secondary_gpus = new base::ListValue;
+      dictionary_->Set(kSecondaryGPUs, secondary_gpus);
+    }
+
+    secondary_gpus->Append(gpu_device);
+  }
+
+ private:
+  base::DictionaryValue* dictionary_;
+};
+
+}  // namespace
+
+DevToolsSystemInfoHandler::DevToolsSystemInfoHandler() {
+  RegisterCommandHandler(devtools::SystemInfo::getGPUInfo::kName,
+                         base::Bind(&DevToolsSystemInfoHandler::OnGetGPUInfo,
+                                    base::Unretained(this)));
+}
+
+DevToolsSystemInfoHandler::~DevToolsSystemInfoHandler() {
+}
+
+scoped_refptr<DevToolsProtocol::Response>
+DevToolsSystemInfoHandler::OnGetGPUInfo(
+    scoped_refptr<DevToolsProtocol::Command> command) {
+  gpu::GPUInfo gpu_info = GpuDataManagerImpl::GetInstance()->GetGPUInfo();
+  base::DictionaryValue* result = new base::DictionaryValue;
+  GPUInfoEnumerator enumerator(result);
+  gpu_info.EnumerateFields(&enumerator);
+  return command->SuccessResponse(result);
+}
+
+}  // namespace content