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

Commit 3157fe6a authored by Zach Johnson's avatar Zach Johnson
Browse files

Add common::BindOn to simplify binding callbacks to instance methods. 

Test: fuzz/run --host bluetooth_gd_hci_layer_fuzz_test
Change-Id: I4b0f9a688db60eaa0f4913ada30683ebbba84c3e
parent bbe519f6

system/gd/common/bind.h

+5 −0
Original line number Diff line number Diff line
@@ -30,5 +30,10 @@ using base::Passed; 
using base::RetainedRef;

using base::Unretained;



template <typename T, typename Functor, typename... Args>

inline base::Callback<base::MakeUnboundRunType<Functor, T, Args...>> BindOn(T* obj, Functor&& functor, Args&&... args) {

  return common::Bind(std::forward<Functor>(functor), common::Unretained(obj), std::forward<Args>(args)...);

}



}  // namespace common

}  // namespace bluetooth

system/gd/hci/hci_layer.cc

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


namespace {

using bluetooth::common::Bind;

using bluetooth::common::BindOn;

using bluetooth::common::BindOnce;

using bluetooth::common::Callback;

using bluetooth::common::Closure;
@@ -124,18 +125,14 @@ struct HciLayer::impl : public hal::HciHalCallbacks { 


    auto queue_end = acl_queue_.GetDownEnd();

    Handler* handler = module_.GetHandler();

    queue_end->RegisterDequeue(handler, Bind(&impl::dequeue_and_send_acl, common::Unretained(this)));

    module_.RegisterEventHandler(EventCode::COMMAND_COMPLETE,

                                 Bind(&impl::command_complete_callback, common::Unretained(this)), handler);

    module_.RegisterEventHandler(EventCode::COMMAND_STATUS,

                                 Bind(&impl::command_status_callback, common::Unretained(this)), handler);

    module_.RegisterEventHandler(EventCode::LE_META_EVENT,

                                 Bind(&impl::le_meta_event_callback, common::Unretained(this)), handler);

    queue_end->RegisterDequeue(handler, BindOn(this, &impl::dequeue_and_send_acl));

    module_.RegisterEventHandler(EventCode::COMMAND_COMPLETE, BindOn(this, &impl::command_complete_callback), handler);

    module_.RegisterEventHandler(EventCode::COMMAND_STATUS, BindOn(this, &impl::command_status_callback), handler);

    module_.RegisterEventHandler(EventCode::LE_META_EVENT, BindOn(this, &impl::le_meta_event_callback), handler);

    // TODO find the right place

    module_.RegisterEventHandler(EventCode::PAGE_SCAN_REPETITION_MODE_CHANGE,

                                 Bind(&impl::drop, common::Unretained(this)), handler);

    module_.RegisterEventHandler(EventCode::MAX_SLOTS_CHANGE, Bind(&impl::drop, common::Unretained(this)), handler);

    module_.RegisterEventHandler(EventCode::VENDOR_SPECIFIC, Bind(&impl::drop, common::Unretained(this)), handler);

    module_.RegisterEventHandler(EventCode::PAGE_SCAN_REPETITION_MODE_CHANGE, BindOn(this, &impl::drop), handler);

    module_.RegisterEventHandler(EventCode::MAX_SLOTS_CHANGE, BindOn(this, &impl::drop), handler);

    module_.RegisterEventHandler(EventCode::VENDOR_SPECIFIC, BindOn(this, &impl::drop), handler);



    module_.EnqueueCommand(ResetBuilder::Create(), BindOnce(&fail_if_reset_complete_not_success), handler);

    hal_->registerIncomingPacketCallback(this);