espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 12:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

bt: Replaced the tx queue in SPP VFS mode with ringbuffer

Browse Source
This commit is contained in:
xiongweichao
2022-09-27 15:12:35 +08:00
committed by BOT
parent 6d9987f4c8
commit aa25c4391c
5 changed files with 147 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/bt/host/bluedroid/Kconfig.in
View File

@@ -61,6 +61,15 @@ config BT_SPP_ENABLED
help help
This enables the Serial Port Profile This enables the Serial Port Profile
config BT_SPP_SEND_BUF_DEFAULT
int "SPP default send buffer size"
depends on BT_SPP_ENABLED
range 100 10000
default 4000
help
Sets the default send buffer size for new SPP channels. Setting a smaller
default SNDBUF size can save some memory, but may decrease performance.
config BT_L2CAP_ENABLED config BT_L2CAP_ENABLED
bool "BT L2CAP" bool "BT L2CAP"
depends on BT_CLASSIC_ENABLED depends on BT_CLASSIC_ENABLED

2
components/bt/host/bluedroid/btc/profile/std/include/btc_spp.h
View File

@@ -18,8 +18,6 @@
#define ESP_SPP_MAX_SESSION BTA_JV_MAX_RFC_SR_SESSION #define ESP_SPP_MAX_SESSION BTA_JV_MAX_RFC_SR_SESSION
#define ESP_SPP_SERVER_NAME_MAX 32 #define ESP_SPP_SERVER_NAME_MAX 32
#define ESP_SPP_RINGBUF_SIZE 1000
#define BTC_SPP_INVALID_SCN 0x00 #define BTC_SPP_INVALID_SCN 0x00
typedef enum { typedef enum {

228
components/bt/host/bluedroid/btc/profile/std/spp/btc_spp.c
View File

@@ -49,10 +49,12 @@ typedef struct {
typedef struct { typedef struct {
bool connected; bool connected;
bool is_server; bool is_server;
bool is_writing;
uint8_t serial; uint8_t serial;
uint8_t scn; uint8_t scn;
uint8_t max_session; uint8_t max_session;
uint16_t mtu; uint16_t mtu;
uint16_t write_data_len;
uint32_t id; uint32_t id;
uint32_t sdp_handle; uint32_t sdp_handle;
uint32_t rfc_handle; uint32_t rfc_handle;
@@ -64,7 +66,10 @@ typedef struct {
esp_spp_sec_t security; esp_spp_sec_t security;
esp_bd_addr_t addr; esp_bd_addr_t addr;
slot_data_t rx; slot_data_t rx;
slot_data_t tx; union {
slot_data_t tx;
RingbufHandle_t ringbuf_write;
};
uint8_t service_uuid[16]; uint8_t service_uuid[16];
char service_name[ESP_SPP_SERVER_NAME_MAX + 1]; char service_name[ESP_SPP_SERVER_NAME_MAX + 1];
} spp_slot_t; } spp_slot_t;
@@ -135,6 +140,8 @@ static spp_slot_t *spp_malloc_slot(void)
(*slot)->is_server = false; (*slot)->is_server = false;
(*slot)->mtu = 0; (*slot)->mtu = 0;
(*slot)->write_data = NULL; (*slot)->write_data = NULL;
(*slot)->write_data_len = 0;
(*slot)->is_writing = false;
(*slot)->close_alarm = NULL; (*slot)->close_alarm = NULL;
/* clear the old event bits */ /* clear the old event bits */
if (spp_local_param.tx_event_group) { if (spp_local_param.tx_event_group) {
@@ -146,12 +153,18 @@ static spp_slot_t *spp_malloc_slot(void)
err_no = 1; err_no = 1;
goto err; goto err;
} }
if (init_slot_data(&(*slot)->tx, SLOT_TX_QUEUE_SIZE)) { if (spp_local_param.spp_mode == ESP_SPP_MODE_CB) {
BTC_TRACE_ERROR("%s unable to malloc tx queue!", __func__); if (init_slot_data(&(*slot)->tx, SLOT_TX_QUEUE_SIZE)) {
err_no = 2; BTC_TRACE_ERROR("%s unable to malloc tx queue!", __func__);
goto err; err_no = 2;
} goto err;
if (spp_local_param.spp_mode == ESP_SPP_MODE_VFS) { }
} else {
if (((*slot)->ringbuf_write = xRingbufferCreate(BTC_SPP_SEND_BUF_DEFAULT, RINGBUF_TYPE_BYTEBUF)) == NULL) {
BTC_TRACE_ERROR("%s write ringbuffer create error!", __func__);
err_no = 2;
goto err;
}
if (esp_vfs_register_fd(spp_local_param.spp_vfs_id, &(*slot)->fd) != ESP_OK) { if (esp_vfs_register_fd(spp_local_param.spp_vfs_id, &(*slot)->fd) != ESP_OK) {
BTC_TRACE_ERROR("%s unable to register fd!", __func__); BTC_TRACE_ERROR("%s unable to register fd!", __func__);
err_no = 3; err_no = 3;
@@ -166,7 +179,9 @@ static spp_slot_t *spp_malloc_slot(void)
err: err:
switch (err_no) { switch (err_no) {
case 3: case 3:
free_slot_data(&(*slot)->tx); if (spp_local_param.spp_mode == ESP_SPP_MODE_VFS) {
vRingbufferDelete((*slot)->ringbuf_write);
}
case 2: case 2:
free_slot_data(&(*slot)->rx); free_slot_data(&(*slot)->rx);
case 1: case 1:
@@ -239,7 +254,7 @@ static void close_timeout_handler(void *arg)
status = btc_transfer_context(&msg, arg, sizeof(tBTA_JV), NULL); status = btc_transfer_context(&msg, arg, sizeof(tBTA_JV), NULL);
if (arg) { if (arg) {
free(arg); osi_free(arg);
} }
if (status != BT_STATUS_SUCCESS) { if (status != BT_STATUS_SUCCESS) {
@@ -256,8 +271,10 @@ static void spp_free_slot(spp_slot_t *slot)
if (spp_local_param.spp_mode == ESP_SPP_MODE_VFS) { if (spp_local_param.spp_mode == ESP_SPP_MODE_VFS) {
(void) esp_vfs_unregister_fd(spp_local_param.spp_vfs_id, slot->fd); (void) esp_vfs_unregister_fd(spp_local_param.spp_vfs_id, slot->fd);
xEventGroupSetBits(spp_local_param.tx_event_group, SLOT_CLOSE_BIT(slot->serial)); xEventGroupSetBits(spp_local_param.tx_event_group, SLOT_CLOSE_BIT(slot->serial));
vRingbufferDelete(slot->ringbuf_write);
} else {
free_slot_data(&slot->tx);
} }
free_slot_data(&slot->tx);
free_slot_data(&slot->rx); free_slot_data(&slot->rx);
if (slot->close_alarm) { if (slot->close_alarm) {
osi_alarm_free(slot->close_alarm); osi_alarm_free(slot->close_alarm);
@@ -734,7 +751,7 @@ static void btc_spp_stop_srv(btc_spp_args_t *arg)
esp_spp_status_t ret = ESP_SPP_SUCCESS; esp_spp_status_t ret = ESP_SPP_SUCCESS;
bool is_remove_all = false; bool is_remove_all = false;
uint8_t i, j, srv_cnt = 0; uint8_t i, j, srv_cnt = 0;
uint8_t *srv_scn_arr = osi_malloc(MAX_RFC_PORTS); uint8_t *srv_scn_arr = NULL;
if (arg->stop_srv.scn == BTC_SPP_INVALID_SCN) { if (arg->stop_srv.scn == BTC_SPP_INVALID_SCN) {
is_remove_all = true; is_remove_all = true;
} }
@@ -745,6 +762,7 @@ static void btc_spp_stop_srv(btc_spp_args_t *arg)
ret = ESP_SPP_NEED_INIT; ret = ESP_SPP_NEED_INIT;
break; break;
} }
srv_scn_arr = osi_malloc(MAX_RFC_PORTS);
if (srv_scn_arr == NULL) { if (srv_scn_arr == NULL) {
BTC_TRACE_ERROR("%s malloc srv_scn_arr failed\n", __func__); BTC_TRACE_ERROR("%s malloc srv_scn_arr failed\n", __func__);
ret = ESP_SPP_NO_RESOURCE; ret = ESP_SPP_NO_RESOURCE;
@@ -837,6 +855,7 @@ static void btc_spp_stop_srv(btc_spp_args_t *arg)
static void btc_spp_write(btc_spp_args_t *arg) static void btc_spp_write(btc_spp_args_t *arg)
{ {
esp_spp_status_t ret = ESP_SPP_SUCCESS; esp_spp_status_t ret = ESP_SPP_SUCCESS;
do { do {
if (!is_spp_init()) { if (!is_spp_init()) {
BTC_TRACE_ERROR("%s SPP have not been init\n", __func__); BTC_TRACE_ERROR("%s SPP have not been init\n", __func__);
@@ -857,18 +876,23 @@ static void btc_spp_write(btc_spp_args_t *arg)
break; break;
} }
if (spp_local_param.spp_mode == ESP_SPP_MODE_VFS) { if (spp_local_param.spp_mode == ESP_SPP_MODE_VFS) {
BT_HDR *p_buf; if (slot->is_writing) {
if ((p_buf = fixed_queue_try_peek_first(slot->tx.queue)) != NULL && p_buf->layer_specific == 0) { osi_mutex_unlock(&spp_local_param.spp_slot_mutex);
p_buf->event++; return;
p_buf->layer_specific = 1; }
BTA_JvRfcommWrite(arg->write.handle, slot->id, p_buf->len, p_buf->data + p_buf->offset); size_t item_size = 0;
uint8_t *data = xRingbufferReceiveUpTo(slot->ringbuf_write, &item_size, 0, slot->mtu);
if (item_size > 0) {
slot->write_data = data;
slot->write_data_len = item_size;
slot->is_writing = true;
BTA_JvRfcommWrite(arg->write.handle, slot->id, item_size, data);
} }
} else { } else {
if (fixed_queue_enqueue(slot->tx.queue, arg->write.p_data, 0)) { if (fixed_queue_enqueue(slot->tx.queue, arg->write.p_data, 0)) {
BTA_JvRfcommWrite(arg->write.handle, slot->id, arg->write.len, arg->write.p_data); BTA_JvRfcommWrite(arg->write.handle, slot->id, arg->write.len, arg->write.p_data);
} else { } else {
ret = ESP_SPP_NO_RESOURCE; ret = ESP_SPP_NO_RESOURCE;
break;
} }
} }
osi_mutex_unlock(&spp_local_param.spp_slot_mutex); osi_mutex_unlock(&spp_local_param.spp_slot_mutex);
@@ -1066,37 +1090,44 @@ void btc_spp_cb_handler(btc_msg_t *msg)
} }
} else { } else {
if (slot) { if (slot) {
BT_HDR *p_buf; size_t item_size = 0;
size_t items_waiting = 0;
serial = slot->serial; serial = slot->serial;
if ((p_buf = fixed_queue_try_peek_first(slot->tx.queue)) == NULL) {
osi_mutex_unlock(&spp_local_param.spp_slot_mutex);
break;
}
if (p_data->rfc_write.status == BTA_JV_SUCCESS) { if (p_data->rfc_write.status == BTA_JV_SUCCESS) {
p_buf->len -= p_data->rfc_write.len; vRingbufferReturnItem(slot->ringbuf_write,slot->write_data);
p_buf->offset += p_data->rfc_write.len; slot->write_data = NULL;
p_buf->layer_specific = 0; slot->is_writing = false;
if (p_buf->len == 0) { slot->write_data_len = 0;
osi_free(fixed_queue_dequeue(slot->tx.queue, FIXED_QUEUE_MAX_TIMEOUT)); vRingbufferGetInfo(slot->ringbuf_write, NULL, NULL, NULL, NULL, &items_waiting);
if (fixed_queue_length(slot->tx.queue) <= SLOT_TX_QUEUE_LOW_WM) { if (BTC_SPP_SEND_BUF_DEFAULT > items_waiting) {
xEventGroupSetBits(spp_local_param.tx_event_group, SLOT_WRITE_BIT(serial)); xEventGroupSetBits(spp_local_param.tx_event_group, SLOT_WRITE_BIT(serial));
}
} }
if (items_waiting == 0) {
if ((p_buf = fixed_queue_try_peek_first(slot->tx.queue)) != NULL && p_buf->layer_specific == 0 && osi_mutex_unlock(&spp_local_param.spp_slot_mutex);
!p_data->rfc_write.cong) { break;
p_buf->layer_specific = 1; }
p_buf->event++; if (!p_data->rfc_write.cong) {
BTA_JvRfcommWrite(p_data->rfc_write.handle, slot->id, p_buf->len, p_buf->data + p_buf->offset); uint8_t *data = xRingbufferReceiveUpTo(slot->ringbuf_write, &item_size, 0, slot->mtu);
if (item_size > 0) {
slot->write_data = data;
slot->write_data_len = item_size;
slot->is_writing = true;
BTA_JvRfcommWrite(p_data->rfc_write.handle, slot->id, item_size, data);
}
} }
} else { } else {
if (!p_data->rfc_write.old_cong) { if (!p_data->rfc_write.old_cong) {
// PORT_WriteDataCO failed // PORT_WriteDataCO failed
BTC_TRACE_ERROR("PORT_WriteDataCO failed p_buf:%p, handle:%d\n", p_buf, BTC_TRACE_ERROR("PORT_WriteDataCO failed p_buf:%p, handle:%d\n", slot->write_data,
p_data->rfc_write.handle); p_data->rfc_write.handle);
} else { } else {
// need rewrite // need rewrite
p_buf->layer_specific = 0; if (!p_data->rfc_write.cong && slot->connected) {
slot->is_writing = true;
BTA_JvRfcommWrite(p_data->rfc_write.handle, slot->id, slot->write_data_len, slot->write_data);
} else {
slot->is_writing = false;
}
} }
} }
} }
@@ -1188,12 +1219,19 @@ void btc_spp_cb_handler(btc_msg_t *msg)
BTC_TRACE_ERROR("%s unable to find RFCOMM slot, event:%d!", __func__, event); BTC_TRACE_ERROR("%s unable to find RFCOMM slot, event:%d!", __func__, event);
break; break;
} }
if (!p_data->rfc_cong.cong) { if (!p_data->rfc_cong.cong && !slot->is_writing) {
BT_HDR *p_buf; if (slot->write_data == NULL && slot->write_data_len == 0) {
if ((p_buf = fixed_queue_try_peek_first(slot->tx.queue)) != NULL && p_buf->layer_specific == 0) { size_t item_size = 0;
p_buf->event++; uint8_t *data = xRingbufferReceiveUpTo(slot->ringbuf_write, &item_size, 0, slot->mtu);
p_buf->layer_specific = 1; if (item_size > 0) {
BTA_JvRfcommWrite(p_data->rfc_cong.handle, slot->id, p_buf->len, p_buf->data + p_buf->offset); slot->write_data = data;
slot->write_data_len = item_size;
slot->is_writing = true;
BTA_JvRfcommWrite(p_data->rfc_cong.handle, slot->id, item_size, data);
}
} else {
slot->is_writing = true;
BTA_JvRfcommWrite(p_data->rfc_cong.handle, slot->id, slot->write_data_len, slot->write_data);
} }
} }
osi_mutex_unlock(&spp_local_param.spp_slot_mutex); osi_mutex_unlock(&spp_local_param.spp_slot_mutex);
@@ -1378,77 +1416,67 @@ static ssize_t spp_vfs_write(int fd, const void * data, size_t size)
serial = slot->serial; serial = slot->serial;
osi_mutex_unlock(&spp_local_param.spp_slot_mutex); osi_mutex_unlock(&spp_local_param.spp_slot_mutex);
ssize_t sent = 0, write_size = 0; ssize_t sent = 0;
size_t tx_len; size_t items_waiting = 0;
BT_HDR *p_buf = NULL; size_t item_size = 0;
bool enqueue_status= false;
EventBits_t tx_event_group_val = 0; EventBits_t tx_event_group_val = 0;
while (1) { BaseType_t done = false;
while (size) {
tx_event_group_val = 0; tx_event_group_val = 0;
if (size) {
if (p_buf == NULL) {
write_size = size < slot->mtu ? size : slot->mtu;
if ((p_buf = osi_malloc(sizeof(BT_HDR) + write_size)) == NULL) {
BTC_TRACE_ERROR("%s malloc failed!", __func__);
errno = ENOMEM;
sent = -1;
break;
}
p_buf->offset = 0;
p_buf->len = write_size;
p_buf->event = 0; // indicate the p_buf be sent count
p_buf->layer_specific = 0; // indicate the p_buf whether to be sent, 0 - ready to send; 1 - have sent
memcpy((UINT8 *)(p_buf + 1), data + sent, write_size);
}
} else {
break;
}
osi_mutex_lock(&spp_local_param.spp_slot_mutex, OSI_MUTEX_MAX_TIMEOUT); osi_mutex_lock(&spp_local_param.spp_slot_mutex, OSI_MUTEX_MAX_TIMEOUT);
if ((slot = spp_local_param.spp_slots[serial]) != NULL) { slot = spp_local_param.spp_slots[serial];
tx_len = fixed_queue_length(slot->tx.queue); if (slot && slot->connected) {
enqueue_status = fixed_queue_enqueue(slot->tx.queue, p_buf, 0); items_waiting = 0;
if (!enqueue_status) { item_size = 0;
BTC_TRACE_DEBUG("%s tx_len:%d, fd:%d\n", __func__, fixed_queue_length(slot->tx.queue), fd); vRingbufferGetInfo(slot->ringbuf_write, NULL, NULL, NULL, NULL, &items_waiting);
osi_mutex_unlock(&spp_local_param.spp_slot_mutex); if (items_waiting < BTC_SPP_SEND_BUF_DEFAULT) {
//block untill under water level, be closed or time out if ((BTC_SPP_SEND_BUF_DEFAULT - items_waiting) > size) {
tx_event_group_val = item_size = size;
xEventGroupWaitBits(spp_local_param.tx_event_group, SLOT_WRITE_BIT(serial) | SLOT_CLOSE_BIT(serial), pdTRUE, done = xRingbufferSend(slot->ringbuf_write, (void *)data + sent, item_size, 0);
pdFALSE, VFS_WRITE_TIMEOUT / portTICK_PERIOD_MS); } else {
if (tx_event_group_val & SLOT_CLOSE_BIT(serial)) { item_size = BTC_SPP_SEND_BUF_DEFAULT - items_waiting;
BTC_TRACE_ERROR("%s exit for RFCOMM close, fd:%d!", __func__, fd); done = xRingbufferSend(slot->ringbuf_write, (void *)data + sent, item_size, 0);
errno = EPIPE; }
sent = -1;
break; if (done) {
} else if (tx_event_group_val & SLOT_WRITE_BIT(serial)) { sent += item_size;
size -= item_size;
if (slot->write_data == NULL) {
spp_send_data_to_btc(slot->rfc_handle, 0, NULL, ESP_SPP_MODE_VFS);
}
osi_mutex_unlock(&spp_local_param.spp_slot_mutex);
continue; continue;
} else if (tx_event_group_val == 0) {
BTC_TRACE_ERROR("%s exit for time out, fd:%d!", __func__, fd);
errno = EBUSY;
sent = -1;
break;
} }
} }
if (tx_len == 0) {
spp_send_data_to_btc(slot->rfc_handle, 0, NULL, ESP_SPP_MODE_VFS); BTC_TRACE_DEBUG("%s items_waiting:%d, fd:%d\n", __func__, items_waiting, fd);
osi_mutex_unlock(&spp_local_param.spp_slot_mutex);
// block untill under water level, be closed or time out
tx_event_group_val =
xEventGroupWaitBits(spp_local_param.tx_event_group, SLOT_WRITE_BIT(serial) | SLOT_CLOSE_BIT(serial), pdTRUE,
pdFALSE, VFS_WRITE_TIMEOUT / portTICK_PERIOD_MS);
if (tx_event_group_val & SLOT_CLOSE_BIT(serial)) {
BTC_TRACE_ERROR("%s exit for RFCOMM close, fd:%d!", __func__, fd);
errno = EPIPE;
sent = -1;
break;
} else if (tx_event_group_val & SLOT_WRITE_BIT(serial)) {
continue;
} else if (tx_event_group_val == 0) {
BTC_TRACE_ERROR("%s exit for time out, fd:%d!", __func__, fd);
errno = EBUSY;
sent = -1;
break;
} }
sent += write_size;
size -= write_size;
p_buf = NULL;
} else { } else {
osi_mutex_unlock(&spp_local_param.spp_slot_mutex); osi_mutex_unlock(&spp_local_param.spp_slot_mutex);
errno = EPIPE; errno = EPIPE;
sent = -1; sent = -1;
break; break;
} }
osi_mutex_unlock(&spp_local_param.spp_slot_mutex);
} }
//errors occur, need to cleanup
if (p_buf) {
osi_free(p_buf);
p_buf = NULL;
}
return sent; return sent;
} }

6
components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h
View File

@@ -296,6 +296,12 @@
#define UC_BT_HFP_WBS_ENABLE FALSE #define UC_BT_HFP_WBS_ENABLE FALSE
#endif #endif
#ifdef CONFIG_BT_SPP_SEND_BUF_DEFAULT
#define UC_BT_SPP_SEND_BUF_DEFAULT CONFIG_BT_SPP_SEND_BUF_DEFAULT
#else
#define UC_BT_SPP_SEND_BUF_DEFAULT 0
#endif
/********************************************************** /**********************************************************
* Memory reference * Memory reference
**********************************************************/ **********************************************************/

4
components/bt/host/bluedroid/common/include/common/bt_target.h
View File

@@ -351,6 +351,10 @@
#define SBC_ENC_INCLUDED FALSE #define SBC_ENC_INCLUDED FALSE
#endif #endif
#ifndef BTC_SPP_SEND_BUF_DEFAULT
#define BTC_SPP_SEND_BUF_DEFAULT UC_BT_SPP_SEND_BUF_DEFAULT
#endif
/****************************************************************************** /******************************************************************************
** **
** BTA-layer components ** BTA-layer components