Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/fix_ot_cli_loop_v6.0' into 'release/v6.0'

Browse Source 
fix(openthread): avoid ot_cli_loop busy loop by using select-based linenoise read (v6.0)

See merge request espressif/esp-idf!47313
This commit is contained in:
Jiang Jiang Jian
2026-04-09 20:01:19 +08:00
parent 9f1b780bd0 c9725b2300
commit db22058940
1 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/openthread/src/esp_openthread_cli.c
+39 -2
View File
@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2021-2026 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -27,6 +27,39 @@
static TaskHandle_t s_cli_task; static TaskHandle_t s_cli_task;
static ssize_t ot_cli_read_bytes(int fd, void *buf, size_t max_bytes)
{
fd_set read_fds;
FD_ZERO(&read_fds);
FD_SET(fd, &read_fds);
int nread = select(fd + 1, &read_fds, NULL, NULL, NULL);
if (nread <= 0) {
return -1;
}
if (FD_ISSET(fd, &read_fds)) {
return read(fd, buf, max_bytes);
}
return -1;
}
static void ot_cli_set_read_characteristics(void)
{
int stdin_fileno = fileno(stdin);
int flags = fcntl(stdin_fileno, F_GETFL);
if (flags == -1) {
ESP_LOGW(OT_PLAT_LOG_TAG, "Failed to get stdin flags: %d", errno);
} else {
flags |= O_NONBLOCK;
if (fcntl(stdin_fileno, F_SETFL, flags) == -1) {
ESP_LOGW(OT_PLAT_LOG_TAG, "Failed to set stdin non-blocking: %d", errno);
}
}
linenoiseSetReadFunction(ot_cli_read_bytes);
}
static int cli_output_callback(void *context, const char *format, va_list args) static int cli_output_callback(void *context, const char *format, va_list args)
{ {
char prompt_check[3]; char prompt_check[3];
@@ -116,10 +149,14 @@ static void ot_cli_loop(void *context)
if (linenoiseProbe()) { if (linenoiseProbe()) {
linenoiseSetDumbMode(1); linenoiseSetDumbMode(1);
} }
ot_cli_set_read_characteristics();
while (true) { while (true) {
char *line = linenoise(prompt); char *line = linenoise(prompt);
if (line && strnlen(line, OT_CLI_MAX_LINE_LENGTH)) { if (line == NULL) {
continue;
}
if (strnlen(line, OT_CLI_MAX_LINE_LENGTH)) {
printf("\r\n"); printf("\r\n");
if (memcmp(line, ESP_CONSOLE_PREFIX, ESP_CONSOLE_PREFIX_LENGTH) == 0) { if (memcmp(line, ESP_CONSOLE_PREFIX, ESP_CONSOLE_PREFIX_LENGTH) == 0) {
esp_err_t err = esp_console_run(line + ESP_CONSOLE_PREFIX_LENGTH, &ret); esp_err_t err = esp_console_run(line + ESP_CONSOLE_PREFIX_LENGTH, &ret);