Skip to content

Commit c941691

Browse files
committed
Merge branch 'Bugfix/increase_ping_task_stack_size' into 'master'
lwip:bugfix for increase ping task stack size Closes WIFI-4903 See merge request espressif/esp-idf!20664
2 parents c8c9ce0 + 8c17b04 commit c941691

File tree

4 files changed

+17
-29
lines changed

4 files changed

+17
-29
lines changed

components/esp_system/include/esp_task.h

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
/*
2+
* SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
146

157
/* Notes:
168
* 1. Put all task priority and stack size definition in this file
@@ -47,6 +39,9 @@
4739
#define BT_TASK_EXTRA_STACK_SIZE TASK_EXTRA_STACK_SIZE
4840
#define ESP_TASK_BT_CONTROLLER_STACK (3584 + TASK_EXTRA_STACK_SIZE)
4941

42+
/* Ping Task */
43+
#define ESP_TASK_PING_STACK (2048 + TASK_EXTRA_STACK_SIZE)
44+
5045

5146
/* idf task */
5247
#define ESP_TASK_TIMER_PRIO (ESP_TASK_PRIO_MAX - 3)

components/lwip/include/apps/ping/ping_sock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ typedef struct {
8080
.tos = 0, \
8181
.ttl = IP_DEFAULT_TTL, \
8282
.target_addr = *(IP_ANY_TYPE), \
83-
.task_stack_size = 2048, \
83+
.task_stack_size = ESP_TASK_PING_STACK, \
8484
.task_prio = 2, \
8585
.interface = 0,\
8686
}

tools/ci/check_copyright_ignore.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,6 @@ components/esp_system/include/esp_freertos_hooks.h
611611
components/esp_system/include/esp_int_wdt.h
612612
components/esp_system/include/esp_private/dbg_stubs.h
613613
components/esp_system/include/esp_private/panic_internal.h
614-
components/esp_system/include/esp_task.h
615614
components/esp_system/port/arch/riscv/expression_with_stack.c
616615
components/esp_system/port/arch/xtensa/expression_with_stack.c
617616
components/esp_system/port/public_compat/brownout.h
@@ -1905,7 +1904,6 @@ tools/ldgen/output_commands.py
19051904
tools/ldgen/samples/template.ld
19061905
tools/ldgen/sdkconfig.py
19071906
tools/ldgen/test/data/linker_script.ld
1908-
tools/mocks/esp_system/include/esp_task.h
19091907
tools/templates/sample_component/include/main.h
19101908
tools/templates/sample_component/main.c
19111909
tools/test_apps/build_system/embed_test/main/test_main.c

tools/mocks/esp_system/include/esp_task.h

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
/*
2+
* SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
146

157
/* Notes:
168
* 1. Put all task priority and stack size definition in this file
@@ -48,6 +40,9 @@
4840
#define BT_TASK_EXTRA_STACK_SIZE TASK_EXTRA_STACK_SIZE
4941
#define ESP_TASK_BT_CONTROLLER_STACK (3584 + TASK_EXTRA_STACK_SIZE)
5042

43+
/* Ping Task */
44+
#define ESP_TASK_PING_STACK (2048 + TASK_EXTRA_STACK_SIZE)
45+
5146

5247
/* idf task */
5348
#define ESP_TASKD_EVENT_PRIO (ESP_TASK_PRIO_MAX - 5)

0 commit comments

Comments
 (0)