alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(freertos): Update select on Linux target to handle edge cases

Browse Source 
* Handle not found "select()" symbol if dlsym() return NULL
* Handle minimum wait time if remaining time < designated minimum sleep
time
This commit is contained in:
David Cermak 2024-09-09 11:07:33 +02:00
parent 8a39db3fae
commit f7129481ed
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
components/freertos/esp_additions/FreeRTOSSimulator_wrappers.c
View File

@ -6,6 +6,7 @@
#include <freertos/FreeRTOS.h> #include <freertos/FreeRTOS.h>
#include <freertos/task.h> #include <freertos/task.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <assert.h>
#include <sys/select.h> #include <sys/select.h>
#include <errno.h> #include <errno.h>
@ -25,6 +26,7 @@ int select(int fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *tva
// Lookup the select symbol // Lookup the select symbol
if (s_real_select == NULL) { if (s_real_select == NULL) {
s_real_select = (select_func_t)dlsym(RTLD_NEXT, "select"); s_real_select = (select_func_t)dlsym(RTLD_NEXT, "select");
assert(s_real_select); // abort() if we cannot locate the symbol
} }
// Calculate the end_ticks if a timeout is provided // Calculate the end_ticks if a timeout is provided
@ -64,21 +66,30 @@ int select(int fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *tva
return ret; return ret;
} }
// Return on any error but EINTR // Return on any error except EINTR
if (ret == -1 && errno != EINTR) { if (ret == -1 && errno != EINTR) {
return ret; return ret;
} }
if (tval != NULL && xTaskGetTickCount() >= end_ticks) {
errno = 0;
return 0;
}
/** /**
* Sleep for 10 tick(s) to allow other tasks to run. * Sleep for maximum 10 tick(s) to allow other tasks to run.
* This can be any value greater than zero. * This can be any value greater than zero.
* 10 is a good trade-off between CPU time usage and timeout resolution. * 10 is a good trade-off between CPU time usage and timeout resolution.
*/ */
vTaskDelay(10); const TickType_t max_sleep_ticks = 10;
TickType_t sleep_ticks = max_sleep_ticks;
if (tval != NULL) {
TickType_t now_ticks = xTaskGetTickCount();
if (now_ticks >= end_ticks) {
errno = 0;
return 0;
}
// Sleep for the remaining time or a maximum of 10 tick
TickType_t remaining_ticks = end_ticks - now_ticks;
sleep_ticks = (remaining_ticks < max_sleep_ticks) ? remaining_ticks : max_sleep_ticks;
}
vTaskDelay(sleep_ticks);
} }
} }