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

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

IA2: Combine disc state machine and disc actions am: 9fcc5480 

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



Change-Id: Ibc00e543448918d7d509d19628c9f7ca9ab9e262
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 77dcf3ed 9fcc5480

system/bta/dm/bta_dm_disc.cc

+215 −0
Original line number Diff line number Diff line
@@ -21,8 +21,12 @@ 
#include <bta.sysprop.h>

#endif



#include <base/strings/stringprintf.h>

#include <stddef.h>



#include <cstdint>



#include "bt_trace.h"

#include "bta/dm/bta_dm_int.h"

#include "bta/include/bta_api.h"

#include "bta/include/bta_gatt_api.h"
@@ -30,6 +34,8 @@ 
#include "btif/include/btif_config.h"

#include "btif/include/btif_dm.h"

#include "device/include/interop.h"

#include "gd/common/circular_buffer.h"

#include "gd/common/strings.h"

#include "include/bind_helpers.h"

#include "internal_include/bte_appl.h"

#include "osi/include/osi.h"  // UNUSED_ATTR
@@ -37,7 +43,9 @@ 
#include "stack/btm/neighbor_inquiry.h"

#include "stack/include/avrc_api.h"

#include "stack/include/bt_dev_class.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_name.h"

#include "stack/include/bt_types.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/gap_api.h"

#include "stack/include/gatt_api.h"
@@ -2142,3 +2150,210 @@ tBT_TRANSPORT bta_dm_determine_discovery_transport(const RawAddress& bd_addr) { 
}  // namespace testing

}  // namespace legacy

}  // namespace bluetooth



namespace {

constexpr size_t kSearchStateHistorySize = 50;

constexpr char kTimeFormatString[] = "%Y-%m-%d %H:%M:%S";



constexpr unsigned MillisPerSecond = 1000;

std::string EpochMillisToString(long long time_ms) {

  time_t time_sec = time_ms / MillisPerSecond;

  struct tm tm;

  localtime_r(&time_sec, &tm);

  std::string s = bluetooth::common::StringFormatTime(kTimeFormatString, tm);

  return base::StringPrintf(

      "%s.%03u", s.c_str(),

      static_cast<unsigned int>(time_ms % MillisPerSecond));

}

}  // namespace



tBTA_DM_SEARCH_CB bta_dm_search_cb;



struct tSEARCH_STATE_HISTORY {

  const tBTA_DM_STATE state;

  const tBTA_DM_EVT event;

  std::string ToString() const {

    return base::StringPrintf("state:%25s event:%s",

                              bta_dm_state_text(state).c_str(),

                              bta_dm_event_text(event).c_str());

  }

};



bluetooth::common::TimestampedCircularBuffer<tSEARCH_STATE_HISTORY>

    search_state_history_(kSearchStateHistorySize);



/*******************************************************************************

 *

 * Function         bta_dm_sm_search_disable

 *

 * Description     unregister BTA SEARCH DM

 *

 *

 * Returns          void

 *

 ******************************************************************************/

void bta_dm_search_sm_disable() { bta_sys_deregister(BTA_ID_DM_SEARCH); }



/*******************************************************************************

 *

 * Function         bta_dm_search_sm_execute

 *

 * Description      State machine event handling function for DM

 *

 *

 * Returns          void

 *

 ******************************************************************************/

