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

Commit a5656534 authored by Henri Chataing's avatar Henri Chataing
Browse files

system/gd/packet: Migrate from ASSERT/ASSERT_LOG to std::assert 

log::assert_that cannot be used in this context, because
libbluetooth_hci_pdl is linked in //vendor, whereas
libbluetooth_log will NOT be made visible to //vendor

Test: m com.android.btservices
Bug: 305066880
Flag: EXEMPT, log change
Change-Id: I469c1cda0787c00eb04b1ac92228202d56fa0ace
parent 6b9f6fe4

system/gd/packet/BUILD.gn

+4 −1
Original line number Diff line number Diff line
@@ -29,5 +29,8 @@ source_set("BluetoothPacketSources") { 
  include_dirs = [ "//bt/system/gd" ]



  deps = [ "//bt/system/gd/rust/shim:init_flags_bridge_header" ]

  configs += [ "//bt/system:target_defaults" ]

  configs += [

    "//bt/system:target_defaults",

    "//bt/system/log:log_defaults",

  ]

}

system/gd/packet/bit_inserter.cc

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


#include "packet/bit_inserter.h"



#include "os/log.h"

#undef NDEBUG

#include <cassert>



namespace bluetooth {

namespace packet {
@@ -24,7 +25,7 @@ namespace packet { 
BitInserter::BitInserter(std::vector<uint8_t>& vector) : ByteInserter(vector) {}



BitInserter::~BitInserter() {

  ASSERT(num_saved_bits_ == 0);

  assert(num_saved_bits_ == 0);

}



void BitInserter::insert_bits(uint8_t byte, size_t num_bits) {

system/gd/packet/byte_inserter.cc

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


#include "packet/byte_inserter.h"



#include "os/log.h"

#undef NDEBUG

#include <cassert>



namespace bluetooth {

namespace packet {
@@ -24,7 +25,7 @@ namespace packet { 
ByteInserter::ByteInserter(std::vector<uint8_t>& vector) : std::back_insert_iterator<std::vector<uint8_t>>(vector) {}



ByteInserter::~ByteInserter() {

  ASSERT(registered_observers_.empty());

  assert(registered_observers_.empty());

}



void ByteInserter::RegisterObserver(const ByteObserver& observer) {

system/gd/packet/endian_inserter.h

+2 −2
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


#pragma once



#include <cassert>

#include <cstdint>

#include <forward_list>

#include <iterator>

#include <memory>

#include <vector>



#include "os/log.h"

#include "packet/bit_inserter.h"

#include "packet/custom_field_fixed_size_interface.h"
@@ -69,7 +69,7 @@ class EndianInserter { 
  // Write num_bits bits using the iterator

  template <typename T, typename std::enable_if<std::is_trivial<T>::value, int>::type = 0>

  void insert(T value, BitInserter& it, size_t num_bits) const {

    ASSERT(num_bits <= (sizeof(T) * 8));

    assert(num_bits <= (sizeof(T) * 8));



    for (size_t i = 0; i < num_bits / 8; i++) {

      if (little_endian == true) {

system/gd/packet/fragmenting_inserter.cc

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


#include "packet/fragmenting_inserter.h"



#include "os/log.h"

#undef NDEBUG

#include <cassert>



namespace bluetooth {

namespace packet {
@@ -27,7 +28,7 @@ FragmentingInserter::FragmentingInserter(size_t mtu, 
      iterator_(iterator) {}



void FragmentingInserter::insert_bits(uint8_t byte, size_t num_bits) {

  ASSERT(curr_packet_ != nullptr);

  assert(curr_packet_ != nullptr);

  size_t total_bits = num_bits + num_saved_bits_;

  uint16_t new_value = static_cast<uint8_t>(saved_bits_) | (static_cast<uint16_t>(byte) << num_saved_bits_);

  if (total_bits >= 8) {