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

Commit 14e10823 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Remove obsolete dumpsys calls am: 02b6b39d am: f7ba69c1 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1350927

Change-Id: Ibd9c58477d61a2ba8d90eff0b39cf190c313569c
parents cb2bf5ea f7ba69c1

system/gd/shim/dumpsys.cc

+0 −24
Original line number Diff line number Diff line
@@ -71,9 +71,6 @@ struct Dumpsys::impl { 
 public:

  void DumpWithArgs(int fd, const char** args, std::promise<void> promise);



  void RegisterDumpsysFunction(const void* token, DumpsysFunction func);  // OBSOLETE

  void UnregisterDumpsysFunction(const void* token);                      // OBSOLETE



  impl(const Dumpsys& dumpsys_module);

  ~impl() = default;
@@ -83,7 +80,6 @@ struct Dumpsys::impl { 
  std::string PrintAsJson(std::string* output) const;



 private:

  std::unordered_map<const void*, DumpsysFunction> dumpsys_functions_;  // OBSOLETE

  const reflection::Schema* FindBundledSchema(

      const dumpsys::BundleSchema& bundle_schema, const std::string& name) const;

  const Dumpsys& dumpsys_module_;
@@ -132,16 +128,6 @@ void Dumpsys::impl::DumpWithArgs(int fd, const char** args, std::promise<void> p 
  promise.set_value();

}



void Dumpsys::impl::RegisterDumpsysFunction(const void* token, DumpsysFunction func) {  // OBSOLETE

  ASSERT(dumpsys_functions_.find(token) == dumpsys_functions_.end());

  dumpsys_functions_[token] = func;

}



void Dumpsys::impl::UnregisterDumpsysFunction(const void* token) {  // OBSOLETE

  ASSERT(dumpsys_functions_.find(token) != dumpsys_functions_.end());

  dumpsys_functions_.erase(token);

}



void Dumpsys::Dump(int fd, const char** args) {

  std::promise<void> promise;

  auto future = promise.get_future();
@@ -149,16 +135,6 @@ void Dumpsys::Dump(int fd, const char** args) { 
  future.get();

}



void Dumpsys::RegisterDumpsysFunction(const void* token, DumpsysFunction func) {  // OBSOLETE

  GetHandler()->Post(

      common::BindOnce(&Dumpsys::impl::RegisterDumpsysFunction, common::Unretained(pimpl_.get()), token, func));

}



void Dumpsys::UnregisterDumpsysFunction(const void* token) {  // OBSOLETE

  GetHandler()->Post(

      common::BindOnce(&Dumpsys::impl::UnregisterDumpsysFunction, common::Unretained(pimpl_.get()), token));

}



os::Handler* Dumpsys::GetGdShimHandler() {

  return GetHandler();

}

system/gd/shim/dumpsys.h

+2 −7
Original line number Diff line number Diff line
@@ -23,17 +23,12 @@ 
namespace bluetooth {

namespace shim {



using DumpsysFunction = std::function<void(int fd)>;  // OBSOLETE



class Dumpsys : public bluetooth::Module {

 public:

  void Dump(int fd, const char** args);



  void RegisterDumpsysFunction(const void* token, DumpsysFunction func);  // OBSOLETE

  void UnregisterDumpsysFunction(const void* token);                      // OBSOLETE



  /* This is not a dumpsys-specific method, we just must grab thread from of one modules */

  os::Handler* GetGdShimHandler();  // OBSOLETE

  // Convenience thread used by shim layer for task execution

  os::Handler* GetGdShimHandler();



  Dumpsys() = default;

  ~Dumpsys() = default;

system/gd/shim/l2cap.cc

+0 −28
Original line number Diff line number Diff line
@@ -405,8 +405,6 @@ struct L2cap::impl { 


  void SendLoopbackResponse(std::function<void()> function);



  void Dump(int fd);



  impl(L2cap& module, l2cap::classic::L2capClassicModule* l2cap_module);



 private:
@@ -443,28 +441,6 @@ L2cap::impl::impl(L2cap& module, l2cap::classic::L2capClassicModule* l2cap_modul 
  dynamic_channel_manager_ = l2cap_module_->GetDynamicChannelManager();

}



void L2cap::impl::Dump(int fd) {

  if (psm_to_service_interface_map_.empty()) {

    dprintf(fd, "%s no psms registered\n", kModuleName);

  } else {

    for (auto& service : psm_to_service_interface_map_) {

      dprintf(fd, "%s psm registered:%hd\n", kModuleName, service.first);

    }

  }



  if (pending_connection_map_.empty()) {

    dprintf(fd, "%s no pending classic connections\n", kModuleName);

  } else {

    for (auto& pending : pending_connection_map_) {

      if (pending.second != nullptr) {

        dprintf(fd, "%s pending connection:%s\n", kModuleName, pending.second->ToString().c_str());

      } else {

        dprintf(fd, "%s old pending connection:%d\n", kModuleName, pending.first);

      }

    }

  }

}



l2cap::classic::SecurityPolicy L2cap::impl::GetSecurityPolicy(l2cap::Psm psm) const {

  if (psm == 1) {

    return l2cap::classic::SecurityPolicy::_SDP_ONLY_NO_SECURITY_WHATSOEVER_PLAINTEXT_TRANSPORT_OK;
@@ -697,18 +673,14 @@ void L2cap::SendLoopbackResponse(std::function<void()> function) { 
 * Module methods

 */

void L2cap::ListDependencies(ModuleList* list) {

  list->add<shim::Dumpsys>();

  list->add<l2cap::classic::L2capClassicModule>();

}



void L2cap::Start() {

  pimpl_ = std::make_unique<impl>(*this, GetDependency<l2cap::classic::L2capClassicModule>());

  GetDependency<shim::Dumpsys>()->RegisterDumpsysFunction(

      static_cast<void*>(this), [this](int fd) { pimpl_->Dump(fd); });

}



void L2cap::Stop() {

  GetDependency<shim::Dumpsys>()->UnregisterDumpsysFunction(static_cast<void*>(this));

  pimpl_.reset();

}