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

Commit 456aec0f authored by Myles Watson's avatar Myles Watson
Browse files

Use Start for testing and add a Stop timeout 

Test: atest --host bluetooth_test_gd
Change-Id: Ib966f46a35572dfbe05a10e3d44c4b4503d616a3
parent 5c1f8bb4

system/gd/hci/hci_layer_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ class HciTest : public ::testing::Test { 
    }

    hal = new TestHciHal();

    fake_registry_.InjectTestModule(&hal::HciHal::Factory, hal);

    fake_registry_.StartTestModule<DependsOnHci>();

    fake_registry_.Start<DependsOnHci>(&fake_registry_.GetTestThread());

    hci = static_cast<HciLayer*>(fake_registry_.GetModuleUnderTest(&HciLayer::Factory));

    upper = static_cast<DependsOnHci*>(fake_registry_.GetModuleUnderTest(&DependsOnHci::Factory));

    ASSERT(fake_registry_.IsStarted<HciLayer>());

system/gd/module.cc

+8 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ Handler* Module::GetHandler() { 
  return handler_;

}



ModuleRegistry* Module::GetModuleRegistry() {

const ModuleRegistry* Module::GetModuleRegistry() {

  return registry_;

}
@@ -59,6 +59,11 @@ void ModuleRegistry::Start(ModuleList* modules, Thread* thread) { 
  }

}



void ModuleRegistry::set_registry_and_handler(Module* instance, Thread* thread) const {

  instance->registry_ = this;

  instance->handler_ = new Handler(thread);

}



Module* ModuleRegistry::Start(const ModuleFactory* module, Thread* thread) {

  auto started_instance = started_modules_.find(module);

  if (started_instance != started_modules_.end()) {
@@ -66,10 +71,9 @@ Module* ModuleRegistry::Start(const ModuleFactory* module, Thread* thread) { 
  }



  Module* instance = module->ctor_();

  instance->registry_ = this;

  instance->handler_ = new Handler(thread);

  instance->ListDependencies(&instance->dependencies_);

  set_registry_and_handler(instance, thread);



  instance->ListDependencies(&instance->dependencies_);

  Start(&instance->dependencies_, thread);



  instance->Start();

system/gd/module.h

+7 −7
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 


namespace bluetooth {



const std::chrono::milliseconds kModuleStopTimeout = std::chrono::milliseconds(20);



class Module;

class ModuleRegistry;
@@ -76,7 +78,7 @@ class Module { 


  ::bluetooth::os::Handler* GetHandler();



  ModuleRegistry* GetModuleRegistry();

  const ModuleRegistry* GetModuleRegistry();



  template <class T>

  T* GetDependency() const {
@@ -88,7 +90,7 @@ class Module { 


  ::bluetooth::os::Handler* handler_ = nullptr;

  ModuleList dependencies_;

  ModuleRegistry* registry_;

  const ModuleRegistry* registry_;

};



class ModuleRegistry {
@@ -119,6 +121,8 @@ class ModuleRegistry { 
 protected:

  Module* Get(const ModuleFactory* module) const;



  void set_registry_and_handler(Module* instance, ::bluetooth::os::Thread* thread) const;



  os::Handler* GetModuleHandler(const ModuleFactory* module) const;



  std::map<const ModuleFactory*, Module*> started_modules_;
@@ -130,6 +134,7 @@ class TestModuleRegistry : public ModuleRegistry { 
  void InjectTestModule(const ModuleFactory* module, Module* instance) {

    start_order_.push_back(module);

    started_modules_[module] = instance;

    set_registry_and_handler(instance, &test_thread);

  }



  Module* GetModuleUnderTest(const ModuleFactory* module) const {
@@ -144,11 +149,6 @@ class TestModuleRegistry : public ModuleRegistry { 
    return test_thread;

  }



  template <class T>

  T* StartTestModule() {

    return Start<T>(&test_thread);

  }



  bool SynchronizeModuleHandler(const ModuleFactory* module, std::chrono::milliseconds timeout) const {

    std::promise<void> promise;

    os::Handler* handler = GetTestModuleHandler(module);