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

Commit 08720ac7 authored by Jack He's avatar Jack He
Browse files

Make thread names more meaningful 

* Rename threads:
  - module_wrapper -> bt_module_lifecycle_thread
  - btif_a2dp_sink_worker_thread -> bt_a2dp_sink_worker_thread
  - btif_a2dp_source_thread -> bt_a2dp_source_worker_thread
  - bt_jni_workqueue -> bt_jni_thread
  - stack_manager -> bt_stack_manager_thread
  - hci_thread -> bt_hci_thread
  - bt_workqueue -> bt_startup_thread
  - btu_message_loop -> bt_main_thread
* Rename functions:
  - do_in_bta_thread -> do_in_main_thread
  - get_message_loop -> get_main_message_loop
  - post_to_hci_message_loop -> post_to_main_message_loop
* Refactored bta_sys_sendmsg

Bug: 110303473
Test: make, unit test, stream music
Change-Id: I3051f6ea2d33db37af8eebafba7db4d1e113f611
parent 7fc931a4

system/bta/ag/bta_ag_api.cc

+21 −21
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ tBTA_STATUS BTA_AgEnable(tBTA_AG_CBACK* p_cback) { 
    }

  }

  bta_sys_register(BTA_ID_AG, &bta_ag_reg);

  do_in_bta_thread(FROM_HERE, base::Bind(&bta_ag_api_enable, p_cback));

  do_in_main_thread(FROM_HERE, base::Bind(&bta_ag_api_enable, p_cback));

  return BTA_SUCCESS;

}
@@ -77,7 +77,7 @@ tBTA_STATUS BTA_AgEnable(tBTA_AG_CBACK* p_cback) { 
 *

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

void BTA_AgDisable() {

  do_in_bta_thread(FROM_HERE, base::Bind(&bta_ag_api_disable));

  do_in_main_thread(FROM_HERE, base::Bind(&bta_ag_api_disable));

}



/*******************************************************************************
@@ -94,7 +94,7 @@ void BTA_AgRegister(tBTA_SERVICE_MASK services, tBTA_SEC sec_mask, 
                    tBTA_AG_FEAT features,

                    const std::vector<std::string>& service_names,

                    uint8_t app_id) {

  do_in_bta_thread(

  do_in_main_thread(

      FROM_HERE, base::Bind(&bta_ag_api_register, services, sec_mask, features,

                            service_names, app_id));

}
@@ -110,8 +110,8 @@ void BTA_AgRegister(tBTA_SERVICE_MASK services, tBTA_SEC sec_mask, 
 *

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

void BTA_AgDeregister(uint16_t handle) {

  do_in_bta_thread(FROM_HERE,

                   base::Bind(&bta_ag_sm_execute_by_handle, handle,

  do_in_main_thread(

      FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, handle,

                            BTA_AG_API_DEREGISTER_EVT, tBTA_AG_DATA::kEmpty));

}
@@ -132,7 +132,7 @@ void BTA_AgOpen(uint16_t handle, const RawAddress& bd_addr, tBTA_SEC sec_mask) { 
  tBTA_AG_DATA data = {};

  data.api_open.bd_addr = bd_addr;

  data.api_open.sec_mask = sec_mask;

  do_in_bta_thread(FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, handle,

  do_in_main_thread(FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, handle,

                                          BTA_AG_API_OPEN_EVT, data));

}
@@ -148,7 +148,7 @@ void BTA_AgOpen(uint16_t handle, const RawAddress& bd_addr, tBTA_SEC sec_mask) { 
 *

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

void BTA_AgClose(uint16_t handle) {

  do_in_bta_thread(FROM_HERE,

  do_in_main_thread(FROM_HERE,

                    base::Bind(&bta_ag_sm_execute_by_handle, handle,

                               BTA_AG_API_CLOSE_EVT, tBTA_AG_DATA::kEmpty));

}
@@ -165,8 +165,8 @@ void BTA_AgClose(uint16_t handle) { 
 *

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

void BTA_AgAudioOpen(uint16_t handle) {

  do_in_bta_thread(FROM_HERE,

                   base::Bind(&bta_ag_sm_execute_by_handle, handle,

  do_in_main_thread(

      FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, handle,

                            BTA_AG_API_AUDIO_OPEN_EVT, tBTA_AG_DATA::kEmpty));

}
@@ -182,7 +182,7 @@ void BTA_AgAudioOpen(uint16_t handle) { 
 *

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

void BTA_AgAudioClose(uint16_t handle) {

  do_in_bta_thread(

  do_in_main_thread(

      FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, handle,

                            BTA_AG_API_AUDIO_CLOSE_EVT, tBTA_AG_DATA::kEmpty));

}
@@ -201,7 +201,7 @@ void BTA_AgAudioClose(uint16_t handle) { 
 ******************************************************************************/

void BTA_AgResult(uint16_t handle, tBTA_AG_RES result,

                  const tBTA_AG_RES_DATA& data) {

  do_in_bta_thread(FROM_HERE,

  do_in_main_thread(FROM_HERE,

                    base::Bind(&bta_ag_api_result, handle, result, data));

}
@@ -220,15 +220,15 @@ void BTA_AgResult(uint16_t handle, tBTA_AG_RES result, 
void BTA_AgSetCodec(uint16_t handle, tBTA_AG_PEER_CODEC codec) {

  tBTA_AG_DATA data = {};

  data.api_setcodec.codec = codec;

  do_in_bta_thread(FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, handle,

  do_in_main_thread(FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, handle,

                                          BTA_AG_API_SETCODEC_EVT, data));

}



void BTA_AgSetScoAllowed(bool value) {

  do_in_bta_thread(FROM_HERE, base::Bind(&bta_ag_set_sco_allowed, value));

  do_in_main_thread(FROM_HERE, base::Bind(&bta_ag_set_sco_allowed, value));

}



void BTA_AgSetActiveDevice(const RawAddress& active_device_addr) {

  do_in_bta_thread(

  do_in_main_thread(

      FROM_HERE, base::Bind(&bta_ag_api_set_active_device, active_device_addr));

}

system/bta/ag/bta_ag_rfc.cc

+5 −5
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static void bta_ag_port_cback(UNUSED_ATTR uint32_t code, uint16_t port_handle, 
                 << handle << " peer_addr " << p_scb->peer_addr << " state "

                 << std::to_string(p_scb->state);

    }

    do_in_bta_thread(FROM_HERE,

    do_in_main_thread(FROM_HERE,

                      base::Bind(&bta_ag_sm_execute_by_handle, handle,

                                 BTA_AG_RFC_DATA_EVT, tBTA_AG_DATA::kEmpty));

  }
@@ -155,7 +155,7 @@ static void bta_ag_mgmt_cback(uint32_t code, uint16_t port_handle, 


  tBTA_AG_DATA data = {};

  data.rfc.port_handle = port_handle;

  do_in_bta_thread(

  do_in_main_thread(

      FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, handle, event, data));

}
@@ -371,7 +371,7 @@ void bta_ag_rfc_do_close(tBTA_AG_SCB* p_scb, 
    /* Close API was called while AG is in Opening state.               */

    /* Need to trigger the state machine to send callback to the app    */

    /* and move back to INIT state.                                     */

    do_in_bta_thread(

    do_in_main_thread(

        FROM_HERE,

        base::Bind(&bta_ag_sm_execute_by_handle, bta_ag_scb_to_idx(p_scb),

                   BTA_AG_RFC_CLOSE_EVT, tBTA_AG_DATA::kEmpty));

system/bta/ag/bta_ag_sco.cc

+7 −7
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static void bta_ag_sco_conn_cback(uint16_t sco_idx) { 
  }



  if (handle != 0) {

    do_in_bta_thread(FROM_HERE,

    do_in_main_thread(FROM_HERE,

                      base::Bind(&bta_ag_sm_execute_by_handle, handle,

                                 BTA_AG_SCO_OPEN_EVT, tBTA_AG_DATA::kEmpty));

  } else {
@@ -217,7 +217,7 @@ static void bta_ag_sco_disc_cback(uint16_t sco_idx) { 


    bta_ag_cb.sco.p_curr_scb->inuse_codec = BTA_AG_CODEC_NONE;



    do_in_bta_thread(FROM_HERE,

    do_in_main_thread(FROM_HERE,

                      base::Bind(&bta_ag_sm_execute_by_handle, handle,

                                 BTA_AG_SCO_CLOSE_EVT, tBTA_AG_DATA::kEmpty));

  } else {
@@ -373,7 +373,7 @@ static void bta_ag_create_sco(tBTA_AG_SCB* p_scb, bool is_orig) { 
                 << " is not active, active_device=" << active_device_addr;

    if (bta_ag_cb.sco.p_curr_scb != nullptr &&

        bta_ag_cb.sco.p_curr_scb->in_use && p_scb == bta_ag_cb.sco.p_curr_scb) {

      do_in_bta_thread(

      do_in_main_thread(

          FROM_HERE, base::Bind(&bta_ag_sm_execute, p_scb, BTA_AG_SCO_CLOSE_EVT,

                                tBTA_AG_DATA::kEmpty));

    }

system/bta/ag/bta_ag_sdp.cc

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static void bta_ag_sdp_cback(uint16_t status, uint8_t idx) { 
      event = BTA_AG_DISC_INT_RES_EVT;

    }

    tBTA_AG_DATA disc_result = {.disc_result.status = status};

    do_in_bta_thread(FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, idx,

    do_in_main_thread(FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, idx,

                                            event, disc_result));

  }

}

system/bta/dm/bta_dm_act.cc

+10 −10
Original line number Diff line number Diff line
@@ -2827,34 +2827,34 @@ static void bta_dm_bl_change_cback(tBTM_BL_EVENT_DATA* p_data) { 
  switch (p_data->event) {

    case BTM_BL_CONN_EVT:

      /* connection up */

      do_in_bta_thread(FROM_HERE,

                       base::Bind(bta_dm_acl_change, true, *p_data->conn.p_bda,

      do_in_main_thread(

          FROM_HERE, base::Bind(bta_dm_acl_change, true, *p_data->conn.p_bda,

                                p_data->conn.transport, p_data->conn.handle));

      break;

    case BTM_BL_DISCN_EVT:

      /* connection down */

      do_in_bta_thread(

      do_in_main_thread(

          FROM_HERE, base::Bind(bta_dm_acl_change, false, *p_data->discn.p_bda,

                                p_data->discn.transport, p_data->discn.handle));

      break;



    case BTM_BL_UPDATE_EVT: {

      /* busy level update */

      do_in_bta_thread(FROM_HERE, base::Bind(send_busy_level_update,

      do_in_main_thread(FROM_HERE, base::Bind(send_busy_level_update,

                                              p_data->update.busy_level,

                                              p_data->update.busy_level_flags));

      return;

    }

    case BTM_BL_ROLE_CHG_EVT: {

      const auto& tmp = p_data->role_chg;

      do_in_bta_thread(FROM_HERE, base::Bind(handle_role_change, *tmp.p_bda,

      do_in_main_thread(FROM_HERE, base::Bind(handle_role_change, *tmp.p_bda,

                                              tmp.new_role, tmp.hci_status));

      return;

    }



    case BTM_BL_COLLISION_EVT:

      /* Collision report from Stack: Notify profiles */

      do_in_bta_thread(

      do_in_main_thread(

          FROM_HERE, base::Bind(bta_sys_notify_collision, *p_data->conn.p_bda));

      return;

  }