diff --git a/lisa/_assets/binaries/arm64/README.libtraceevent b/lisa/_assets/binaries/arm64/README.libtraceevent index c66c717a12ff0823fe910a4e01af520ef6c88a27..7d039e2cd2999ba300859335a3e594580468e800 100644 --- a/lisa/_assets/binaries/arm64/README.libtraceevent +++ b/lisa/_assets/binaries/arm64/README.libtraceevent @@ -1,5 +1,5 @@ Sources of libtraceevent available at: -Git commit: 424b11f6c3ab2e3bb199180e142fbcf9eebf2ac3 +Git commit: 0c28cec1e409653095dea0511c24fd9849b2862f Git repository: https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git @@ -30,9 +30,9 @@ download() { git -C trace-cmd checkout trace-cmd-v3.1.5 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git - # Last good commit of libtraceevent that does not break -R output: + # Commit after 1.7.0 that fixes the raw trace-cmd output: # https://bugzilla.kernel.org/show_bug.cgi?id=216896 - git -C libtraceevent checkout 424b11f6c3ab2e3bb199180e142fbcf9eebf2ac3 + git -C libtraceevent checkout 0c28cec1e409653095dea0511c24fd9849b2862f git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git git -C libtracefs checkout libtracefs-1.6.3 diff --git a/lisa/_assets/binaries/arm64/README.libtracefs b/lisa/_assets/binaries/arm64/README.libtracefs index d9235ffc06eb3085f5c0ce88402ff0a570221682..eb0b67b1c39ee05dfc3f8aacbc9ad1935d5e8f41 100644 --- a/lisa/_assets/binaries/arm64/README.libtracefs +++ b/lisa/_assets/binaries/arm64/README.libtracefs @@ -30,9 +30,9 @@ download() { git -C trace-cmd checkout trace-cmd-v3.1.5 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git - # Last good commit of libtraceevent that does not break -R output: + # Commit after 1.7.0 that fixes the raw trace-cmd output: # https://bugzilla.kernel.org/show_bug.cgi?id=216896 - git -C libtraceevent checkout 424b11f6c3ab2e3bb199180e142fbcf9eebf2ac3 + git -C libtraceevent checkout 0c28cec1e409653095dea0511c24fd9849b2862f git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git git -C libtracefs checkout libtracefs-1.6.3 diff --git a/lisa/_assets/binaries/arm64/README.trace-cmd b/lisa/_assets/binaries/arm64/README.trace-cmd index f464bc0964aa9af7b2bc36faca89301c200486f9..fbaa019f4dd5d7cb99dc1542d095b67d056ff304 100644 --- a/lisa/_assets/binaries/arm64/README.trace-cmd +++ b/lisa/_assets/binaries/arm64/README.trace-cmd @@ -30,9 +30,9 @@ download() { git -C trace-cmd checkout trace-cmd-v3.1.5 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git - # Last good commit of libtraceevent that does not break -R output: + # Commit after 1.7.0 that fixes the raw trace-cmd output: # https://bugzilla.kernel.org/show_bug.cgi?id=216896 - git -C libtraceevent checkout 424b11f6c3ab2e3bb199180e142fbcf9eebf2ac3 + git -C libtraceevent checkout 0c28cec1e409653095dea0511c24fd9849b2862f git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git git -C libtracefs checkout libtracefs-1.6.3 diff --git a/lisa/_assets/binaries/arm64/trace-cmd b/lisa/_assets/binaries/arm64/trace-cmd index 67a266217c68a65f661a9175084c5e13587439b9..3b03f54ed5cebf350d67e26e124b0f44532c192b 100755 Binary files a/lisa/_assets/binaries/arm64/trace-cmd and b/lisa/_assets/binaries/arm64/trace-cmd differ diff --git a/lisa/_assets/binaries/armeabi/README.libtraceevent b/lisa/_assets/binaries/armeabi/README.libtraceevent index 6da16563fbf1296efd8235bf99d60f87473cfda7..4311e81ee681297dcedf10c9d7ba2584e0b27935 100644 --- a/lisa/_assets/binaries/armeabi/README.libtraceevent +++ b/lisa/_assets/binaries/armeabi/README.libtraceevent @@ -1,5 +1,5 @@ Sources of libtraceevent available at: -Git commit: 424b11f6c3ab2e3bb199180e142fbcf9eebf2ac3 +Git commit: 0c28cec1e409653095dea0511c24fd9849b2862f Git repository: https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git @@ -30,9 +30,9 @@ download() { git -C trace-cmd checkout trace-cmd-v3.1.5 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git - # Last good commit of libtraceevent that does not break -R output: + # Commit after 1.7.0 that fixes the raw trace-cmd output: # https://bugzilla.kernel.org/show_bug.cgi?id=216896 - git -C libtraceevent checkout 424b11f6c3ab2e3bb199180e142fbcf9eebf2ac3 + git -C libtraceevent checkout 0c28cec1e409653095dea0511c24fd9849b2862f git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git git -C libtracefs checkout libtracefs-1.6.3 diff --git a/lisa/_assets/binaries/armeabi/README.libtracefs b/lisa/_assets/binaries/armeabi/README.libtracefs index 8de41a1214341265681a6c700e59b9790571ffbe..bab37ac13f57e531a341e37f75b0d1bbcb386794 100644 --- a/lisa/_assets/binaries/armeabi/README.libtracefs +++ b/lisa/_assets/binaries/armeabi/README.libtracefs @@ -30,9 +30,9 @@ download() { git -C trace-cmd checkout trace-cmd-v3.1.5 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git - # Last good commit of libtraceevent that does not break -R output: + # Commit after 1.7.0 that fixes the raw trace-cmd output: # https://bugzilla.kernel.org/show_bug.cgi?id=216896 - git -C libtraceevent checkout 424b11f6c3ab2e3bb199180e142fbcf9eebf2ac3 + git -C libtraceevent checkout 0c28cec1e409653095dea0511c24fd9849b2862f git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git git -C libtracefs checkout libtracefs-1.6.3 diff --git a/lisa/_assets/binaries/armeabi/README.trace-cmd b/lisa/_assets/binaries/armeabi/README.trace-cmd index 95f89ae2450687aa25a65a862a7e8479863410ec..2ccf8449241d1a52e5bb5738cd832e7308c2a25a 100644 --- a/lisa/_assets/binaries/armeabi/README.trace-cmd +++ b/lisa/_assets/binaries/armeabi/README.trace-cmd @@ -30,9 +30,9 @@ download() { git -C trace-cmd checkout trace-cmd-v3.1.5 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git - # Last good commit of libtraceevent that does not break -R output: + # Commit after 1.7.0 that fixes the raw trace-cmd output: # https://bugzilla.kernel.org/show_bug.cgi?id=216896 - git -C libtraceevent checkout 424b11f6c3ab2e3bb199180e142fbcf9eebf2ac3 + git -C libtraceevent checkout 0c28cec1e409653095dea0511c24fd9849b2862f git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git git -C libtracefs checkout libtracefs-1.6.3 diff --git a/lisa/_assets/binaries/armeabi/trace-cmd b/lisa/_assets/binaries/armeabi/trace-cmd index d9d67ce33349e13a7fd4840e581e0770bbad6829..d3e360e67333acb4f5ed521896533d397ebee663 100755 Binary files a/lisa/_assets/binaries/armeabi/trace-cmd and b/lisa/_assets/binaries/armeabi/trace-cmd differ diff --git a/lisa/_assets/binaries/x86_64/README.libtraceevent b/lisa/_assets/binaries/x86_64/README.libtraceevent index b177eb50b09ed2a9682fcc96b52e51ccfb5a4597..7d1e79072a5d9871b172eba34508459dc2db4e6a 100644 --- a/lisa/_assets/binaries/x86_64/README.libtraceevent +++ b/lisa/_assets/binaries/x86_64/README.libtraceevent @@ -1,5 +1,5 @@ Sources of libtraceevent available at: -Git commit: 424b11f6c3ab2e3bb199180e142fbcf9eebf2ac3 +Git commit: 0c28cec1e409653095dea0511c24fd9849b2862f Git repository: https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git @@ -30,9 +30,9 @@ download() { git -C trace-cmd checkout trace-cmd-v3.1.5 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git - # Last good commit of libtraceevent that does not break -R output: + # Commit after 1.7.0 that fixes the raw trace-cmd output: # https://bugzilla.kernel.org/show_bug.cgi?id=216896 - git -C libtraceevent checkout 424b11f6c3ab2e3bb199180e142fbcf9eebf2ac3 + git -C libtraceevent checkout 0c28cec1e409653095dea0511c24fd9849b2862f git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git git -C libtracefs checkout libtracefs-1.6.3 diff --git a/lisa/_assets/binaries/x86_64/README.libtracefs b/lisa/_assets/binaries/x86_64/README.libtracefs index f8ab330575c747449d7e8840f0d27823d2102159..c01dc57fc93c142e923d3fb3a31456fcffe3b2ff 100644 --- a/lisa/_assets/binaries/x86_64/README.libtracefs +++ b/lisa/_assets/binaries/x86_64/README.libtracefs @@ -30,9 +30,9 @@ download() { git -C trace-cmd checkout trace-cmd-v3.1.5 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git - # Last good commit of libtraceevent that does not break -R output: + # Commit after 1.7.0 that fixes the raw trace-cmd output: # https://bugzilla.kernel.org/show_bug.cgi?id=216896 - git -C libtraceevent checkout 424b11f6c3ab2e3bb199180e142fbcf9eebf2ac3 + git -C libtraceevent checkout 0c28cec1e409653095dea0511c24fd9849b2862f git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git git -C libtracefs checkout libtracefs-1.6.3 diff --git a/lisa/_assets/binaries/x86_64/README.trace-cmd b/lisa/_assets/binaries/x86_64/README.trace-cmd index 6abbf0db27a5d5b9968c1ad043cdfa55babc332c..e20d5f1f1382f49ed9b1c4280c3b81e144b8aad2 100644 --- a/lisa/_assets/binaries/x86_64/README.trace-cmd +++ b/lisa/_assets/binaries/x86_64/README.trace-cmd @@ -30,9 +30,9 @@ download() { git -C trace-cmd checkout trace-cmd-v3.1.5 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git - # Last good commit of libtraceevent that does not break -R output: + # Commit after 1.7.0 that fixes the raw trace-cmd output: # https://bugzilla.kernel.org/show_bug.cgi?id=216896 - git -C libtraceevent checkout 424b11f6c3ab2e3bb199180e142fbcf9eebf2ac3 + git -C libtraceevent checkout 0c28cec1e409653095dea0511c24fd9849b2862f git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git git -C libtracefs checkout libtracefs-1.6.3 diff --git a/lisa/_assets/binaries/x86_64/trace-cmd b/lisa/_assets/binaries/x86_64/trace-cmd index 30b8d7e8c572111d8e3865234b9ab2485c1ce1ba..7c88499e3b10e263d7d58c78b1e99cd52c23d6d3 100755 Binary files a/lisa/_assets/binaries/x86_64/trace-cmd and b/lisa/_assets/binaries/x86_64/trace-cmd differ diff --git a/lisa/trace.py b/lisa/trace.py index 80f183c7814e0f4577e49e8ebf5934a95ae59bba..3bdfeaaf0c0c1cb6b69d8769f16439c30136e376 100644 --- a/lisa/trace.py +++ b/lisa/trace.py @@ -686,6 +686,7 @@ class TxtTraceParserBase(TraceParserBase): _KERNEL_DTYPE = { 'timestamp': 'uint64', 'pointer': 'uint64', + 'symbol': 'string', 'cpu': 'uint16', 'pid': 'uint32', 'signed_pid': 'int32', @@ -1319,7 +1320,7 @@ class TxtTraceParser(TxtTraceParserBase): 'cpu': _KERNEL_DTYPE['cpu'], 'target': 'uint16', 'idx': 'uint16', - 'fun': _KERNEL_DTYPE['pointer'], + 'fun': _KERNEL_DTYPE['symbol'], }, ), 'funcgraph_entry': dict( diff --git a/tools/recipes/trace-cmd.recipe b/tools/recipes/trace-cmd.recipe index 45f462d1dfd46ce5d9fd1345b8660de4c0c016b5..c96e49fc232f47dc81ebbafb39b89b9cfbf1f383 100644 --- a/tools/recipes/trace-cmd.recipe +++ b/tools/recipes/trace-cmd.recipe @@ -9,9 +9,9 @@ download() { git -C trace-cmd checkout trace-cmd-v3.1.5 git clone https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git - # Last good commit of libtraceevent that does not break -R output: + # Commit after 1.7.0 that fixes the raw trace-cmd output: # https://bugzilla.kernel.org/show_bug.cgi?id=216896 - git -C libtraceevent checkout 424b11f6c3ab2e3bb199180e142fbcf9eebf2ac3 + git -C libtraceevent checkout 0c28cec1e409653095dea0511c24fd9849b2862f git clone https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git git -C libtracefs checkout libtracefs-1.6.3