[chromeos] New PowerManagerClient observer to collect power data.

chromeos/power/power_data_collector.cc

+// 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 "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
+#include "chromeos/power/power_data_collector.h"
+#include "content/public/browser/browser_thread.h"

[stevenjb, 2013/12/11 20:54:37]

We shouldn't use  BrowserThread in src/chromeos, but I don't think you need it
anyway.

[Siva Chandra, 2013/12/11 21:30:56]

Removed.

+
+namespace chromeos {
+
+// The global PowerDataCollector instance.
+static PowerDataCollector* power_data_collector;
+
+// Sequence name for callback sequenced tasks which accumulate power supply
+// snapshots. See PowerDataCollector::PowerChanged below.
+const char kPowerSupplySnapshotSequence[] =
+    "power_data_collector__power_supply_snapshot_sequence";
+
+PowerDataCollector::PowerDataCollector(const bool testing)
+    : testing_(testing) {
+  AddRef();
+
+  if (!testing) {
+    DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
+  }
+}
+
+void PowerDataCollector::ShutdownInstance() {
+  if (!testing_) {
+    DBusThreadManager *dbus_manager = DBusThreadManager::Get();
+
+    // Destroy the power data collector before the DBusThreadManager.
+    CHECK(dbus_manager);
+
+    dbus_manager->GetPowerManagerClient()->RemoveObserver(this);
+  }
+
+  Release();
+}
+
+void PowerDataCollector::PowerChanged(
+    const power_manager::PowerSupplyProperties& prop) {
+  PowerSupplySnapshot snapshot = {
+      base::TimeTicks::Now(),
+      prop.external_power() !=
+          power_manager::PowerSupplyProperties::DISCONNECTED,
+      prop.battery_percent()};

[stevenjb, 2013/12/11 20:54:37]

} on new line

[Siva Chandra, 2013/12/11 21:30:56]

Done.

+
+  content::BrowserThread::PostBlockingPoolSequencedTask(
+      kPowerSupplySnapshotSequence,
+      FROM_HERE,
+      base::Bind(
+          &PowerDataCollector::AppendPowerSupplySnapshot, this, snapshot));

[stevenjb, 2013/12/11 20:54:37]

It should be safe to do this immediately, no need for locking. PowerChanged will
be called on the UI thread.

[Siva Chandra, 2013/12/11 21:30:56]

Done.

+}
+
+void PowerDataCollector::AppendPowerSupplySnapshot(
+    const PowerDataCollector::PowerSupplySnapshot& snapshot) {
+  base::AutoLock auto_lock(power_supply_lock_);
+  power_supply_.push_back(snapshot);
+}
+
+void PowerDataCollector::Initialize() {
+  // Check that power data collector is initialized only after the
+  // DBusThreadManager is initialized.
+  CHECK(DBusThreadManager::Get());
+
+  // Do no allow intializing twice.
+  CHECK(power_data_collector == NULL);
+
+  power_data_collector = new PowerDataCollector(false);
+}
+
+void PowerDataCollector::InitializeTesting() {
+  power_data_collector = new PowerDataCollector(true);
+}
+
+PowerDataCollector *PowerDataCollector::Get() {
+  CHECK(power_data_collector);
+
+  return power_data_collector;
+}
+
+void PowerDataCollector::Shutdown() {
+  // Shutdown only if initialized.
+  CHECK(power_data_collector);
+
+  power_data_collector->ShutdownInstance();
+
+  // NULL it to protect from improper usage after shutdown.
+  power_data_collector = NULL;
+}
+
+void PowerDataCollector::LockPowerSupplyData(void) {
+  power_data_collector->power_supply_lock_.Acquire();
+}
+
+void PowerDataCollector::UnlockPowerSupplyData(void) {
+  power_data_collector->power_supply_lock_.Release();
+}
+
+std::vector<PowerDataCollector::PowerSupplySnapshot>
+&PowerDataCollector::GetPowerSupplyData() {
+  // Do not allow calling this method after shutdown or before initialization.
+  CHECK(power_data_collector);
+
+  return power_data_collector->power_supply_;
+}
+
+}  // namespace chromeos