bool bta_dm_search_sm_execute(const BT_HDR_RIGID* p_msg) {

  const tBTA_DM_EVT event = static_cast<tBTA_DM_EVT>(p_msg->event);

  LOG_INFO("state:%s, event:%s[0x%x]",

           bta_dm_state_text(bta_dm_search_get_state()).c_str(),

           bta_dm_event_text(event).c_str(), event);

  search_state_history_.Push({

      .state = bta_dm_search_get_state(),

      .event = event,

  });

  tBTA_DM_MSG* message = (tBTA_DM_MSG*)p_msg;

  switch (bta_dm_search_get_state()) {

    case BTA_DM_SEARCH_IDLE:

      switch (p_msg->event) {

        case BTA_DM_API_SEARCH_EVT:

          bta_dm_search_set_state(BTA_DM_SEARCH_ACTIVE);

          bta_dm_search_start(message);

          break;

        case BTA_DM_API_DISCOVER_EVT:

          bta_dm_search_set_state(BTA_DM_DISCOVER_ACTIVE);

          bta_dm_discover(message);

          break;

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_clear_queue();

          bta_dm_search_cancel_notify();

          break;

        case BTA_DM_SDP_RESULT_EVT:

          bta_dm_free_sdp_db();

          break;

        case BTA_DM_DISC_CLOSE_TOUT_EVT:

          bta_dm_close_gatt_conn(message);

          break;

        default:

          LOG_INFO("Received unexpected event %s[0x%x] in state %s",

                   bta_dm_event_text(event).c_str(), event,

                   bta_dm_state_text(bta_dm_search_get_state()).c_str());

      }

      break;

    case BTA_DM_SEARCH_ACTIVE:

      switch (p_msg->event) {

        case BTA_DM_REMT_NAME_EVT:

          bta_dm_remote_name_cmpl(message);

          break;

        case BTA_DM_SEARCH_CMPL_EVT:

          bta_dm_search_cmpl();

          break;

        case BTA_DM_DISCOVERY_RESULT_EVT:

          bta_dm_search_result(message);

          break;

        case BTA_DM_DISC_CLOSE_TOUT_EVT:

          bta_dm_close_gatt_conn(message);

          break;

        case BTA_DM_API_DISCOVER_EVT:

          bta_dm_queue_disc(message);

          break;

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_clear_queue();

          bta_dm_search_set_state(BTA_DM_SEARCH_CANCELLING);

          bta_dm_search_cancel();

          break;

        default:

          LOG_INFO("Received unexpected event %s[0x%x] in state %s",

                   bta_dm_event_text(event).c_str(), event,

                   bta_dm_state_text(bta_dm_search_get_state()).c_str());

      }

      break;

    case BTA_DM_SEARCH_CANCELLING:

      switch (p_msg->event) {

        case BTA_DM_API_SEARCH_EVT:

          bta_dm_queue_search(message);

          break;

        case BTA_DM_API_DISCOVER_EVT:

          bta_dm_queue_disc(message);

          break;

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_clear_queue();

          bta_dm_search_cancel_notify();

          break;

        case BTA_DM_SDP_RESULT_EVT:

        case BTA_DM_REMT_NAME_EVT:

        case BTA_DM_SEARCH_CMPL_EVT:

        case BTA_DM_DISCOVERY_RESULT_EVT:

          bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

          bta_dm_free_sdp_db();

          bta_dm_search_cancel_notify();

          bta_dm_execute_queued_request();

          break;

        case BTA_DM_DISC_CLOSE_TOUT_EVT:

          if (bluetooth::common::init_flags::

                  bta_dm_clear_conn_id_on_client_close_is_enabled()) {

            bta_dm_close_gatt_conn(message);

            break;

          }

          [[fallthrough]];

        default:

          LOG_INFO("Received unexpected event %s[0x%x] in state %s",

                   bta_dm_event_text(event).c_str(), event,

                   bta_dm_state_text(bta_dm_search_get_state()).c_str());

      }

      break;

    case BTA_DM_DISCOVER_ACTIVE:

      switch (p_msg->event) {

        case BTA_DM_REMT_NAME_EVT:

          bta_dm_remote_name_cmpl(message);

          break;

        case BTA_DM_SDP_RESULT_EVT:

          bta_dm_sdp_result(message);

          break;

        case BTA_DM_SEARCH_CMPL_EVT:

          bta_dm_search_cmpl();

          break;

        case BTA_DM_DISCOVERY_RESULT_EVT:

          bta_dm_disc_result(message);

          break;

        case BTA_DM_API_SEARCH_EVT:

          bta_dm_queue_search(message);

          break;

        case BTA_DM_API_DISCOVER_EVT:

          bta_dm_queue_disc(message);

          break;

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_clear_queue();

          bta_dm_search_set_state(BTA_DM_SEARCH_CANCELLING);

          bta_dm_search_cancel_notify();

          break;

        case BTA_DM_DISC_CLOSE_TOUT_EVT:

          if (bluetooth::common::init_flags::

                  bta_dm_clear_conn_id_on_client_close_is_enabled()) {

            bta_dm_close_gatt_conn(message);

            break;

          }

          [[fallthrough]];

        default:

          LOG_INFO("Received unexpected event %s[0x%x] in state %s",

                   bta_dm_event_text(event).c_str(), event,

                   bta_dm_state_text(bta_dm_search_get_state()).c_str());

      }

      break;

  }

  return true;

}



#define DUMPSYS_TAG "shim::legacy::bta::dm"

void DumpsysBtaDmDisc(int fd) {

  auto copy = search_state_history_.Pull();

  LOG_DUMPSYS(fd, " last %zu search state transitions", copy.size());

  for (const auto& it : copy) {

    LOG_DUMPSYS(fd, "   %s %s", EpochMillisToString(it.timestamp).c_str(),

                it.entry.ToString().c_str());

  }

  LOG_DUMPSYS(fd, " current bta_dm_search_state:%s",

              bta_dm_state_text(bta_dm_search_get_state()).c_str());

}

