stack sizes: Revert stack size increases added in 8d43859

Set min stack size to 2048 if AppTrace support is enabled, 512 bytes otherwise.
This commit is contained in:
Angus Gratton 2017-06-29 14:02:54 +10:00 committed by Ivan Grokhotkov
parent 3365b9322b
commit 1b3120615b
4 changed files with 8 additions and 10 deletions

View File

@ -173,7 +173,7 @@ static void dport_access_init_core(void *arg)
/* Defer initialisation until after scheduler is running */ /* Defer initialisation until after scheduler is running */
void esp_dport_access_int_init(void) void esp_dport_access_int_init(void)
{ {
xTaskCreatePinnedToCore(&dport_access_init_core, "dport", 512, NULL, 5, NULL, xPortGetCoreID()); xTaskCreatePinnedToCore(&dport_access_init_core, "dport", configMINIMAL_STACK_SIZE, NULL, 5, NULL, xPortGetCoreID());
} }
void esp_dport_access_int_deinit(void) void esp_dport_access_int_deinit(void)

View File

@ -80,7 +80,7 @@ void esp_ipc_init()
const char* task_names[2] = {"ipc0", "ipc1"}; const char* task_names[2] = {"ipc0", "ipc1"};
for (int i = 0; i < portNUM_PROCESSORS; ++i) { for (int i = 0; i < portNUM_PROCESSORS; ++i) {
s_ipc_sem[i] = xSemaphoreCreateBinary(); s_ipc_sem[i] = xSemaphoreCreateBinary();
xTaskCreatePinnedToCore(ipc_task, task_names[i], XT_STACK_MIN_SIZE, (void*) i, xTaskCreatePinnedToCore(ipc_task, task_names[i], configMINIMAL_STACK_SIZE, (void*) i,
configMAX_PRIORITIES - 1, &s_ipc_tasks[i], i); configMAX_PRIORITIES - 1, &s_ipc_tasks[i], i);
} }
} }

View File

@ -163,15 +163,13 @@
#define configMAX_PRIORITIES ( 25 ) #define configMAX_PRIORITIES ( 25 )
#endif #endif
/* Minimal stack size. This may need to be increased for your application */ #ifndef CONFIG_ESP32_APPTRACE_ENABLE
/* NOTE: The FreeRTOS demos may not work reliably with stack size < 4KB. */ #define configMINIMAL_STACK_SIZE 512
/* The Xtensa-specific examples should be fine with XT_STACK_MIN_SIZE. */ #else
#if !(defined XT_STACK_MIN_SIZE) /* apptrace module requires at least 2KB of stack per task */
#error XT_STACK_MIN_SIZE not defined, did you include xtensa_config.h ? #define configMINIMAL_STACK_SIZE 2048
#endif #endif
#define configMINIMAL_STACK_SIZE (XT_STACK_MIN_SIZE > 1024 ? XT_STACK_MIN_SIZE : 1024)
/* The Xtensa port uses a separate interrupt stack. Adjust the stack size */ /* The Xtensa port uses a separate interrupt stack. Adjust the stack size */
/* to suit the needs of your specific application. */ /* to suit the needs of your specific application. */
#ifndef configISR_STACK_SIZE #ifndef configISR_STACK_SIZE

View File

@ -40,5 +40,5 @@ void blink_task(void *pvParameter)
void app_main() void app_main()
{ {
xTaskCreate(&blink_task, "blink_task", 512, NULL, 5, NULL); xTaskCreate(&blink_task, "blink_task", configMINIMAL_STACK_SIZE, NULL, 5, NULL);
} }