diff options
author | tommycli <tommycli@chromium.org> | 2015-11-04 09:07:14 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-04 17:08:15 +0000 |
commit | b391a8d38a119bb6625f1429c262c46960d52580 (patch) | |
tree | 9910ddf3cfc878a75f998acb215bea9801abbd9b /chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h | |
parent | 38cb3fcf4e18ce504aa08ad8bb0ccc220e14a8e2 (diff) | |
download | chromium_src-b391a8d38a119bb6625f1429c262c46960d52580.zip chromium_src-b391a8d38a119bb6625f1429c262c46960d52580.tar.gz chromium_src-b391a8d38a119bb6625f1429c262c46960d52580.tar.bz2 |
Revert of Reland: Refactor DBusThreadManager to split away BT clients. (patchset #1 id:1 of https://codereview.chromium.org/1411793010/ )
Reason for revert:
Crashes memory bot http://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20OS%20%28valgrind%29%284%29
Original issue's description:
> Reland: Refactor DBusThreadManager to split away BT clients.
>
> This is a reland of https://codereview.chromium.org/1347193004/
>
> This CL doesn't change any of the code except for merge and lint changes.
>
> The original CL was triggering a test crash in Valgrind. On this patch,
> I've run Valgrind multiple times locally and also additionally run TSan.
> Since I am seeing no failures, after talking to glider@ (who works on
> Valgrind), I'm attempting to re-land this CL.
>
> TBR=armansito@chromium.org, glider@chromium.org, isherman@chromium.org, oshima@chromium.org, sky@chromium.org, stevenjb@chromium.org
> BUG=None.
>
> Committed: https://crrev.com/3c56b94daaf6513891e7da3094ab5054ffbd6262
> Cr-Commit-Position: refs/heads/master@{#357707}
TBR=armansito@chromium.org,glider@chromium.org,isherman@chromium.org,oshima@chromium.org,sky@chromium.org,stevenjb@chromium.org,rkc@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=None.
Review URL: https://codereview.chromium.org/1409383004
Cr-Commit-Position: refs/heads/master@{#357834}
Diffstat (limited to 'chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h')
-rw-r--r-- | chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h | 103 |
1 files changed, 103 insertions, 0 deletions
diff --git a/chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h b/chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h new file mode 100644 index 0000000..e6106c1 --- /dev/null +++ b/chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h @@ -0,0 +1,103 @@ +// Copyright 2014 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. + +#ifndef CHROMEOS_DBUS_FAKE_BLUETOOTH_GATT_DESCRIPTOR_CLIENT_H_ +#define CHROMEOS_DBUS_FAKE_BLUETOOTH_GATT_DESCRIPTOR_CLIENT_H_ + +#include <map> +#include <string> + +#include "base/memory/weak_ptr.h" +#include "base/observer_list.h" +#include "chromeos/chromeos_export.h" +#include "chromeos/dbus/bluetooth_gatt_descriptor_client.h" +#include "dbus/object_path.h" + +namespace chromeos { + +// FakeBluetoothGattDescriptorClient simulates the behavior of the Bluetooth +// Daemon GATT characteristic descriptor objects and is used in test cases in +// place of a mock and on the Linux desktop. +class CHROMEOS_EXPORT FakeBluetoothGattDescriptorClient + : public BluetoothGattDescriptorClient { + public: + struct Properties : public BluetoothGattDescriptorClient::Properties { + explicit Properties(const PropertyChangedCallback& callback); + ~Properties() override; + + // dbus::PropertySet override + void Get(dbus::PropertyBase* property, + dbus::PropertySet::GetCallback callback) override; + void GetAll() override; + void Set(dbus::PropertyBase* property, + dbus::PropertySet::SetCallback callback) override; + }; + + FakeBluetoothGattDescriptorClient(); + ~FakeBluetoothGattDescriptorClient() override; + + // DBusClient override. + void Init(dbus::Bus* bus) override; + + // BluetoothGattDescriptorClient overrides. + void AddObserver(Observer* observer) override; + void RemoveObserver(Observer* observer) override; + std::vector<dbus::ObjectPath> GetDescriptors() override; + Properties* GetProperties(const dbus::ObjectPath& object_path) override; + void ReadValue(const dbus::ObjectPath& object_path, + const ValueCallback& callback, + const ErrorCallback& error_callback) override; + void WriteValue(const dbus::ObjectPath& object_path, + const std::vector<uint8>& value, + const base::Closure& callback, + const ErrorCallback& error_callback) override; + + // Makes the descriptor with the UUID |uuid| visible under the characteristic + // with object path |characteristic_path|. Descriptor object paths are + // hierarchical to their characteristics. |uuid| must belong to a descriptor + // for which there is a constant defined below, otherwise this method has no + // effect. Returns the object path of the created descriptor. In the no-op + // case, returns an invalid path. + dbus::ObjectPath ExposeDescriptor(const dbus::ObjectPath& characteristic_path, + const std::string& uuid); + void HideDescriptor(const dbus::ObjectPath& descriptor_path); + + // Object path components and UUIDs of GATT characteristic descriptors. + static const char kClientCharacteristicConfigurationPathComponent[]; + static const char kClientCharacteristicConfigurationUUID[]; + + private: + // Property callback passed when we create Properties structures. + void OnPropertyChanged(const dbus::ObjectPath& object_path, + const std::string& property_name); + + // Notifies observers. + void NotifyDescriptorAdded(const dbus::ObjectPath& object_path); + void NotifyDescriptorRemoved(const dbus::ObjectPath& object_path); + + // Mapping from object paths to Properties structures. + struct DescriptorData { + DescriptorData(); + ~DescriptorData(); + + scoped_ptr<Properties> properties; + }; + typedef std::map<dbus::ObjectPath, DescriptorData*> PropertiesMap; + PropertiesMap properties_; + + // List of observers interested in event notifications from us. + base::ObserverList<Observer> observers_; + + // Weak pointer factory for generating 'this' pointers that might live longer + // than we do. + // Note: This should remain the last member so it'll be destroyed and + // invalidate its weak pointers before any other members are destroyed. + base::WeakPtrFactory<FakeBluetoothGattDescriptorClient> weak_ptr_factory_; + + DISALLOW_COPY_AND_ASSIGN(FakeBluetoothGattDescriptorClient); +}; + +} // namespace chromeos + +#endif // CHROMEOS_DBUS_FAKE_BLUETOOTH_GATT_DESCRIPTOR_CLIENT_H_ |