#undef DUMPSYS_TAG

system/bta/dm/bta_dm_disc.h

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

 * Copyright 2023 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



void DumpsysBtaDmDisc(int fd);

system/bta/dm/bta_dm_main.cc

+2 −209
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <stddef.h>



#include "bt_trace.h"

#include "bta/dm/bta_dm_disc.h"

#include "bta/dm/bta_dm_gatt_client.h"

#include "bta/dm/bta_dm_int.h"

#include "gd/common/circular_buffer.h"
@@ -34,221 +35,13 @@ 
#include "stack/include/bt_hdr.h"

#include "stack/include/bt_types.h"



/*****************************************************************************

 * Constants and types

 ****************************************************************************/



namespace {

constexpr size_t kSearchStateHistorySize = 50;

constexpr char kTimeFormatString[] = "%Y-%m-%d %H:%M:%S";



constexpr unsigned MillisPerSecond = 1000;

std::string EpochMillisToString(long long time_ms) {

  time_t time_sec = time_ms / MillisPerSecond;

  struct tm tm;

  localtime_r(&time_sec, &tm);

  std::string s = bluetooth::common::StringFormatTime(kTimeFormatString, tm);

  return base::StringPrintf(

      "%s.%03u", s.c_str(),

      static_cast<unsigned int>(time_ms % MillisPerSecond));

}

}  // namespace



tBTA_DM_CB bta_dm_cb;

tBTA_DM_SEARCH_CB bta_dm_search_cb;

tBTA_DM_DI_CB bta_dm_di_cb;



struct tSEARCH_STATE_HISTORY {

  const tBTA_DM_STATE state;

  const tBTA_DM_EVT event;

  std::string ToString() const {

    return base::StringPrintf("state:%25s event:%s",

                              bta_dm_state_text(state).c_str(),

                              bta_dm_event_text(event).c_str());

  }

};

bluetooth::common::TimestampedCircularBuffer<tSEARCH_STATE_HISTORY>

    search_state_history_(kSearchStateHistorySize);



/*******************************************************************************

 *

 * Function         bta_dm_sm_search_disable

 *

 * Description     unregister BTA SEARCH DM

 *

 *

 * Returns          void

 *

 ******************************************************************************/

void bta_dm_search_sm_disable() { bta_sys_deregister(BTA_ID_DM_SEARCH); }



/*******************************************************************************

 *

 * Function         bta_dm_search_sm_execute

 *

 * Description      State machine event handling function for DM

 *

 *

 * Returns          void

 *

 ******************************************************************************/

