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

Commit 5e4ff826 authored by Zach Johnson's avatar Zach Johnson
Browse files

Create ContextualOnceCallback, to bind together a context and a callback 

This way, we don't need to manually pass handlers around.

Will eventually subsume and become OnceCallback for simplicity, but keeping
ContextualOnceCallback as the name for now during migration.

Test: cert/run --host
Test: fuzz/run --host bluetooth_gd_hci_layer_fuzz_test
Change-Id: I4f686d134773877514b7f41ca97337001bdeb971
parent d8170d3d

system/gd/common/bind.h

+2 −1
Original line number Diff line number Diff line
@@ -25,13 +25,14 @@ using base::Bind; 
using base::BindOnce;

using base::ConstRef;

using base::IgnoreResult;

using base::MakeUnboundRunType;

using base::Owned;

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) {

inline base::Callback<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)...);

}

system/gd/common/contextual_callback.h

0 → 100644
+57 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include "common/bind.h"

#include "common/callback.h"



namespace bluetooth {

namespace common {



class IPostableContext {

 public:

  virtual ~IPostableContext(){};

  virtual void Post(OnceClosure closure) = 0;

};



template <typename R, typename... Args>

class ContextualOnceCallback;



template <typename R, typename... Args>

class ContextualOnceCallback<R(Args...)> {

 public:

  ContextualOnceCallback(common::OnceCallback<R(Args...)>&& callback, IPostableContext* context)

      : callback_(std::move(callback)), context_(context) {}



  constexpr ContextualOnceCallback() = default;



  DISALLOW_COPY_AND_ASSIGN(ContextualOnceCallback);



  ContextualOnceCallback(ContextualOnceCallback&&) noexcept = default;

  ContextualOnceCallback& operator=(ContextualOnceCallback&&) noexcept = default;



  void Invoke(Args... args) {

    context_->Post(common::BindOnce(std::move(callback_), std::forward<Args>(args)...));

  }



 private:

  common::OnceCallback<R(Args...)> callback_;

  IPostableContext* context_;

};



}  // namespace common

}  // namespace bluetooth

system/gd/hci/acl_manager.cc

+59 −92

File changed.

Preview size limit exceeded, changes collapsed.

system/gd/hci/acl_manager_test.cc

+6 −6

File changed.

Preview size limit exceeded, changes collapsed.

system/gd/hci/command_interface.h

+5 −5
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#pragma once



#include "common/callback.h"

#include "common/contextual_callback.h"

#include "hci/hci_packets.h"

#include "os/handler.h"

#include "os/utils.h"
@@ -31,11 +31,11 @@ class CommandInterface { 
  virtual ~CommandInterface() = default;

  DISALLOW_COPY_AND_ASSIGN(CommandInterface);



  virtual void EnqueueCommand(std::unique_ptr<T> command, common::OnceCallback<void(CommandCompleteView)> on_complete,

                              os::Handler* handler) = 0;

  virtual void EnqueueCommand(std::unique_ptr<T> command,

                              common::ContextualOnceCallback<void(CommandCompleteView)> on_complete) = 0;



  virtual void EnqueueCommand(std::unique_ptr<T> command, common::OnceCallback<void(CommandStatusView)> on_status,

                              os::Handler* handler) = 0;

  virtual void EnqueueCommand(std::unique_ptr<T> command,

                              common::ContextualOnceCallback<void(CommandStatusView)> on_status) = 0;

};

}  // namespace hci

}  // namespace bluetooth