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

Commit 006c5a6a authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Use GD style logging through whole stack 

This make it easier to copy code. Also if we ever decide to expose
legacy code to GD, having same logging format will make things easier.

Test: compilation
Change-Id: I21ac96e1be1baf4c2633372e9be38b9f4cf74199
parent e5a16760

system/audio_a2dp_hw/src/audio_a2dp_hw.cc

+5 −6
Original line number Diff line number Diff line
@@ -70,12 +70,11 @@ 
// sockets

#define WRITE_POLL_MS 20



#define FNLOG() LOG_VERBOSE(LOG_TAG, "%s", __func__);

#define DEBUG(fmt, ...) \

  LOG_VERBOSE(LOG_TAG, "%s: " fmt, __func__, ##__VA_ARGS__)

#define INFO(fmt, ...) LOG_INFO(LOG_TAG, "%s: " fmt, __func__, ##__VA_ARGS__)

#define WARN(fmt, ...) LOG_WARN(LOG_TAG, "%s: " fmt, __func__, ##__VA_ARGS__)

#define ERROR(fmt, ...) LOG_ERROR(LOG_TAG, "%s: " fmt, __func__, ##__VA_ARGS__)

#define FNLOG() LOG_VERBOSE("%s", __func__);

#define DEBUG(fmt, ...) LOG_VERBOSE("%s: " fmt, __func__, ##__VA_ARGS__)

#define INFO(fmt, ...) LOG_INFO("%s: " fmt, __func__, ##__VA_ARGS__)

#define WARN(fmt, ...) LOG_WARN("%s: " fmt, __func__, ##__VA_ARGS__)

#define ERROR(fmt, ...) LOG_ERROR("%s: " fmt, __func__, ##__VA_ARGS__)



#define ASSERTC(cond, msg, val)                                           \

  if (!(cond)) {                                                          \

system/audio_hearing_aid_hw/src/audio_hearing_aid_hw.cc

+5 −6
Original line number Diff line number Diff line
@@ -57,12 +57,11 @@ 
// sockets

#define WRITE_POLL_MS 20



#define FNLOG() LOG_VERBOSE(LOG_TAG, "%s", __func__);

#define DEBUG(fmt, ...) \

  LOG_VERBOSE(LOG_TAG, "%s: " fmt, __func__, ##__VA_ARGS__)

#define INFO(fmt, ...) LOG_INFO(LOG_TAG, "%s: " fmt, __func__, ##__VA_ARGS__)

#define WARN(fmt, ...) LOG_WARN(LOG_TAG, "%s: " fmt, __func__, ##__VA_ARGS__)

#define ERROR(fmt, ...) LOG_ERROR(LOG_TAG, "%s: " fmt, __func__, ##__VA_ARGS__)

#define FNLOG() LOG_VERBOSE("%s", __func__);

#define DEBUG(fmt, ...) LOG_VERBOSE("%s: " fmt, __func__, ##__VA_ARGS__)

#define INFO(fmt, ...) LOG_INFO("%s: " fmt, __func__, ##__VA_ARGS__)

#define WARN(fmt, ...) LOG_WARN("%s: " fmt, __func__, ##__VA_ARGS__)

#define ERROR(fmt, ...) LOG_ERROR("%s: " fmt, __func__, ##__VA_ARGS__)



#define ASSERTC(cond, msg, val)                                           \

  if (!(cond)) {                                                          \

system/bta/ag/bta_ag_cmd.cc

+1 −2
Original line number Diff line number Diff line
@@ -210,8 +210,7 @@ static void bta_ag_send_result(tBTA_AG_SCB* p_scb, size_t code, 
                               const char* p_arg, int16_t int_arg) {

  const tBTA_AG_RESULT* result = bta_ag_result_by_code(code);

  if (result == nullptr) {

    LOG_ERROR(LOG_TAG, "%s Unable to lookup result for code %zu", __func__,

              code);

    LOG_ERROR("%s Unable to lookup result for code %zu", __func__, code);

    return;

  }

system/bta/av/bta_av_aact.cc

+34 −41
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ static void bta_av_save_addr(tBTA_AV_SCB* p_scb, const RawAddress& bd_addr) { 
                   bd_addr.ToString().c_str(), p_scb->recfg_sup,

                   p_scb->suspend_sup);

  if (p_scb->PeerAddress() != bd_addr) {

    LOG_INFO(LOG_TAG, "%s: reset flags old_addr=%s new_addr=%s", __func__,

    LOG_INFO("%s: reset flags old_addr=%s new_addr=%s", __func__,

             p_scb->PeerAddress().ToString().c_str(),

             bd_addr.ToString().c_str());

    /* a new addr, reset the supported flags */
@@ -293,9 +293,9 @@ static void bta_av_save_addr(tBTA_AV_SCB* p_scb, const RawAddress& bd_addr) { 
 *

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

static void notify_start_failed(tBTA_AV_SCB* p_scb) {

  LOG_ERROR(LOG_TAG, "%s: peer %s role:0x%x bta_channel:%d bta_handle:0x%x",

            __func__, p_scb->PeerAddress().ToString().c_str(), p_scb->role,

            p_scb->chnl, p_scb->hndl);

  LOG_ERROR("%s: peer %s role:0x%x bta_channel:%d bta_handle:0x%x", __func__,

            p_scb->PeerAddress().ToString().c_str(), p_scb->role, p_scb->chnl,

            p_scb->hndl);

  tBTA_AV_START start;

  /* if start failed, clear role */

  p_scb->role &= ~BTA_AV_ROLE_START_INT;
@@ -902,8 +902,7 @@ void bta_av_cleanup(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) { 
  tBTA_AV_CONN_CHG msg;

  uint8_t role = BTA_AV_ROLE_AD_INT;



  LOG_INFO(LOG_TAG, "%s peer %s", __func__,

           p_scb->PeerAddress().ToString().c_str());

  LOG_INFO("%s peer %s", __func__, p_scb->PeerAddress().ToString().c_str());



  /* free any buffers */

  p_scb->sdp_discovery_started = false;
@@ -1138,7 +1137,6 @@ void bta_av_setconfig_rsp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
  local_sep = bta_av_get_scb_sep_type(p_scb, avdt_handle);

  bta_av_adjust_seps_idx(p_scb, avdt_handle);

  LOG_DEBUG(

      LOG_TAG,

      "%s: peer %s bta_handle=0x%x avdt_handle=%d sep_idx=%d cur_psc_mask:0x%x",

      __func__, p_scb->PeerAddress().ToString().c_str(), p_scb->hndl,

      p_scb->avdt_handle, p_scb->sep_idx, p_scb->cur_psc_mask);
@@ -1751,8 +1749,8 @@ void bta_av_getcap_results(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
    else if (uuid_int == UUID_SERVCLASS_AUDIO_SINK)

      bta_av_adjust_seps_idx(p_scb,

                             bta_av_get_scb_handle(p_scb, AVDT_TSEP_SNK));

    LOG_DEBUG(LOG_TAG, "%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x",

              __func__, p_scb->sep_idx, p_scb->avdt_handle, p_scb->hndl);

    LOG_DEBUG("%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x", __func__,

              p_scb->sep_idx, p_scb->avdt_handle, p_scb->hndl);



    /* use only the services peer supports */

    cfg.psc_mask &= p_scb->peer_cap.psc_mask;
@@ -1801,7 +1799,7 @@ void bta_av_setconfig_rej(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
  uint8_t avdt_handle = p_data->ci_setconfig.avdt_handle;



  bta_av_adjust_seps_idx(p_scb, avdt_handle);

  LOG_DEBUG(LOG_TAG, "%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x", __func__,

  LOG_DEBUG("%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x", __func__,

            p_scb->sep_idx, p_scb->avdt_handle, p_scb->hndl);

  AVDT_ConfigRsp(p_scb->avdt_handle, p_scb->avdt_label, AVDT_ERR_UNSUP_CFG, 0);
@@ -1859,8 +1857,7 @@ void bta_av_do_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
  uint8_t clear_policy = 0;

  uint8_t cur_role;



  LOG_INFO(LOG_TAG,

           "%s: peer %s sco_occupied:%s role:0x%x started:%s wait:0x%x",

  LOG_INFO("%s: peer %s sco_occupied:%s role:0x%x started:%s wait:0x%x",

           __func__, p_scb->PeerAddress().ToString().c_str(),

           logbool(bta_av_cb.sco_occupied).c_str(), p_scb->role,

           logbool(p_scb->started).c_str(), p_scb->wait);
@@ -1883,7 +1880,6 @@ void bta_av_do_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
    p_scb->role |= BTA_AV_ROLE_START_INT;

    if (p_scb->wait != 0) {

      LOG_WARN(

          LOG_TAG,

          "%s: peer %s start stream request ignored: "

          "already waiting: sco_occupied:%s role:0x%x started:%s wait:0x%x",

          __func__, p_scb->PeerAddress().ToString().c_str(),
@@ -1901,7 +1897,6 @@ void bta_av_do_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 


  if ((p_scb->role & BTA_AV_ROLE_START_INT) != 0) {

    LOG_WARN(

        LOG_TAG,

        "%s: peer %s start stream request ignored: "

        "already initiated: sco_occupied:%s role:0x%x started:%s wait:0x%x",

        __func__, p_scb->PeerAddress().ToString().c_str(),
@@ -1914,11 +1909,11 @@ void bta_av_do_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
  bta_sys_busy(BTA_ID_AV, bta_av_cb.audio_open_cnt, p_scb->PeerAddress());

  uint16_t result = AVDT_StartReq(&p_scb->avdt_handle, 1);

  if (result != AVDT_SUCCESS) {

    LOG_ERROR(LOG_TAG, "%s: AVDT_StartReq failed for peer %s result:%d",

              __func__, p_scb->PeerAddress().ToString().c_str(), result);

    LOG_ERROR("%s: AVDT_StartReq failed for peer %s result:%d", __func__,

              p_scb->PeerAddress().ToString().c_str(), result);

    bta_av_start_failed(p_scb, p_data);

  }

  LOG_INFO(LOG_TAG,

  LOG_INFO(

      "%s: peer %s start requested: sco_occupied:%s role:0x%x "

      "started:%s wait:0x%x",

      __func__, p_scb->PeerAddress().ToString().c_str(),
@@ -2253,8 +2248,7 @@ void bta_av_start_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
  uint8_t cur_role;

  uint8_t local_tsep = p_scb->seps[p_scb->sep_idx].tsep;



  LOG_INFO(LOG_TAG,

           "%s: peer %s bta_handle:0x%x wait:0x%x role:0x%x local_tsep:%d",

  LOG_INFO("%s: peer %s bta_handle:0x%x wait:0x%x role:0x%x local_tsep:%d",

           __func__, p_scb->PeerAddress().ToString().c_str(), p_scb->hndl,

           p_scb->wait, p_scb->role, local_tsep);
@@ -2839,11 +2833,10 @@ void bta_av_rcfg_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
      if (interop_match_name(INTEROP_DISABLE_AVDTP_RECONFIGURE, remote_name) ||

          interop_match_addr(INTEROP_DISABLE_AVDTP_RECONFIGURE,

                             (const RawAddress*)&p_scb->PeerAddress())) {

        LOG_INFO(LOG_TAG,

        LOG_INFO(

            "%s: disable AVDTP RECONFIGURE: interop matched "

            "name %s address %s",

                 __func__, remote_name,

                 p_scb->PeerAddress().ToString().c_str());

            __func__, remote_name, p_scb->PeerAddress().ToString().c_str());

        disable_avdtp_reconfigure = true;

      }

    }
@@ -2903,8 +2896,8 @@ void bta_av_rcfg_open(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) { 
    /* we may choose to use a different SEP at reconfig.

     * adjust the sep_idx now */

    bta_av_adjust_seps_idx(p_scb, bta_av_get_scb_handle(p_scb, AVDT_TSEP_SRC));

    LOG_DEBUG(LOG_TAG, "%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x",

              __func__, p_scb->sep_idx, p_scb->avdt_handle, p_scb->hndl);

    LOG_DEBUG("%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x", __func__,

              p_scb->sep_idx, p_scb->avdt_handle, p_scb->hndl);



    /* open the stream with the new config */

    p_scb->sep_info_idx = p_scb->rcfg_idx;
@@ -2940,7 +2933,7 @@ void bta_av_security_rej(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) { 
 ******************************************************************************/

void bta_av_chk_2nd_start(tBTA_AV_SCB* p_scb,

                          UNUSED_ATTR tBTA_AV_DATA* p_data) {

  LOG_INFO(LOG_TAG,

  LOG_INFO(

      "%s: peer %s channel:%d bta_av_cb.audio_open_cnt:%d role:0x%x "

      "features:0x%x",

      __func__, p_scb->PeerAddress().ToString().c_str(), p_scb->chnl,
@@ -2963,7 +2956,7 @@ void bta_av_chk_2nd_start(tBTA_AV_SCB* p_scb, 
          if (!new_started) {

            // Start the new stream

            new_started = true;

            LOG_INFO(LOG_TAG,

            LOG_INFO(

                "%s: starting new stream for peer %s because peer %s "

                "already started",

                __func__, p_scb->PeerAddress().ToString().c_str(),

system/bta/av/bta_av_act.cc

+7 −8
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ void bta_av_rc_opened(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data) { 
      APPL_TRACE_DEBUG("%s: shdl:%d, srch %d", __func__, i + 1,

                       p_scb->rc_handle);

      shdl = i + 1;

      LOG_INFO(LOG_TAG, "%s: allow incoming AVRCP connections:%d", __func__,

      LOG_INFO("%s: allow incoming AVRCP connections:%d", __func__,

               p_scb->use_rc);

      alarm_cancel(p_scb->avrc_ct_timer);

      disc = p_scb->hndl;
@@ -1173,8 +1173,8 @@ void bta_av_conn_chg(tBTA_AV_DATA* p_data) { 
            "p_lcb_rc->conn_msk:x%x",

            __func__, p_lcb_rc->conn_msk);

        /* check if the RC is connected to the scb addr */

        LOG_INFO(LOG_TAG, "%s: p_lcb_rc->addr: %s conn_chg.peer_addr: %s",

                 __func__, p_lcb_rc->addr.ToString().c_str(),

        LOG_INFO("%s: p_lcb_rc->addr: %s conn_chg.peer_addr: %s", __func__,

                 p_lcb_rc->addr.ToString().c_str(),

                 p_data->conn_chg.peer_addr.ToString().c_str());



        if (p_lcb_rc->conn_msk &&
@@ -1426,8 +1426,7 @@ void bta_av_sig_chg(tBTA_AV_DATA* p_data) { 
        AVDT_DisconnectReq(p_data->str_msg.bd_addr, NULL);

        return;

      }

      LOG_INFO(LOG_TAG,

               "%s: AVDT_CONNECT_IND_EVT: peer %s selected lcb_index %d",

      LOG_INFO("%s: AVDT_CONNECT_IND_EVT: peer %s selected lcb_index %d",

               __func__, p_data->str_msg.bd_addr.ToString().c_str(), xx);



      tBTA_AV_SCB* p_scb = p_cb->p_scb[xx];
@@ -2074,7 +2073,7 @@ void bta_av_rc_closed(tBTA_AV_DATA* p_data) { 
        /* if the RCB uses the extra LCB, use the addr for event and clean it */

        p_lcb = &p_cb->lcb[BTA_AV_NUM_LINKS];

        rc_close.peer_addr = p_msg->peer_addr;

        LOG_INFO(LOG_TAG, "%s: rc_only closed bd_addr: %s", __func__,

        LOG_INFO("%s: rc_only closed bd_addr: %s", __func__,

                 p_msg->peer_addr.ToString().c_str());

        p_lcb->conn_msk = 0;

        p_lcb->lidx = 0;
@@ -2127,7 +2126,7 @@ void bta_av_rc_browse_opened(tBTA_AV_DATA* p_data) { 
  tBTA_AV_RC_CONN_CHG* p_msg = (tBTA_AV_RC_CONN_CHG*)p_data;

  tBTA_AV_RC_BROWSE_OPEN rc_browse_open;



  LOG_INFO(LOG_TAG, "%s: peer_addr: %s rc_handle:%d", __func__,

  LOG_INFO("%s: peer_addr: %s rc_handle:%d", __func__,

           p_msg->peer_addr.ToString().c_str(), p_msg->handle);



  rc_browse_open.status = BTA_AV_SUCCESS;
@@ -2153,7 +2152,7 @@ void bta_av_rc_browse_closed(tBTA_AV_DATA* p_data) { 
  tBTA_AV_RC_CONN_CHG* p_msg = (tBTA_AV_RC_CONN_CHG*)p_data;

  tBTA_AV_RC_BROWSE_CLOSE rc_browse_close;



  LOG_INFO(LOG_TAG, "%s: peer_addr: %s rc_handle:%d", __func__,

  LOG_INFO("%s: peer_addr: %s rc_handle:%d", __func__,

           p_msg->peer_addr.ToString().c_str(), p_msg->handle);



  rc_browse_close.rc_handle = p_msg->handle;