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

Commit 5ea356a6 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

dumpsys: Extract flatbuffer to allow additional implementations am: 3939ac52... 

dumpsys: Extract flatbuffer to allow additional implementations am: 3939ac52 am: ea758137 am: 702274d3

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2883078



Change-Id: Ieb4c3679e4f007bf9db709f46584a70e01be4635
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0adbc05f 702274d3

system/gd/Android.bp

+2 −1
Original line number Original line Diff line number Diff line
@@ -148,7 +148,7 @@ cc_defaults { 
        ":BluetoothSyspropsSources",

        ":BluetoothSyspropsSources",

        "module.cc",

        "module.cc",

        "module_dumper.cc",

        "module_dumper.cc",

        "module_dumper_flatbuffer.cc",

        "module_state_dumper.cc",

        "stack_manager.cc",

        "stack_manager.cc",

    ],

    ],

    generated_headers: [

    generated_headers: [
@@ -463,6 +463,7 @@ cc_test { 
        "module_gdx_unittest.cc",

        "module_gdx_unittest.cc",

        "module_jniloop_unittest.cc",

        "module_jniloop_unittest.cc",

        "module_mainloop_unittest.cc",

        "module_mainloop_unittest.cc",

        "module_state_dumper_unittest.cc",

    ],

    ],

    generated_headers: [

    generated_headers: [

        "BluetoothGeneratedBundlerSchema_h_bfbs",

        "BluetoothGeneratedBundlerSchema_h_bfbs",

system/gd/BUILD.gn

+1 −1
Original line number Original line Diff line number Diff line
@@ -56,7 +56,7 @@ static_library("libbluetooth_gd") { 
  sources = [

  sources = [

    "module.cc",

    "module.cc",

    "module_dumper.cc",

    "module_dumper.cc",

    "module_dumper_flatbuffer.cc",

    "module_state_dumper.cc",

    "stack_manager.cc",

    "stack_manager.cc",

  ]

  ]

system/gd/hci/controller_test.cc

+5 −2
Original line number Original line Diff line number Diff line
@@ -17,10 +17,12 @@ 
#include "hci/controller.h"

#include "hci/controller.h"





#include <gtest/gtest.h>

#include <gtest/gtest.h>

#include <unistd.h>





#include <chrono>

#include <chrono>

#include <future>

#include <future>

#include <memory>

#include <memory>

#include <sstream>





#include "common/bind.h"

#include "common/bind.h"

#include "common/init_flags.h"

#include "common/init_flags.h"
@@ -532,10 +534,11 @@ TEST_F(ControllerTest, leRandTest) { 
}

}





TEST_F(ControllerTest, Dumpsys) {

TEST_F(ControllerTest, Dumpsys) {

  ModuleDumper dumper(fake_registry_, title);

  ModuleDumper dumper(STDOUT_FILENO, fake_registry_, title);





  std::string output;

  std::string output;

  dumper.DumpState(&output);

  std::ostringstream oss;

  dumper.DumpState(&output, oss);





  ASSERT_TRUE(output.find("Hci Controller Dumpsys") != std::string::npos);

  ASSERT_TRUE(output.find("Hci Controller Dumpsys") != std::string::npos);

}

}

system/gd/module.cc

+0 −5
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include "module.h"

#include "module.h"





#include "common/init_flags.h"

#include "common/init_flags.h"

#include "module_dumper_flatbuffer.h"





using ::bluetooth::os::Handler;

using ::bluetooth::os::Handler;

using ::bluetooth::os::Thread;

using ::bluetooth::os::Thread;
@@ -35,10 +34,6 @@ Handler* Module::GetHandler() const { 
  return handler_;

  return handler_;

}

}





DumpsysDataFinisher Module::GetDumpsysData(flatbuffers::FlatBufferBuilder* /* builder */) const {

  return EmptyDumpsysDataFinisher;

}



const ModuleRegistry* Module::GetModuleRegistry() const {

const ModuleRegistry* Module::GetModuleRegistry() const {

  return registry_;

  return registry_;

}

}

system/gd/module.h

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




#pragma once

#pragma once





#include <flatbuffers/flatbuffers.h>

#include <chrono>

#include <chrono>

#include <functional>

#include <functional>

#include <future>

#include <future>
@@ -26,7 +25,7 @@ 
#include <vector>

#include <vector>





#include "common/bind.h"

#include "common/bind.h"

#include "dumpsys_data_generated.h"

#include "module_state_dumper.h"

#include "os/handler.h"

#include "os/handler.h"

#include "os/log.h"

#include "os/log.h"

#include "os/thread.h"

#include "os/thread.h"
@@ -64,8 +63,6 @@ public: 
  std::vector<const ModuleFactory*> list_;

  std::vector<const ModuleFactory*> list_;

};

};





using DumpsysDataFinisher = std::function<void(DumpsysDataBuilder* dumpsys_data_builder)>;



// Each leaf node module must have a factory like so:

// Each leaf node module must have a factory like so:

//

//

// static const ModuleFactory Factory;

// static const ModuleFactory Factory;
@@ -73,7 +70,7 @@ using DumpsysDataFinisher = std::function<void(DumpsysDataBuilder* dumpsys_data_ 
// which will provide a constructor for the module registry to call.

// which will provide a constructor for the module registry to call.

// The module registry will also use the factory as the identifier

// The module registry will also use the factory as the identifier

// for that module.

// for that module.

class Module {

class Module : protected ModuleStateDumper {

  friend ModuleDumper;

  friend ModuleDumper;

  friend ModuleRegistry;

  friend ModuleRegistry;

  friend TestModuleRegistry;

  friend TestModuleRegistry;
@@ -91,9 +88,6 @@ class Module { 
  // Release all resources, you're about to be deleted

  // Release all resources, you're about to be deleted

  virtual void Stop() = 0;

  virtual void Stop() = 0;





  // Get relevant state data from the module

  virtual DumpsysDataFinisher GetDumpsysData(flatbuffers::FlatBufferBuilder* builder) const;



  virtual std::string ToString() const = 0;

  virtual std::string ToString() const = 0;





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

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