espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-29 18:27:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/segger_sysview_build_v5.1' into 'release/v5.1'

Browse Source 
fix(app_trace): Fix SystemView build (v5.1)

See merge request espressif/esp-idf!24709
This commit is contained in:
Jiang Jiang Jian
2024-03-05 10:52:35 +08:00
parent 603268efe1 ddc3b14fdb
commit 3052c5a461
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/app_trace/sys_view/esp/SEGGER_RTT_esp.c
View File

@ -167,8 +167,8 @@ unsigned SEGGER_RTT_WriteSkipNoLock(unsigned BufferIndex, const void* pBuffer, u
(event_id == SYSVIEW_EVTID_TASK_STOP_EXEC) ||
(event_id == SYSVIEW_EVTID_TASK_START_READY) ||
(event_id == SYSVIEW_EVTID_TASK_STOP_READY) ||
(event_id == SYSVIEW_EVTID_USER_START) ||
(event_id == SYSVIEW_EVTID_USER_STOP) ||
(event_id == SYSVIEW_EVTID_MARK_START) ||
(event_id == SYSVIEW_EVTID_MARK_STOP) ||
(event_id == SYSVIEW_EVTID_TIMER_ENTER) ||
(event_id == SYSVIEW_EVTID_TIMER_EXIT) ||
(event_id == SYSVIEW_EVTID_STACK_INFO) ||

2
examples/system/sysview_tracing/main/Kconfig.projbuild
View File

@ -7,6 +7,6 @@ menu "Example Configuration"
Use custom IDs for user events. If it is enabled, replace `SYSVIEW_FreeRTOS.txt` in SystemView
installation directory with the version from example's root directory.
By default SYSVIEW_EVTID_USER_START/STOP are used for tracing purposes of the example.
By default SYSVIEW_EVTID_MARK_START/STOP are used for tracing purposes of the example.
endmenu

5
examples/system/sysview_tracing_heap_log/pytest_sysview_tracing_heap_log.py
View File

@ -10,9 +10,8 @@ from pytest_embedded_idf import IdfDut
@pytest.mark.esp32
@pytest.mark.jtag
@pytest.mark.parametrize('embedded_services', [
'esp,idf,jtag',
], indirect=True)
@pytest.mark.parametrize('config', ['app_trace_jtag'], indirect=True)
@pytest.mark.parametrize('embedded_services', ['esp,idf,jtag'], indirect=True)
def test_examples_sysview_tracing_heap_log(idf_path: str, dut: IdfDut) -> None:
trace_log = os.path.join(os.path.dirname(dut.gdb._logfile), 'heap_log.svdat') # pylint: disable=protected-access

0
examples/system/sysview_tracing_heap_log/sdkconfig.ci.app_trace_jtag Normal file
View File

1
examples/system/sysview_tracing_heap_log/sdkconfig.ci.app_trace_uart Normal file
View File

@ -0,0 +1 @@
CONFIG_APPTRACE_DEST_UART1=y

14
tools/esp_app_trace/espytrace/sysview.py
View File

@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0
import copy
import json
@ -22,8 +22,8 @@ SYSVIEW_EVTID_TRACE_STOP = 11
SYSVIEW_EVTID_SYSTIME_CYCLES = 12
SYSVIEW_EVTID_SYSTIME_US = 13
SYSVIEW_EVTID_SYSDESC = 14
SYSVIEW_EVTID_USER_START = 15
SYSVIEW_EVTID_USER_STOP = 16
SYSVIEW_EVTID_MARK_START = 15
SYSVIEW_EVTID_MARK_STOP = 16
SYSVIEW_EVTID_IDLE = 17
SYSVIEW_EVTID_ISR_TO_SCHEDULER = 18
SYSVIEW_EVTID_TIMER_ENTER = 19
@ -59,8 +59,8 @@ _sysview_events_map = {
'SYS_SYSTIME_CYCLES': SYSVIEW_EVTID_SYSTIME_CYCLES,
'SYS_SYSTIME_US': SYSVIEW_EVTID_SYSTIME_US,
'SYS_SYSDESC': SYSVIEW_EVTID_SYSDESC,
'SYS_USER_START': SYSVIEW_EVTID_USER_START,
'SYS_USER_STOP': SYSVIEW_EVTID_USER_STOP,
'SYS_USER_START': SYSVIEW_EVTID_MARK_START,
'SYS_USER_STOP': SYSVIEW_EVTID_MARK_STOP,
'SYS_IDLE': SYSVIEW_EVTID_IDLE,
'SYS_ISR_TO_SCHEDULER': SYSVIEW_EVTID_ISR_TO_SCHEDULER,
'SYS_TIMER_ENTER': SYSVIEW_EVTID_TIMER_ENTER,
@ -493,8 +493,8 @@ class SysViewPredefinedEvent(SysViewEvent):
SYSVIEW_EVTID_SYSTIME_CYCLES: ('svSysTimeCycles', [SysViewEventParamSimple('cycles', _decode_u32)]),
SYSVIEW_EVTID_SYSTIME_US: ('svSysTimeUs', [SysViewEventParamSimple('time', _decode_u64)]),
SYSVIEW_EVTID_SYSDESC: ('svSysDesc', [SysViewEventParamSimple('desc', _decode_str)]),
SYSVIEW_EVTID_USER_START: ('svUserStart', [SysViewEventParamSimple('user_id', _decode_u32)]),
SYSVIEW_EVTID_USER_STOP: ('svUserStart', [SysViewEventParamSimple('user_id', _decode_u32)]),
SYSVIEW_EVTID_MARK_START: ('svUserStart', [SysViewEventParamSimple('user_id', _decode_u32)]),
SYSVIEW_EVTID_MARK_STOP: ('svUserStop', [SysViewEventParamSimple('user_id', _decode_u32)]),
SYSVIEW_EVTID_IDLE: ('svIdle', []),
SYSVIEW_EVTID_ISR_TO_SCHEDULER: ('svExitIsrToScheduler', []),
SYSVIEW_EVTID_TIMER_ENTER: ('svTimerEnter', [SysViewEventParamSimple('tim_id', _decode_u32)]),