bool bta_dm_search_sm_execute(const BT_HDR_RIGID* p_msg) {

  const tBTA_DM_EVT event = static_cast<tBTA_DM_EVT>(p_msg->event);

  LOG_INFO("state:%s, event:%s[0x%x]",

           bta_dm_state_text(bta_dm_search_get_state()).c_str(),

           bta_dm_event_text(event).c_str(), event);

  search_state_history_.Push({

      .state = bta_dm_search_get_state(),

      .event = event,

  });

  tBTA_DM_MSG* message = (tBTA_DM_MSG*)p_msg;

  switch (bta_dm_search_get_state()) {

    case BTA_DM_SEARCH_IDLE:

      switch (p_msg->event) {

        case BTA_DM_API_SEARCH_EVT:

          bta_dm_search_set_state(BTA_DM_SEARCH_ACTIVE);

          bta_dm_search_start(message);

          break;

        case BTA_DM_API_DISCOVER_EVT:

          bta_dm_search_set_state(BTA_DM_DISCOVER_ACTIVE);

          bta_dm_discover(message);

          break;

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_clear_queue();

          bta_dm_search_cancel_notify();

          break;

        case BTA_DM_SDP_RESULT_EVT:

          bta_dm_free_sdp_db();

          break;

        case BTA_DM_DISC_CLOSE_TOUT_EVT:

          bta_dm_close_gatt_conn(message);

          break;

        default:

          LOG_INFO("Received unexpected event %s[0x%x] in state %s",

                   bta_dm_event_text(event).c_str(), event,

                   bta_dm_state_text(bta_dm_search_get_state()).c_str());

      }

      break;

    case BTA_DM_SEARCH_ACTIVE:

      switch (p_msg->event) {

        case BTA_DM_REMT_NAME_EVT:

          bta_dm_remote_name_cmpl(message);

          break;

        case BTA_DM_SEARCH_CMPL_EVT:

          bta_dm_search_cmpl();

          break;

        case BTA_DM_DISCOVERY_RESULT_EVT:

          bta_dm_search_result(message);

          break;

        case BTA_DM_DISC_CLOSE_TOUT_EVT:

          bta_dm_close_gatt_conn(message);

          break;

        case BTA_DM_API_DISCOVER_EVT:

          bta_dm_queue_disc(message);

          break;

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_clear_queue();

          bta_dm_search_set_state(BTA_DM_SEARCH_CANCELLING);

          bta_dm_search_cancel();

          break;

        default:

          LOG_INFO("Received unexpected event %s[0x%x] in state %s",

                   bta_dm_event_text(event).c_str(), event,

                   bta_dm_state_text(bta_dm_search_get_state()).c_str());

      }

      break;

    case BTA_DM_SEARCH_CANCELLING:

      switch (p_msg->event) {

        case BTA_DM_API_SEARCH_EVT:

          bta_dm_queue_search(message);

          break;

        case BTA_DM_API_DISCOVER_EVT:

          bta_dm_queue_disc(message);

          break;

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_clear_queue();

          bta_dm_search_cancel_notify();

          break;

        case BTA_DM_SDP_RESULT_EVT:

        case BTA_DM_REMT_NAME_EVT:

        case BTA_DM_SEARCH_CMPL_EVT:

        case BTA_DM_DISCOVERY_RESULT_EVT:

          bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

          bta_dm_free_sdp_db();

          bta_dm_search_cancel_notify();

          bta_dm_execute_queued_request();

          break;

        case BTA_DM_DISC_CLOSE_TOUT_EVT:

          if (bluetooth::common::init_flags::

                  bta_dm_clear_conn_id_on_client_close_is_enabled()) {

            bta_dm_close_gatt_conn(message);

            break;

          }

          [[fallthrough]];

        default:

          LOG_INFO("Received unexpected event %s[0x%x] in state %s",

                   bta_dm_event_text(event).c_str(), event,

                   bta_dm_state_text(bta_dm_search_get_state()).c_str());

      }

      break;

    case BTA_DM_DISCOVER_ACTIVE:

      switch (p_msg->event) {

        case BTA_DM_REMT_NAME_EVT:

          bta_dm_remote_name_cmpl(message);

          break;

        case BTA_DM_SDP_RESULT_EVT:

          bta_dm_sdp_result(message);

          break;

        case BTA_DM_SEARCH_CMPL_EVT:

          bta_dm_search_cmpl();

          break;

        case BTA_DM_DISCOVERY_RESULT_EVT:

          bta_dm_disc_result(message);

          break;

        case BTA_DM_API_SEARCH_EVT:

          bta_dm_queue_search(message);

          break;

        case BTA_DM_API_DISCOVER_EVT:

          bta_dm_queue_disc(message);

          break;

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_clear_queue();



          if (bluetooth::common::init_flags::

                  bta_dm_stop_discovery_on_search_cancel_is_enabled()) {

            bta_dm_search_set_state(BTA_DM_SEARCH_CANCELLING);

          }

          bta_dm_search_cancel_notify();

          break;

        case BTA_DM_DISC_CLOSE_TOUT_EVT:

          if (bluetooth::common::init_flags::

                  bta_dm_clear_conn_id_on_client_close_is_enabled()) {

            bta_dm_close_gatt_conn(message);

            break;

          }

          [[fallthrough]];

        default:

          LOG_INFO("Received unexpected event %s[0x%x] in state %s",

                   bta_dm_event_text(event).c_str(), event,

                   bta_dm_state_text(bta_dm_search_get_state()).c_str());

      }

      break;

  }

  return true;

}



extern TimestampedStringCircularBuffer gatt_history_;

#define DUMPSYS_TAG "shim::legacy::bta::dm"

void DumpsysBtaDm(int fd) {

  LOG_DUMPSYS_TITLE(fd, DUMPSYS_TAG);

  auto copy = search_state_history_.Pull();

  LOG_DUMPSYS(fd, " last %zu search state transitions", copy.size());

  for (const auto& it : copy) {

    LOG_DUMPSYS(fd, "   %s %s", EpochMillisToString(it.timestamp).c_str(),

                it.entry.ToString().c_str());

  }

  LOG_DUMPSYS(fd, " current bta_dm_search_state:%s",

              bta_dm_state_text(bta_dm_search_get_state()).c_str());

  DumpsysBtaDmDisc(fd);

  DumpsysBtaDmGattClient(fd);

}

#undef DUMPSYS_TAG