Bluetooth: macOS: Adding logs

device/bluetooth/bluetooth_remote_gatt_service_mac.mm

 // Copyright 2016 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 "device/bluetooth/bluetooth_remote_gatt_service_mac.h"
 
 #import <CoreBluetooth/CoreBluetooth.h>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 60 matching lines @@
     const std::string& identifier) const {
   auto searched_pair = gatt_characteristic_macs_.find(identifier);
   if (searched_pair == gatt_characteristic_macs_.end()) {
     return nullptr;
   }
   return static_cast<BluetoothRemoteGattCharacteristic*>(
       searched_pair->second.get());
 }
 
 void BluetoothRemoteGattServiceMac::DiscoverCharacteristics() {
+  VLOG(1) << ToString() << ": DiscoverCharacteristics.";
   is_discovery_complete_ = false;
   [GetCBPeripheral() discoverCharacteristics:nil forService:GetService()];
 }
 
 void BluetoothRemoteGattServiceMac::DidDiscoverCharacteristics() {
   DCHECK(!is_discovery_complete_);
+  VLOG(1) << ToString() << ": DidDiscoverCharacteristics.";
   std::unordered_set<std::string> characteristic_identifier_to_remove;
   for (const auto& iter : gatt_characteristic_macs_) {
     characteristic_identifier_to_remove.insert(iter.first);
   }
 
   for (CBCharacteristic* cb_characteristic in GetService().characteristics) {
     BluetoothRemoteGattCharacteristicMac* gatt_characteristic_mac =
         GetBluetoothRemoteGattCharacteristicMac(cb_characteristic);
     if (gatt_characteristic_mac) {
+      VLOG(1) << gatt_characteristic_mac->ToString()
+              << ": Known characteristic, properties "
+              << gatt_characteristic_mac->GetProperties();
       const std::string& identifier = gatt_characteristic_mac->GetIdentifier();
       characteristic_identifier_to_remove.erase(identifier);
       gatt_characteristic_mac->DiscoverDescriptors();
       continue;
     }
     gatt_characteristic_mac =
         new BluetoothRemoteGattCharacteristicMac(this, cb_characteristic);
     const std::string& identifier = gatt_characteristic_mac->GetIdentifier();
     auto result_iter = gatt_characteristic_macs_.insert(
         {identifier, base::WrapUnique(gatt_characteristic_mac)});
     DCHECK(result_iter.second);
+    VLOG(1) << gatt_characteristic_mac->ToString()
+            << ": New characteristic, properties "
+            << gatt_characteristic_mac->GetProperties();
     gatt_characteristic_mac->DiscoverDescriptors();
     GetMacAdapter()->NotifyGattCharacteristicAdded(gatt_characteristic_mac);
   }
 
   for (const std::string& identifier : characteristic_identifier_to_remove) {
     auto pair_to_remove = gatt_characteristic_macs_.find(identifier);
     std::unique_ptr<BluetoothRemoteGattCharacteristicMac>
         characteristic_to_remove;
+    VLOG(1) << characteristic_to_remove->ToString()
+            << ": Removed characteristic.";
     pair_to_remove->second.swap(characteristic_to_remove);
     gatt_characteristic_macs_.erase(pair_to_remove);
     GetMacAdapter()->NotifyGattCharacteristicRemoved(
         characteristic_to_remove.get());
   }
   SendNotificationIfComplete();
 }
 
 void BluetoothRemoteGattServiceMac::DidDiscoverDescriptors(
     CBCharacteristic* characteristic) {
@@ skipping 10 matching lines @@
   // Notify when all characteristics have been fully discovered.
   is_discovery_complete_ =
       std::find_if_not(
           gatt_characteristic_macs_.begin(), gatt_characteristic_macs_.end(),
           [](const std::pair<
               const std::string,
               std::unique_ptr<BluetoothRemoteGattCharacteristicMac>>& pair) {
             return pair.second->IsDiscoveryComplete();
           }) == gatt_characteristic_macs_.end();
   if (is_discovery_complete_) {
+    VLOG(1) << ToString() << ": Discovery complete.";
     GetMacAdapter()->NotifyGattServiceChanged(this);
   }
 }
 
 void BluetoothRemoteGattServiceMac::DidUpdateValue(
     CBCharacteristic* characteristic,
     NSError* error) {
   BluetoothRemoteGattCharacteristicMac* gatt_characteristic =
       GetBluetoothRemoteGattCharacteristicMac(characteristic);
   DCHECK(gatt_characteristic);
@@ skipping 45 matching lines @@
               std::unique_ptr<BluetoothRemoteGattCharacteristicMac>>& pair) {
         return pair.second->GetCBCharacteristic() == characteristic;
       });
   if (found == gatt_characteristic_macs_.end()) {
     return nullptr;
   } else {
     return found->second.get();
   }
 }
 
+std::string BluetoothRemoteGattServiceMac::ToString() const {
+  return std::string("<BluetoothRemoteGattServiceMac ") + GetIdentifier() +
+         ", device " + bluetooth_device_mac_->GetIdentifier() + ">";

[ortuno, 2017/03/14 00:34:33]

Same here: UUID might be more useful.

+}
+
 }  // namespace device