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

Commit 8766c00c authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Get rid of GATT_TRACE_* logs in favour of base/logging.h 

Change-Id: Id77d313c5bff5e611441599da351a766d0ce5916
parent 4c0a7168

system/conf/bt_stack.conf

+0 −2
Original line number Diff line number Diff line
@@ -22,11 +22,9 @@ TRC_AVDT_SCB=2 
TRC_AVDT_CCB=2

TRC_A2D=2

TRC_SDP=2

TRC_GATT=2

TRC_SMP=2

TRC_BTAPP=2

TRC_BTIF=2

TRC_GAP=2

TRC_BNEP=2

TRC_PAN=2

TRC_HID_HOST=2

system/include/bt_trace.h

+0 −27
Original line number Diff line number Diff line
@@ -583,33 +583,6 @@ static const char BTE_LOGMSG_MODULE[] = "bte_logmsg_module"; 
      BT_TRACE(TRACE_LAYER_MCA, TRACE_TYPE_API, ##__VA_ARGS__); \

  }



/* Define tracing for the ATT/GATT unit */

#define GATT_TRACE_ERROR(...)                                     \

  {                                                               \

    if (gatt_cb.trace_level >= BT_TRACE_LEVEL_ERROR)              \

      BT_TRACE(TRACE_LAYER_ATT, TRACE_TYPE_ERROR, ##__VA_ARGS__); \

  }

#define GATT_TRACE_WARNING(...)                                     \

  {                                                                 \

    if (gatt_cb.trace_level >= BT_TRACE_LEVEL_WARNING)              \

      BT_TRACE(TRACE_LAYER_ATT, TRACE_TYPE_WARNING, ##__VA_ARGS__); \

  }

#define GATT_TRACE_API(...)                                     \

  {                                                             \

    if (gatt_cb.trace_level >= BT_TRACE_LEVEL_API)              \

      BT_TRACE(TRACE_LAYER_ATT, TRACE_TYPE_API, ##__VA_ARGS__); \

  }

#define GATT_TRACE_EVENT(...)                                     \

  {                                                               \

    if (gatt_cb.trace_level >= BT_TRACE_LEVEL_EVENT)              \

      BT_TRACE(TRACE_LAYER_ATT, TRACE_TYPE_EVENT, ##__VA_ARGS__); \

  }

#define GATT_TRACE_DEBUG(...)                                     \

  {                                                               \

    if (gatt_cb.trace_level >= BT_TRACE_LEVEL_DEBUG)              \

      BT_TRACE(TRACE_LAYER_ATT, TRACE_TYPE_DEBUG, ##__VA_ARGS__); \

  }



/* Define tracing for the SMP unit */

#define SMP_TRACE_ERROR(...)                                      \

  {                                                               \

system/main/bte_logmsg.cc

+0 −3
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ 
#include "hidd_api.h"

#endif



#include "gatt_api.h"

#include "smp_api.h"



#ifndef DEFAULT_CONF_TRACE_LEVEL
@@ -128,8 +127,6 @@ static tBTTRC_FUNC_MAP bttrc_set_level_map[] = { 
#endif

    {BTTRC_ID_STK_SDP, BTTRC_ID_STK_SDP, SDP_SetTraceLevel, "TRC_SDP",

     DEFAULT_CONF_TRACE_LEVEL},

    {BTTRC_ID_STK_GATT, BTTRC_ID_STK_GATT, GATT_SetTraceLevel, "TRC_GATT",

     DEFAULT_CONF_TRACE_LEVEL},

    {BTTRC_ID_STK_SMP, BTTRC_ID_STK_SMP, SMP_SetTraceLevel, "TRC_SMP",

     DEFAULT_CONF_TRACE_LEVEL},

#if (HID_DEV_INCLUDED == TRUE)

system/stack/gatt/att_protocol.cc

+11 −8
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#define GATT_OP_CODE_SIZE 1

#define GATT_START_END_HANDLE_SIZE 4



using base::StringPrintf;

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

 *   ATT protocl message building utility                              *

 **********************************************************************/
@@ -302,8 +303,8 @@ BT_HDR* attp_build_value_cmd(uint16_t payload_size, uint8_t op_code, 
      /* update handle value pair length */

      if (op_code == GATT_RSP_READ_BY_TYPE) *p_pair_len = (len + 2);



      GATT_TRACE_WARNING("attribute value too long, to be truncated to %d",

                         len);

      LOG(WARNING) << StringPrintf(

          "attribute value too long, to be truncated to %d", len);

    }



    ARRAY_TO_STREAM(p, p_data, len);
@@ -330,11 +331,12 @@ tGATT_STATUS attp_send_msg_to_l2cap(tGATT_TCB& tcb, BT_HDR* p_toL2CAP) { 
    l2cap_ret = (uint16_t)L2CA_DataWrite(tcb.att_lcid, p_toL2CAP);



  if (l2cap_ret == L2CAP_DW_FAILED) {

    GATT_TRACE_ERROR("ATT   failed to pass msg:0x%0x to L2CAP",

    LOG(ERROR) << StringPrintf(

        "ATT   failed to pass msg:0x%0x to L2CAP",

        *((uint8_t*)(p_toL2CAP + 1) + p_toL2CAP->offset));

    return GATT_INTERNAL_ERROR;

  } else if (l2cap_ret == L2CAP_DW_CONGESTED) {

    GATT_TRACE_DEBUG("ATT congested, message accepted");

    VLOG(1) << StringPrintf("ATT congested, message accepted");

    return GATT_CONGESTED;

  }

  return GATT_SUCCESS;
@@ -355,7 +357,7 @@ BT_HDR* attp_build_sr_msg(tGATT_TCB& tcb, uint8_t op_code, 
  switch (op_code) {

    case GATT_RSP_READ_BLOB:

    case GATT_RSP_PREPARE_WRITE:

      GATT_TRACE_EVENT(

      VLOG(1) << StringPrintf(

          "ATT_RSP_READ_BLOB/GATT_RSP_PREPARE_WRITE: len = %d offset = %d",

          p_msg->attr_value.len, p_msg->attr_value.offset);

      offset = p_msg->attr_value.offset;
@@ -389,11 +391,12 @@ BT_HDR* attp_build_sr_msg(tGATT_TCB& tcb, uint8_t op_code, 
      break;



    default:

      GATT_TRACE_DEBUG("attp_build_sr_msg: unknown op code = %d", op_code);

      VLOG(1) << StringPrintf("attp_build_sr_msg: unknown op code = %d",

                              op_code);

      break;

  }



  if (!p_cmd) GATT_TRACE_ERROR("No resources");

  if (!p_cmd) LOG(ERROR) << StringPrintf("No resources");



  return p_cmd;

}

system/stack/gatt/gatt_api.cc

+94 −114

File changed.

Preview size limit exceeded, changes collapsed.