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

Commit 80150f5d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Reduce excessive l2cap traffic logging"

parents bfb56805 24b2fa3b

system/stack/l2cap/l2c_csm.cc

+32 −32
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ void l2c_csm_execute(tL2C_CCB* p_ccb, tL2CEVT event, void* p_data) { 
    return;

  }



  LOG_DEBUG("Entry chnl_state=%s [%d], event=%s [%d]",

  LOG_VERBOSE("Entry chnl_state=%s [%d], event=%s [%d]",

              channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

              l2c_csm_get_event_name(event), event);
@@ -358,7 +358,7 @@ static void l2c_csm_closed(tL2C_CCB* p_ccb, tL2CEVT event, void* p_data) { 
    default:

      LOG_ERROR("Handling unexpected event:%s", l2c_csm_get_event_name(event));

  }

  LOG_DEBUG("Exit chnl_state=%s [%d], event=%s [%d]",

  LOG_VERBOSE("Exit chnl_state=%s [%d], event=%s [%d]",

              channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

              l2c_csm_get_event_name(event), event);

}
@@ -466,7 +466,7 @@ static void l2c_csm_orig_w4_sec_comp(tL2C_CCB* p_ccb, tL2CEVT event, 
    default:

      LOG_ERROR("Handling unexpected event:%s", l2c_csm_get_event_name(event));

  }

  LOG_DEBUG("Exit chnl_state=%s [%d], event=%s [%d]",

  LOG_VERBOSE("Exit chnl_state=%s [%d], event=%s [%d]",

              channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

              l2c_csm_get_event_name(event), event);

}
@@ -606,7 +606,7 @@ static void l2c_csm_term_w4_sec_comp(tL2C_CCB* p_ccb, tL2CEVT event, 
    default:

      LOG_ERROR("Handling unexpected event:%s", l2c_csm_get_event_name(event));

  }

  LOG_DEBUG("Exit chnl_state=%s [%d], event=%s [%d]",

  LOG_VERBOSE("Exit chnl_state=%s [%d], event=%s [%d]",

              channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

              l2c_csm_get_event_name(event), event);

}
@@ -794,7 +794,7 @@ static void l2c_csm_w4_l2cap_connect_rsp(tL2C_CCB* p_ccb, tL2CEVT event, 
    default:

      LOG_ERROR("Handling unexpected event:%s", l2c_csm_get_event_name(event));

  }

  LOG_DEBUG("Exit chnl_state=%s [%d], event=%s [%d]",

  LOG_VERBOSE("Exit chnl_state=%s [%d], event=%s [%d]",

              channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

              l2c_csm_get_event_name(event), event);

}
@@ -957,7 +957,7 @@ static void l2c_csm_w4_l2ca_connect_rsp(tL2C_CCB* p_ccb, tL2CEVT event, 
    default:

      LOG_ERROR("Handling unexpected event:%s", l2c_csm_get_event_name(event));

  }

  LOG_DEBUG("Exit chnl_state=%s [%d], event=%s [%d]",

  LOG_VERBOSE("Exit chnl_state=%s [%d], event=%s [%d]",

              channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

              l2c_csm_get_event_name(event), event);

}
@@ -1257,7 +1257,7 @@ static void l2c_csm_config(tL2C_CCB* p_ccb, tL2CEVT event, void* p_data) { 
    default:

      LOG_ERROR("Handling unexpected event:%s", l2c_csm_get_event_name(event));

  }

  LOG_DEBUG("Exit chnl_state=%s [%d], event=%s [%d]",

  LOG_VERBOSE("Exit chnl_state=%s [%d], event=%s [%d]",

              channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

              l2c_csm_get_event_name(event), event);

}
@@ -1281,7 +1281,7 @@ static void l2c_csm_open(tL2C_CCB* p_ccb, tL2CEVT event, void* p_data) { 
  uint16_t credit = 0;

  tL2CAP_LE_CFG_INFO* p_le_cfg = (tL2CAP_LE_CFG_INFO*)p_data;



  LOG_DEBUG("LCID: 0x%04x  st: OPEN  evt: %s", p_ccb->local_cid,

  LOG_VERBOSE("LCID: 0x%04x  st: OPEN  evt: %s", p_ccb->local_cid,

              l2c_csm_get_event_name(event));



  switch (event) {
@@ -1447,7 +1447,7 @@ static void l2c_csm_open(tL2C_CCB* p_ccb, tL2CEVT event, void* p_data) { 
    default:

      LOG_ERROR("Handling unexpected event:%s", l2c_csm_get_event_name(event));

  }

  LOG_DEBUG("Exit chnl_state=%s [%d], event=%s [%d]",

  LOG_VERBOSE("Exit chnl_state=%s [%d], event=%s [%d]",

              channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

              l2c_csm_get_event_name(event), event);

}
@@ -1504,7 +1504,7 @@ static void l2c_csm_w4_l2cap_disconnect_rsp(tL2C_CCB* p_ccb, tL2CEVT event, 
    default:

      LOG_ERROR("Handling unexpected event:%s", l2c_csm_get_event_name(event));

  }

  LOG_DEBUG("Exit chnl_state=%s [%d], event=%s [%d]",

  LOG_VERBOSE("Exit chnl_state=%s [%d], event=%s [%d]",

              channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

              l2c_csm_get_event_name(event), event);

}
@@ -1559,7 +1559,7 @@ static void l2c_csm_w4_l2ca_disconnect_rsp(tL2C_CCB* p_ccb, tL2CEVT event, 
    default:

      LOG_ERROR("Handling unexpected event:%s", l2c_csm_get_event_name(event));

  }

  LOG_DEBUG("Exit chnl_state=%s [%d], event=%s [%d]",

  LOG_VERBOSE("Exit chnl_state=%s [%d], event=%s [%d]",

              channel_state_text(p_ccb->chnl_state).c_str(), p_ccb->chnl_state,

              l2c_csm_get_event_name(event), event);

}

system/stack/l2cap/l2c_link.cc

+18 −17
Original line number Diff line number Diff line
@@ -971,7 +971,7 @@ void l2c_link_check_send_pkts(tL2C_LCB* p_lcb, uint16_t local_cid, 


      /* See if we can send anything from the Link Queue */

      if (!list_is_empty(p_lcb->link_xmit_data_q)) {

        LOG_DEBUG("Sending to lower layer");

        LOG_VERBOSE("Sending to lower layer");

        p_buf = (BT_HDR*)list_front(p_lcb->link_xmit_data_q);

        list_remove(p_lcb->link_xmit_data_q, p_buf);

        l2c_link_send_to_lower(p_lcb, p_buf);
@@ -1009,7 +1009,7 @@ void l2c_link_check_send_pkts(tL2C_LCB* p_lcb, uint16_t local_cid, 
      LOG_INFO("A partial segment is being sent, cannot send anything else");

      return;

    }

    LOG_DEBUG(

    LOG_VERBOSE(

        "Direct send, transport=%d, xmit_window=%d, le_xmit_window=%d, "

        "sent_not_acked=%d, link_xmit_quota=%d",

        p_lcb->transport, l2cb.controller_xmit_window,
@@ -1023,10 +1023,10 @@ void l2c_link_check_send_pkts(tL2C_LCB* p_lcb, uint16_t local_cid, 
             (p_lcb->transport == BT_TRANSPORT_LE))) &&

           (p_lcb->sent_not_acked < p_lcb->link_xmit_quota)) {

      if (list_is_empty(p_lcb->link_xmit_data_q)) {

        LOG_DEBUG("No transmit data, skipping");

        LOG_VERBOSE("No transmit data, skipping");

        break;

      }

      LOG_DEBUG("Sending to lower layer");

      LOG_VERBOSE("Sending to lower layer");

      p_buf = (BT_HDR*)list_front(p_lcb->link_xmit_data_q);

      list_remove(p_lcb->link_xmit_data_q, p_buf);

      l2c_link_send_to_lower(p_lcb, p_buf);
@@ -1034,7 +1034,7 @@ void l2c_link_check_send_pkts(tL2C_LCB* p_lcb, uint16_t local_cid, 


    if (!single_write) {

      /* See if we can send anything for any channel */

      LOG_DEBUG("Trying to send other data when single_write is false");

      LOG_VERBOSE("Trying to send other data when single_write is false");

      while (((l2cb.controller_xmit_window != 0 &&

               (p_lcb->transport == BT_TRANSPORT_BR_EDR)) ||

              (l2cb.controller_le_xmit_window != 0 &&
@@ -1042,10 +1042,10 @@ void l2c_link_check_send_pkts(tL2C_LCB* p_lcb, uint16_t local_cid, 
             (p_lcb->sent_not_acked < p_lcb->link_xmit_quota)) {

        p_buf = l2cu_get_next_buffer_to_send(p_lcb);

        if (p_buf == NULL) {

          LOG_DEBUG("No next buffer, skipping");

          LOG_VERBOSE("No next buffer, skipping");

          break;

        }

        LOG_DEBUG("Sending to lower layer");

        LOG_VERBOSE("Sending to lower layer");

        l2c_link_send_to_lower(p_lcb, p_buf);

      }

    }
@@ -1091,7 +1091,7 @@ static void l2c_link_send_to_lower_br_edr(tL2C_LCB* p_lcb, BT_HDR* p_buf) { 
  l2cb.controller_xmit_window--;



  acl_send_data_packet_br_edr(p_lcb->remote_bd_addr, p_buf);

  LOG_DEBUG("TotalWin=%d,Hndl=0x%x,Quota=%d,Unack=%d,RRQuota=%d,RRUnack=%d",

  LOG_VERBOSE("TotalWin=%d,Hndl=0x%x,Quota=%d,Unack=%d,RRQuota=%d,RRUnack=%d",

              l2cb.controller_xmit_window, p_lcb->Handle(),

              p_lcb->link_xmit_quota, p_lcb->sent_not_acked,

              l2cb.round_robin_quota, l2cb.round_robin_unacked);
@@ -1267,8 +1267,9 @@ tL2C_CCB* l2cu_get_next_channel_in_rr(tL2C_LCB* p_lcb) { 
        return NULL;

      }



      LOG_DEBUG("RR scan pri=%d, lcid=0x%04x, q_cout=%zu", p_ccb->ccb_priority,

                p_ccb->local_cid, fixed_queue_length(p_ccb->xmit_hold_q));

      LOG_VERBOSE("RR scan pri=%d, lcid=0x%04x, q_cout=%zu",

                  p_ccb->ccb_priority, p_ccb->local_cid,

                  fixed_queue_length(p_ccb->xmit_hold_q));



      /* store the next serving channel */

      /* this channel is the last channel of its priority group */
@@ -1324,7 +1325,7 @@ tL2C_CCB* l2cu_get_next_channel_in_rr(tL2C_LCB* p_lcb) { 
  }



  if (p_serve_ccb) {

    LOG_DEBUG("RR service pri=%d, quota=%d, lcid=0x%04x",

    LOG_VERBOSE("RR service pri=%d, quota=%d, lcid=0x%04x",

                p_serve_ccb->ccb_priority,

                p_lcb->rr_serv[p_serve_ccb->ccb_priority].quota,

                p_serve_ccb->local_cid);