Merge branch 'contrib/github_pr_14339' into 'master'
Some checks failed
docker / docker (push) Has been cancelled

Fix(pthread): Added linux port with empty functions to make pthread cxx example build. (GitHub PR)

Closes IDFGH-13424 and IDFGH-13433

See merge request espressif/esp-idf!32785
This commit is contained in:
Jakob Hasse 2024-08-14 00:05:12 +08:00
commit d7ca8b94c8
4 changed files with 54 additions and 3 deletions

View File

@ -1,7 +1,9 @@
idf_build_get_property(target IDF_TARGET) idf_build_get_property(target IDF_TARGET)
if(${target} STREQUAL "linux") if(${target} STREQUAL "linux")
# Make pthread component an empty interface lib referencing host pthread for Linux target set(sources "port/linux/pthread.c")
idf_component_register() idf_component_register(
SRCS ${sources}
INCLUDE_DIRS include)
set(THREADS_PREFER_PTHREAD_FLAG ON) set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
target_link_libraries(${COMPONENT_LIB} INTERFACE Threads::Threads) target_link_libraries(${COMPONENT_LIB} INTERFACE Threads::Threads)

View File

@ -0,0 +1,43 @@
/*
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
/*
* pthread port for Linux build
*/
#include "esp_pthread.h"
#include <string.h>
/**
* @brief Creates a default pthread configuration based
* on the values set via menuconfig.
*
* @return
* A default configuration structure.
*/
esp_pthread_cfg_t esp_pthread_get_default_config(void)
{
esp_pthread_cfg_t cfg = {
.stack_size = CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT,
.prio = CONFIG_PTHREAD_TASK_PRIO_DEFAULT,
.inherit_cfg = false,
.thread_name = NULL,
.pin_to_core = 0,
.stack_alloc_caps = 0,
};
return cfg;
}
esp_err_t esp_pthread_set_cfg(const esp_pthread_cfg_t *cfg)
{
return ESP_OK;
}
esp_err_t esp_pthread_get_cfg(esp_pthread_cfg_t *p)
{
memset(p, 0, sizeof(*p));
return ESP_ERR_NOT_FOUND;
}

View File

@ -1,2 +1,3 @@
idf_component_register(SRCS "generic_build_test.c" idf_component_register(SRCS "generic_build_test.c"
INCLUDE_DIRS ".") INCLUDE_DIRS "."
PRIV_REQUIRES pthread)

View File

@ -8,8 +8,13 @@
#include <stddef.h> #include <stddef.h>
#include "inttypes_ext.h" #include "inttypes_ext.h"
#include "esp_pthread.h"
void app_main(void) void app_main(void)
{ {
size_t size = 47; size_t size = 47;
printf("size is: %" PRIuSIZE "\n", size); // test IDF's PRIuSIZE printf("size is: %" PRIuSIZE "\n", size); // test IDF's PRIuSIZE
esp_pthread_cfg_t pthread_config = esp_pthread_get_default_config();
(void)pthread_config;
} }