Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30dff148 authored by Chris Manton's avatar Chris Manton
Browse files

gd: Enforce modules to present a unique name 

A rogue module should be identified if it hangs

Bug: 184608842
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I0514ff36c7b1654e8de30a262b9a3a05a305a537
parent b56f6db0

system/gd/hal/hci_hal_android_hidl.cc

+4 −0
Original line number Diff line number Diff line
@@ -241,6 +241,10 @@ class HciHalHidl : public HciHal { 
    bt_hci_1_1_ = nullptr;

  }



  std::string ToString() const override {

    return std::string("HciHalHidl");

  }



 private:

  android::sp<InternalHciCallbacks> callbacks_;

  android::sp<IBluetoothHci_1_0> bt_hci_;

system/gd/hal/hci_hal_host.cc

+4 −0
Original line number Diff line number Diff line
@@ -341,6 +341,10 @@ class HciHalHost : public HciHal { 
    LOG_INFO("HAL is closed");

  }



  std::string ToString() const override {

    return std::string("HciHalHost");

  }



 private:

  // Held when APIs are called, NOT to be held during callbacks

  std::mutex api_mutex_;

system/gd/hal/snoop_logger.h

+3 −0
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ class SnoopLogger : public ::bluetooth::Module { 
  void Start() override;

  void Stop() override;

  DumpsysDataFinisher GetDumpsysData(flatbuffers::FlatBufferBuilder* builder) const override;

  std::string ToString() const override {

    return std::string("SnoopLogger");

  }



  // Visible for testing

  SnoopLogger(

system/gd/hal/snoop_logger_test.cc

+5 −1
Original line number Diff line number Diff line
@@ -61,6 +61,10 @@ class TestSnoopLoggerModule : public SnoopLogger { 
      size_t max_packets_per_file,

      const std::string& btsnoop_mode)

      : SnoopLogger(std::move(snoop_log_path), std::move(snooz_log_path), max_packets_per_file, btsnoop_mode) {}



  std::string ToString() const override {

    return std::string("TestSnoopLoggerModule");

  }

};



class SnoopLoggerModuleTest : public Test {

system/gd/hci/hci_layer_test.cc

+8 −0
Original line number Diff line number Diff line
@@ -164,6 +164,10 @@ class TestHciHal : public hal::HciHal { 


  void ListDependencies(ModuleList*) {}



  std::string ToString() const override {

    return std::string("TestHciHal");

  }



  static const ModuleFactory Factory;



 private:
@@ -290,6 +294,10 @@ class DependsOnHci : public Module { 
    list->add<HciLayer>();

  }



  std::string ToString() const override {

    return std::string("DependsOnHci");

  }



  static const ModuleFactory Factory;



 private: