feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

refactor(pthread): avoid conflict due to two PTHREAD_STACK_MIN declarations

Browse Source
This commit is contained in:
Jakob Hasse
2024-09-11 13:02:09 +02:00
parent 08a1e1350c
commit 0b70e296a0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/pthread/port/linux/pthread.c
View File

@@ -50,9 +50,7 @@ esp_pthread_cfg_t esp_pthread_get_default_config(void)
esp_err_t esp_pthread_set_cfg(const esp_pthread_cfg_t *cfg) esp_err_t esp_pthread_set_cfg(const esp_pthread_cfg_t *cfg)
{ {
if (cfg->stack_size < PTHREAD_STACK_MIN) { // Not checking the stack size here since PTHREAD_STACK_MIN has two conflicting declarations on Linux
return ESP_ERR_INVALID_ARG;
}
// 0 is treated as default value, hence change caps to MALLOC_CAP_8BIT | MALLOC_CAP_INTERNAL in that case // 0 is treated as default value, hence change caps to MALLOC_CAP_8BIT | MALLOC_CAP_INTERNAL in that case
int heap_caps; int heap_caps;
@@ -77,6 +75,8 @@ esp_err_t esp_pthread_set_cfg(const esp_pthread_cfg_t *cfg)
} }
*p = *cfg; *p = *cfg;
p->stack_alloc_caps = heap_caps; p->stack_alloc_caps = heap_caps;
p->stack_size = MAX(p->stack_size, 0x4000); // make sure Linux minimal stack size is respected
int __attribute((unused)) res = pthread_setspecific(s_pthread_cfg_key, p); int __attribute((unused)) res = pthread_setspecific(s_pthread_cfg_key, p);
assert(res == 0); assert(res == 0);