PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix at timer bug when two socket run

Browse Source
This commit is contained in:
supowang
2021-03-16 14:19:07 +08:00
parent 13d5ea043a
commit e609bb3e69
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/at/include/tos_at.h
View File

@@ -78,6 +78,8 @@ typedef struct at_data_channel_st {
at_channel_status_t status; at_channel_status_t status;
k_stopwatch_t timer;
const char *remote_ip; const char *remote_ip;
const char *remote_port; const char *remote_port;
} at_data_channel_t; } at_data_channel_t;
@@ -113,8 +115,6 @@ typedef struct at_agent_st {
k_task_t parser; k_task_t parser;
at_cache_t recv_cache; at_cache_t recv_cache;
k_stopwatch_t timer;
k_mutex_t global_lock; k_mutex_t global_lock;
char *cmd_buf; char *cmd_buf;

16
net/at/src/tos_at.c
View File

@@ -634,9 +634,9 @@ __API__ int tos_at_channel_read_timed(int channel_id, uint8_t *buffer, size_t bu
tick = tos_millisec2tick(timeout); tick = tos_millisec2tick(timeout);
tos_stopwatch_countdown(&AT_AGENT->timer, tick); tos_stopwatch_countdown(&data_channel->timer, tick);
while (!tos_stopwatch_is_expired(&AT_AGENT->timer)) { while (!tos_stopwatch_is_expired(&data_channel->timer)) {
remain_tick = tos_stopwatch_remain(&AT_AGENT->timer); remain_tick = tos_stopwatch_remain(&data_channel->timer);
if (remain_tick == (k_tick_t)0u) { if (remain_tick == (k_tick_t)0u) {
return total_read_len; return total_read_len;
} }
@@ -694,6 +694,10 @@ __STATIC_INLINE__ int at_channel_construct(at_data_channel_t *data_channel, cons
goto errout; goto errout;
} }
if (tos_stopwatch_create(&data_channel->timer) != K_ERR_NONE) {
goto errout;
}
data_channel->rx_fifo_buffer = fifo_buffer; data_channel->rx_fifo_buffer = fifo_buffer;
tos_chr_fifo_create(&data_channel->rx_fifo, fifo_buffer, AT_DATA_CHANNEL_FIFO_BUFFER_SIZE); tos_chr_fifo_create(&data_channel->rx_fifo, fifo_buffer, AT_DATA_CHANNEL_FIFO_BUFFER_SIZE);
data_channel->remote_ip = ip; data_channel->remote_ip = ip;
@@ -759,6 +763,8 @@ __API__ int tos_at_channel_free(int channel_id)
tos_mutex_destroy(&data_channel->rx_lock); tos_mutex_destroy(&data_channel->rx_lock);
tos_stopwatch_destroy(&data_channel->timer);
tos_mmheap_free(data_channel->rx_fifo_buffer); tos_mmheap_free(data_channel->rx_fifo_buffer);
tos_chr_fifo_destroy(&data_channel->rx_fifo); tos_chr_fifo_destroy(&data_channel->rx_fifo);
@@ -851,8 +857,6 @@ __API__ int tos_at_init(hal_uart_port_t uart_port, at_event_t *event_table, size
at_channel_init(); at_channel_init();
tos_stopwatch_create(&AT_AGENT->timer);
buffer = tos_mmheap_alloc(AT_UART_RX_FIFO_BUFFER_SIZE); buffer = tos_mmheap_alloc(AT_UART_RX_FIFO_BUFFER_SIZE);
if (!buffer) { if (!buffer) {
return -1; return -1;
@@ -960,8 +964,6 @@ __API__ void tos_at_deinit(void)
tos_chr_fifo_destroy(&AT_AGENT->uart_rx_fifo); tos_chr_fifo_destroy(&AT_AGENT->uart_rx_fifo);
tos_stopwatch_destroy(&AT_AGENT->timer);
at_channel_deinit(); at_channel_deinit();
} }