alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-19 14:26:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/check_system_init_priorities_sorting' into 'master'

Browse Source 
fix(esp_system): sort system init priorities also by filename

See merge request espressif/esp-idf!32678
This commit is contained in:
Ivan Grokhotkov 2024-08-12 05:02:20 +08:00
commit 1c1b7db361
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/esp_system/check_system_init_priorities.py
View File

@ -1,13 +1,12 @@
#!/usr/bin/env python #!/usr/bin/env python
# #
# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
# This file is used to check the order of execution of ESP_SYSTEM_INIT_FN functions. # This file is used to check the order of execution of ESP_SYSTEM_INIT_FN functions.
# It compares the priorities found in .c source files to the contents of system_init_fn.txt # It compares the priorities found in .c source files to the contents of system_init_fn.txt
# In case of an inconsistency, the script prints the differences found and returns with a # In case of an inconsistency, the script prints the differences found and returns with a
# non-zero exit code. # non-zero exit code.
import difflib import difflib
import glob import glob
import itertools import itertools
@ -73,11 +72,14 @@ def main() -> None:
startup_entries.append(entry) startup_entries.append(entry)
# #
# 2. Sort the ESP_SYSTEM_INIT_FN functions in C source files by stage and then priority # 2. Sort the ESP_SYSTEM_INIT_FN functions in C source files.
# In addition to the stage and priority, we also add filename to the sort key,
# to have a stable sorting order in case when the same startup function is defined in multiple files,
# for example for different targets.
# #
def sort_key(entry: StartupEntry) -> typing.Tuple[str, int]: def sort_key(entry: StartupEntry) -> typing.Tuple[str, int, str]:
# luckily 'core' and 'secondary' are in alphabetical order, so we can return the string # luckily 'core' and 'secondary' are in alphabetical order, so we can return the string
return (entry.stage, entry.priority) return (entry.stage, entry.priority, entry.filename)
startup_entries = list(sorted(startup_entries, key=sort_key)) startup_entries = list(sorted(startup_entries, key=sort_key))
startup_entries_lines = [str(entry) for entry in startup_entries] startup_entries_lines = [str(entry) for entry in startup_entries]