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

Commit 7e22ea2d authored by Zach Johnson's avatar Zach Johnson
Browse files

Remove SentinelWorkItem since we have Reactor.WaitForIdle 

Test: fuzz/run --host bluetooth_gd_hci_fuzz_test
Change-Id: Ieab4e3f6f49f30a15dc728fb72063d5e3be26017
parent bab0146d

system/gd/fuzz/helpers.cc

+0 −11
Original line number Diff line number Diff line
@@ -37,16 +37,5 @@ std::vector<std::vector<uint8_t>> SplitInput(const uint8_t* data, size_t size, c 
  return result;

}



void SentinelWorkItem::notify_handler_quiesced() {

  quiesce_promise_->set_value();

}



void SentinelWorkItem::WaitUntilFinishedOn(os::Handler* handler) {

  quiesce_promise_ = std::make_unique<std::promise<void>>();

  handler->Post(common::Bind(&SentinelWorkItem::notify_handler_quiesced, common::Unretained(this)));

  quiesce_promise_->get_future().wait_for(std::chrono::milliseconds(300));

  quiesce_promise_ = nullptr;

}



}  // namespace fuzz

}  // namespace bluetooth

system/gd/fuzz/helpers.h

+0 −8
Original line number Diff line number Diff line
@@ -26,13 +26,5 @@ namespace fuzz { 
std::vector<std::vector<uint8_t>> SplitInput(const uint8_t* data, size_t size, const uint8_t* separator,

                                             size_t separatorSize);



class SentinelWorkItem {

 public:

  void WaitUntilFinishedOn(os::Handler* handler);



 private:

  void notify_handler_quiesced();

  std::unique_ptr<std::promise<void>> quiesce_promise_;

};

}  // namespace fuzz

}  // namespace bluetooth

system/gd/hal/fuzz/fuzz_hci_hal.cc

+0 −4
Original line number Diff line number Diff line
@@ -79,10 +79,6 @@ void FuzzHciHal::injectAcl(std::vector<uint8_t> data) { 
  callbacks_->aclDataReceived(data);

}



void FuzzHciHal::waitForHandler() {

  sentinel_work_item_.WaitUntilFinishedOn(GetHandler());

}



}  // namespace fuzz

}  // namespace hal

}  // namespace bluetooth

system/gd/hal/fuzz/fuzz_hci_hal.h

+0 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ class FuzzHciHal : public HciHal { 


  void injectAcl(std::vector<uint8_t> data);

  void injectHciEvent(std::vector<uint8_t> data);

  void waitForHandler();



  std::string ToString() const override {

    return "HciHalFuzz";
@@ -48,7 +47,6 @@ class FuzzHciHal : public HciHal { 


 private:

  HciHalCallbacks* callbacks_;

  ::bluetooth::fuzz::SentinelWorkItem sentinel_work_item_;

  hci::OpCode waiting_opcode_;

  bool waiting_for_status_;

};