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

HTTP Server: Added ability to select core

Browse Source 
The task that runs the HTTP server can now be pinned to a particular core by setting `core_id`
in the HTTP server configuration.  By default, the core is set to `tskNO_AFFINITY`, meaning
it can run on any core.

Merges https://github.com/espressif/esp-idf/pull/3190
This commit is contained in:
Gregory Eslinger 2019-03-15 16:45:12 +01:00 committed by Mahavir Jain
parent c1e5e19d0b
commit 7f1047847a
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_http_server/include/esp_http_server.h
View File

@ -34,6 +34,7 @@ initializer that should be kept in sync
#define HTTPD_DEFAULT_CONFIG() { \ #define HTTPD_DEFAULT_CONFIG() { \
.task_priority = tskIDLE_PRIORITY+5, \ .task_priority = tskIDLE_PRIORITY+5, \
.stack_size = 4096, \ .stack_size = 4096, \
.core_id = tskNO_AFFINITY, \
.server_port = 80, \ .server_port = 80, \
.ctrl_port = 32768, \ .ctrl_port = 32768, \
.max_open_sockets = 7, \ .max_open_sockets = 7, \
@ -139,6 +140,7 @@ typedef bool (*httpd_uri_match_func_t)(const char *reference_uri,
typedef struct httpd_config { typedef struct httpd_config {
unsigned task_priority; /*!< Priority of FreeRTOS task which runs the server */ unsigned task_priority; /*!< Priority of FreeRTOS task which runs the server */
size_t stack_size; /*!< The maximum stack size allowed for the server task */ size_t stack_size; /*!< The maximum stack size allowed for the server task */
BaseType_t core_id; /*!< The core the HTTP server task will run on */
/** /**
* TCP Port number for receiving and transmitting HTTP traffic * TCP Port number for receiving and transmitting HTTP traffic

3
components/esp_http_server/src/httpd_main.c
View File

@ -363,7 +363,8 @@ esp_err_t httpd_start(httpd_handle_t *handle, const httpd_config_t *config)
if (httpd_os_thread_create(&hd->hd_td.handle, "httpd", if (httpd_os_thread_create(&hd->hd_td.handle, "httpd",
hd->config.stack_size, hd->config.stack_size,
hd->config.task_priority, hd->config.task_priority,
httpd_thread, hd) != ESP_OK) { httpd_thread, hd,
hd->config.core_id) != ESP_OK) {
/* Failed to launch task */ /* Failed to launch task */
httpd_delete(hd); httpd_delete(hd);
return ESP_ERR_HTTPD_TASK; return ESP_ERR_HTTPD_TASK;

5
components/esp_http_server/src/port/esp32/osal.h
View File

@ -32,9 +32,10 @@ typedef TaskHandle_t othread_t;
static inline int httpd_os_thread_create(othread_t *thread, static inline int httpd_os_thread_create(othread_t *thread,
const char *name, uint16_t stacksize, int prio, const char *name, uint16_t stacksize, int prio,
void (*thread_routine)(void *arg), void *arg) void (*thread_routine)(void *arg), void *arg,
BaseType_t core_id)
{ {
int ret = xTaskCreate(thread_routine, name, stacksize, arg, prio, thread); int ret = xTaskCreatePinnedToCore(thread_routine, name, stacksize, arg, prio, thread, core_id);
if (ret == pdPASS) { if (ret == pdPASS) {
return OS_SUCCESS; return OS_SUCCESS;
} }

1
components/esp_https_server/include/esp_https_server.h
View File

@ -80,6 +80,7 @@ typedef struct httpd_ssl_config httpd_ssl_config_t;
.httpd = { \ .httpd = { \
.task_priority = tskIDLE_PRIORITY+5, \ .task_priority = tskIDLE_PRIORITY+5, \
.stack_size = 10240, \ .stack_size = 10240, \
.core_id = tskNO_AFFINITY, \
.server_port = 0, \ .server_port = 0, \
.ctrl_port = 32768, \ .ctrl_port = 32768, \
.max_open_sockets = 4, \ .max_open_sockets = 4, \