Added switch that let us 'un-stub' certain dbus clients.

chromeos/dbus/dbus_client_bundle.h

+// Copyright (c) 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_DBUS_CLIENT_BUNDLE_H_
+#define CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_
+
+#include "base/memory/scoped_ptr.h"
+#include "chromeos/chromeos_export.h"
+
+namespace chromeos {
+
+class BluetoothAdapterClient;
+class BluetoothAgentManagerClient;
+class BluetoothDeviceClient;
+class BluetoothGattCharacteristicClient;
+class BluetoothGattDescriptorClient;
+class BluetoothGattManagerClient;
+class BluetoothGattServiceClient;
+class BluetoothInputClient;
+class BluetoothProfileManagerClient;
+class CrasAudioClient;
+class CrosDisksClient;
+class CryptohomeClient;
+class DebugDaemonClient;
+class EasyUnlockClient;
+class LorgnetteManagerClient;
+class ShillDeviceClient;
+class ShillIPConfigClient;
+class ShillManagerClient;
+class ShillServiceClient;
+class ShillProfileClient;
+class GsmSMSClient;
+class ImageBurnerClient;
+class IntrospectableClient;
+class ModemMessagingClient;
+class NfcManagerClient;
+class NfcAdapterClient;
+class NfcDeviceClient;
+class NfcTagClient;
+class NfcRecordClient;
+class PermissionBrokerClient;
+class SystemClockClient;
+class PowerManagerClient;
+class SessionManagerClient;
+class SMSClient;
+class UpdateEngineClient;
+
+// The bundle of all D-Bus clients used in DBusThreadManagerImpl. The bundle
+// is used to delete them at once in the right order before shutting down the
+// system bus. See also the comment in the destructor of DBusThreadManagerImpl.
+class CHROMEOS_EXPORT DBusClientBundle {
+ public:
+  // TODO(zelidrag): We might want to collapse few more of these subsystems if
+  // their dbus interfaced correspond to the same daemon.
+  enum DBusClientType {

[hashimoto, 2014/08/08 07:08:44]

Do we need all of these clients?
If not, maybe we should start from the minimum set of clients we really need.

[zel, 2014/08/08 19:00:15]

Yes, we have to define them all since in DBusClientBundle I need to be able to
prevent creation of those clients that are covered with "fakes" - otherwise I
run into crash on thread manager destruction.

+    UNKNOWN    =           0,
+    BLUETOOTH  =           1 << 1,
+    BLUETOOTH_LOW_ENERGY = 1 << 2,
+    CRAS =                 1 << 3,
+    CROS_DISKS =           1 << 4,
+    CRYPTOHOME =           1 << 5,
+    DEBUG_DAEMON =         1 << 6,
+    EASY_UNLOCK =          1 << 7,
+    LORGNETTE_MANAGER =    1 << 8,
+    SHILL =                1 << 9,
+    GSM_SMS =              1 << 10,
+    IMAGE_BURNER =         1 << 11,
+    INTROSPECTABLE =       1 << 12,
+    MODEM_MESSAGING =      1 << 13,
+    NFC =                  1 << 14,
+    PERMISSION_BROKER =    1 << 15,
+    POWER_MANAGER =        1 << 16,
+    POWER_POLICY =         1 << 17,
+    SESSION_MANAGER =      1 << 18,
+    SMS =                  1 << 19,
+    SYSTEM_CLOCK =         1 << 20,
+    UPDATE_ENGINE =        1 << 21,
+    All =                  0xFFFFFFFF,

[hashimoto, 2014/08/08 02:06:15]

nit: This should be "ALL".

Also, 0xFFFFFFFF should be ~static_cast<[typedef-ed name of unsigned int]>(0) so
that this value becomes 64-bit when the type is changed to accommodate more than
32 clients.

[zel, 2014/08/08 19:00:15]

Done.

+  };
+
+  explicit DBusClientBundle(unsigned int client_mask);

[hashimoto, 2014/08/08 02:06:15]

This "unsigned int" should be typedef-ed so that we can easily change the type
to uint64 when the number of clients exceeds 32.

[zel, 2014/08/08 19:00:14]

Done.

+  virtual ~DBusClientBundle();
+
+  // Parses command line param values for dbus subsystem that should be
+  // un-stubbed.
+  static unsigned int ParseUnstubList(const std::string& unstub_list);
+
+  BluetoothAdapterClient* bluetooth_adapter_client();
+
+  BluetoothAgentManagerClient* bluetooth_agent_manager_client();
+
+  BluetoothDeviceClient* bluetooth_device_client();
+
+  BluetoothGattCharacteristicClient* bluetooth_gatt_characteristic_client();
+
+  BluetoothGattDescriptorClient* bluetooth_gatt_descriptor_client();
+
+  BluetoothGattManagerClient* bluetooth_gatt_manager_client();
+
+  BluetoothGattServiceClient* bluetooth_gatt_service_client();
+
+  BluetoothInputClient* bluetooth_input_client();
+
+  BluetoothProfileManagerClient* bluetooth_profile_manager_client();
+
+  CrasAudioClient* cras_audio_client();
+
+  CrosDisksClient* cros_disks_client();
+
+  CryptohomeClient* cryptohome_client();
+
+  DebugDaemonClient* debug_daemon_client();
+
+  EasyUnlockClient* easy_unlock_client();
+
+  LorgnetteManagerClient* lorgnette_manager_client();
+
+  ShillDeviceClient* shill_device_client();
+
+  ShillIPConfigClient* shill_ipconfig_client();
+
+  ShillManagerClient* shill_manager_client();
+
+  ShillServiceClient* shill_service_client();
+
+  ShillProfileClient* shill_profile_client();
+
+  GsmSMSClient* gsm_sms_client();
+
+  ImageBurnerClient* image_burner_client();
+
+  IntrospectableClient* introspectable_client();
+
+  ModemMessagingClient* modem_messaging_client();
+
+  NfcManagerClient* nfc_manager_client();
+
+  NfcAdapterClient* nfc_adapter_client();
+
+  NfcDeviceClient* nfc_device_client();
+
+  NfcTagClient* nfc_tag_client();
+
+  NfcRecordClient* nfc_record_client();
+
+  PermissionBrokerClient* permission_broker_client();
+
+  SystemClockClient* system_clock_client();
+
+  PowerManagerClient* power_manager_client();
+
+  SessionManagerClient* session_manager_client();
+
+  SMSClient* sms_client();
+
+  UpdateEngineClient* update_engine_client();
+

[hashimoto, 2014/08/08 02:06:15]

nit: Unneeded blank line.

[zel, 2014/08/08 19:00:14]

Done.

+
+ private:
+  scoped_ptr<BluetoothAdapterClient> bluetooth_adapter_client_;
+  scoped_ptr<BluetoothAgentManagerClient> bluetooth_agent_manager_client_;
+  scoped_ptr<BluetoothDeviceClient> bluetooth_device_client_;
+  scoped_ptr<BluetoothGattCharacteristicClient>
+      bluetooth_gatt_characteristic_client_;
+  scoped_ptr<BluetoothGattDescriptorClient> bluetooth_gatt_descriptor_client_;
+  scoped_ptr<BluetoothGattManagerClient> bluetooth_gatt_manager_client_;
+  scoped_ptr<BluetoothGattServiceClient> bluetooth_gatt_service_client_;
+  scoped_ptr<BluetoothInputClient> bluetooth_input_client_;
+  scoped_ptr<BluetoothProfileManagerClient> bluetooth_profile_manager_client_;
+  scoped_ptr<CrasAudioClient> cras_audio_client_;
+  scoped_ptr<CrosDisksClient> cros_disks_client_;
+  scoped_ptr<CryptohomeClient> cryptohome_client_;
+  scoped_ptr<DebugDaemonClient> debug_daemon_client_;
+  scoped_ptr<EasyUnlockClient> easy_unlock_client_;
+  scoped_ptr<LorgnetteManagerClient> lorgnette_manager_client_;
+  scoped_ptr<ShillDeviceClient> shill_device_client_;
+  scoped_ptr<ShillIPConfigClient> shill_ipconfig_client_;
+  scoped_ptr<ShillManagerClient> shill_manager_client_;
+  scoped_ptr<ShillServiceClient> shill_service_client_;
+  scoped_ptr<ShillProfileClient> shill_profile_client_;
+  scoped_ptr<GsmSMSClient> gsm_sms_client_;
+  scoped_ptr<ImageBurnerClient> image_burner_client_;
+  scoped_ptr<IntrospectableClient> introspectable_client_;
+  scoped_ptr<ModemMessagingClient> modem_messaging_client_;
+  // The declaration order for NFC client objects is important. See
+  // DBusThreadManager::CreateDefaultClients for the dependencies.
+  scoped_ptr<NfcManagerClient> nfc_manager_client_;
+  scoped_ptr<NfcAdapterClient> nfc_adapter_client_;
+  scoped_ptr<NfcDeviceClient> nfc_device_client_;
+  scoped_ptr<NfcTagClient> nfc_tag_client_;
+  scoped_ptr<NfcRecordClient> nfc_record_client_;
+  scoped_ptr<PermissionBrokerClient> permission_broker_client_;
+  scoped_ptr<SystemClockClient> system_clock_client_;
+  scoped_ptr<PowerManagerClient> power_manager_client_;
+  scoped_ptr<SessionManagerClient> session_manager_client_;
+  scoped_ptr<SMSClient> sms_client_;
+  scoped_ptr<UpdateEngineClient> update_engine_client_;
+
+  DISALLOW_COPY_AND_ASSIGN(DBusClientBundle);
+};
+
+}  // namespace chromeos
+
+#endif  // CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_