perf: Support for Openembedded/Yocto -dbg packages
PATCH v3 1/1 perf: Support for Openembedded/Yocto -dbg packages
On OpenEmbedded the symbol files are located under a .debug folder on the same folder as the binary file.
This patch adds support for such files.
Without this patch on perf top you can see:
no symbols found in /usr/lib/gstreamer-1.0/libtheoraenc.so.1.1.2, maybe install a debug package?
84.56% libtheoraenc.so.1.1.2 [.] 0x000000000000b346
With this patch symbols are shown:
19.06% libtheoraenc.so.1.1.2 [.] oc_int_frag_satd_thresh_mmxext 9.76% libtheoraenc.so.1.1.2 [.] oc_analyze_mb_mode_luma 5.58% libtheoraenc.so.1.1.2 [.] oc_qii_state_advance 4.84% libtheoraenc.so.1.1.2 [.] oc_enc_tokenize_ac
...
---
v2: Changes proposed by Ingo Molnar
-Improve changeset
-Improve multi-snprintf readability
-Code Style
v3: Changes proposed by Ingo Molnar, Arnaldo Carvalho de Melo and Peter Zijlstra
-Code Style
-Use scnprintf
tools/perf/util/dso.c | 49 +++++++++++++++++++++++++++++++++++------------- tools/perf/util/dso.h | 1 + tools/perf/util/symbol.c | 1 + 3 files changed, 38 insertions(+), 13 deletions(-)
tools/perf/util/dso.c +36 -13
@@ -7,19 +7,20 @@char dso__symtab_origin (const struct dso *dso) {static const char origin[] = { - [DSO_BINARY_TYPE__KALLSYMS ] ='k' , - [DSO_BINARY_TYPE__VMLINUX ] ='v' , - [DSO_BINARY_TYPE__JAVA_JIT ] ='j' , - [DSO_BINARY_TYPE__DEBUGLINK ] ='l' , - [DSO_BINARY_TYPE__BUILD_ID_CACHE ] ='B' , - [DSO_BINARY_TYPE__FEDORA_DEBUGINFO ] ='f' , - [DSO_BINARY_TYPE__UBUNTU_DEBUGINFO ] ='u' , - [DSO_BINARY_TYPE__BUILDID_DEBUGINFO ] ='b' , - [DSO_BINARY_TYPE__SYSTEM_PATH_DSO ] ='d' , - [DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE ] ='K' , - [DSO_BINARY_TYPE__GUEST_KALLSYMS ] ='g' , - [DSO_BINARY_TYPE__GUEST_KMODULE ] ='G' , - [DSO_BINARY_TYPE__GUEST_VMLINUX ] ='V' , + [DSO_BINARY_TYPE__KALLSYMS ] ='k' , + [DSO_BINARY_TYPE__VMLINUX ] ='v' , + [DSO_BINARY_TYPE__JAVA_JIT ] ='j' , + [DSO_BINARY_TYPE__DEBUGLINK ] ='l' , + [DSO_BINARY_TYPE__BUILD_ID_CACHE ] ='B' , + [DSO_BINARY_TYPE__FEDORA_DEBUGINFO ] ='f' , + [DSO_BINARY_TYPE__UBUNTU_DEBUGINFO ] ='u' , + [DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO ] ='o' , + [DSO_BINARY_TYPE__BUILDID_DEBUGINFO ] ='b' , + [DSO_BINARY_TYPE__SYSTEM_PATH_DSO ] ='d' , + [DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE ] ='K' , + [DSO_BINARY_TYPE__GUEST_KALLSYMS ] ='g' , + [DSO_BINARY_TYPE__GUEST_KMODULE ] ='G' , + [DSO_BINARY_TYPE__GUEST_VMLINUX ] ='V' , };if (dso ==NULL || dso->symtab_type ==DSO_BINARY_TYPE__NOT_FOUND )
@@ -64,6 +65,28 @@ int dso__binary_type_file(struct dso *dso, enum dso_binary_type type, symbol_conf.symfs, dso->long_name);break ; +case DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO : + { +char *last_slash; +size_t len; +size_t dir_size; + + last_slash = dso->long_name + dso->long_name_len; +while (last_slash != dso->long_name && *last_slash !='/' ) + last_slash--; + + len =scnprintf (file, size,"%s" , symbol_conf.symfs); + dir_size = last_slash - dso->long_name +2 ; +if (dir_size > (size - len)) { + ret =-1 ; +break ; + } + len +=scnprintf (file + len, dir_size,"%s" , dso->long_name); + len +=scnprintf (file + len , size - len,".debug%s" , + last_slash); +break ; + } +case DSO_BINARY_TYPE__BUILDID_DEBUGINFO :if (!dso->has_build_id) { ret =-1 ;
tools/perf/util/dso.h +1 -0
@@ -23,6 +23,7 @@ enum dso_binary_type {DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE ,DSO_BINARY_TYPE__KCORE ,DSO_BINARY_TYPE__GUEST_KCORE , +DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO , DSO_BINARY_TYPE__NOT_FOUND, };
tools/perf/util/symbol.c +1 -0
@@ -51,6 +51,7 @@ static enum dso_binary_type binary_type_symtab[] = {DSO_BINARY_TYPE__SYSTEM_PATH_DSO ,DSO_BINARY_TYPE__GUEST_KMODULE ,DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE , +DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO , DSO_BINARY_TYPE__NOT_FOUND, };
Signature · 1 line
1.8.4.rc3
Anything else to fix on this patch?
Quoted 134 lines · Ricardo Ribalda Delgado
On OpenEmbedded the symbol files are located under a .debug folder on the same folder as the binary file.
This patch adds support for such files.
Without this patch on perf top you can see:
no symbols found in
/usr/lib/gstreamer-1.0/libtheoraenc.so.1.1.2, maybe install a debug package?84.56% libtheoraenc.so.1.1.2 [.]
0x000000000000b346With this patch symbols are shown:
19.06% libtheoraenc.so.1.1.2 [.] oc_int_frag_satd_thresh_mmxext 9.76% libtheoraenc.so.1.1.2 [.] oc_analyze_mb_mode_luma 5.58% libtheoraenc.so.1.1.2 [.] oc_qii_state_advance 4.84% libtheoraenc.so.1.1.2 [.] oc_enc_tokenize_ac...
Signed-off-by Ricardo Ribalda Delgado <[email protected]>---
v2: Changes proposed by Ingo Molnar
(quoted diff) +0
-3-Improve changeset -Improve multi-snprintf readability -Code Stylev3: Changes proposed by Ingo Molnar, Arnaldo Carvalho de Melo and Peter Zijlstra
(quoted diff) +0
-2-Code Style -Use scnprintf tools/perf/util/dso.c | 49 +++++++++++++++++++++++++++++++++++------------- tools/perf/util/dso.h | 1 + tools/perf/util/symbol.c | 1 + 3 files changed, 38 insertions(+), 13 deletions(-)tools/perf/util/dso.c +36
-13@@ -7,19 +7,20 @@char dso__symtab_origin (const struct dso *dso) {static const char origin[] = { - [DSO_BINARY_TYPE__KALLSYMS ] ='k' , - [DSO_BINARY_TYPE__VMLINUX ] ='v' , - [DSO_BINARY_TYPE__JAVA_JIT ] ='j' , - [DSO_BINARY_TYPE__DEBUGLINK ] ='l' , - [DSO_BINARY_TYPE__BUILD_ID_CACHE ] ='B' , - [DSO_BINARY_TYPE__FEDORA_DEBUGINFO ] ='f' , - [DSO_BINARY_TYPE__UBUNTU_DEBUGINFO ] ='u' , - [DSO_BINARY_TYPE__BUILDID_DEBUGINFO ] ='b' , - [DSO_BINARY_TYPE__SYSTEM_PATH_DSO ] ='d' , - [DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE ] ='K' , - [DSO_BINARY_TYPE__GUEST_KALLSYMS ] ='g' , - [DSO_BINARY_TYPE__GUEST_KMODULE ] ='G' , - [DSO_BINARY_TYPE__GUEST_VMLINUX ] ='V' , + [DSO_BINARY_TYPE__KALLSYMS ] ='k' , + [DSO_BINARY_TYPE__VMLINUX ] ='v' , + [DSO_BINARY_TYPE__JAVA_JIT ] ='j' , + [DSO_BINARY_TYPE__DEBUGLINK ] ='l' , + [DSO_BINARY_TYPE__BUILD_ID_CACHE ] ='B' , + [DSO_BINARY_TYPE__FEDORA_DEBUGINFO ] ='f' , + [DSO_BINARY_TYPE__UBUNTU_DEBUGINFO ] ='u' , + [DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO ] ='o' , + [DSO_BINARY_TYPE__BUILDID_DEBUGINFO ] ='b' , + [DSO_BINARY_TYPE__SYSTEM_PATH_DSO ] ='d' , + [DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE ] ='K' , + [DSO_BINARY_TYPE__GUEST_KALLSYMS ] ='g' , + [DSO_BINARY_TYPE__GUEST_KMODULE ] ='G' , + [DSO_BINARY_TYPE__GUEST_VMLINUX ] ='V' , };if (dso ==NULL || dso->symtab_type ==DSO_BINARY_TYPE__NOT_FOUND )@@ -64,6 +65,28 @@ int dso__binary_type_file(struct dso *dso, enum dso_binary_type type, symbol_conf.symfs, dso->long_name);break ; +case DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO : + { +char *last_slash; +size_t len; +size_t dir_size; + + last_slash = dso->long_name + dso->long_name_len; +while (last_slash != dso->long_name && *last_slash !='/' ) + last_slash--; + + len =scnprintf (file, size,"%s" , symbol_conf.symfs); + dir_size = last_slash - dso->long_name +2 ; +if (dir_size > (size - len)) { + ret =-1 ; +break ; + } + len +=scnprintf (file + len, dir_size,"%s" , dso->long_name); + len +=scnprintf (file + len , size - len,".debug%s" , + last_slash); +break ; + } +case DSO_BINARY_TYPE__BUILDID_DEBUGINFO :if (!dso->has_build_id) { ret =-1 ;tools/perf/util/dso.h +1
-0@@ -23,6 +23,7 @@ enum dso_binary_type {DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE ,DSO_BINARY_TYPE__KCORE ,DSO_BINARY_TYPE__GUEST_KCORE , +DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO , DSO_BINARY_TYPE__NOT_FOUND, };tools/perf/util/symbol.c +1
-1@@ -51,6 +51,7 @@ static enum dso_binary_type binary_type_symtab[] = {DSO_BINARY_TYPE__SYSTEM_PATH_DSO ,DSO_BINARY_TYPE__GUEST_KMODULE ,DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE , +DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO , DSO_BINARY_TYPE__NOT_FOUND, }; --1.8.4.rc3
Signature · 1 line
Ricardo Ribalda
Em Thu, Sep 19, 2013 at 07:03:43PM +0200, Ricardo Ribalda Delgado escreveu:
Quoted 1 line
Anything else to fix on this patch?
Not from a quick read, thanks for addressing the comments, I'll stash it in my perf/core branch.
- Arnaldo
Quoted 141 lines
Quoted 134 lines · Ricardo Ribalda Delgado
On OpenEmbedded the symbol files are located under a .debug folder on the same folder as the binary file.
This patch adds support for such files.
Without this patch on perf top you can see:
no symbols found in
/usr/lib/gstreamer-1.0/libtheoraenc.so.1.1.2, maybe install a debug package?84.56% libtheoraenc.so.1.1.2 [.]
0x000000000000b346With this patch symbols are shown:
19.06% libtheoraenc.so.1.1.2 [.] oc_int_frag_satd_thresh_mmxext 9.76% libtheoraenc.so.1.1.2 [.] oc_analyze_mb_mode_luma 5.58% libtheoraenc.so.1.1.2 [.] oc_qii_state_advance 4.84% libtheoraenc.so.1.1.2 [.] oc_enc_tokenize_ac...
Signed-off-by Ricardo Ribalda Delgado <[email protected]>---
v2: Changes proposed by Ingo Molnar
(quoted diff) +0
-3-Improve changeset -Improve multi-snprintf readability -Code Stylev3: Changes proposed by Ingo Molnar, Arnaldo Carvalho de Melo and Peter Zijlstra
(quoted diff) +0
-2-Code Style -Use scnprintf tools/perf/util/dso.c | 49 +++++++++++++++++++++++++++++++++++------------- tools/perf/util/dso.h | 1 + tools/perf/util/symbol.c | 1 + 3 files changed, 38 insertions(+), 13 deletions(-)tools/perf/util/dso.c +36
-13@@ -7,19 +7,20 @@char dso__symtab_origin (const struct dso *dso) {static const char origin[] = { - [DSO_BINARY_TYPE__KALLSYMS ] ='k' , - [DSO_BINARY_TYPE__VMLINUX ] ='v' , - [DSO_BINARY_TYPE__JAVA_JIT ] ='j' , - [DSO_BINARY_TYPE__DEBUGLINK ] ='l' , - [DSO_BINARY_TYPE__BUILD_ID_CACHE ] ='B' , - [DSO_BINARY_TYPE__FEDORA_DEBUGINFO ] ='f' , - [DSO_BINARY_TYPE__UBUNTU_DEBUGINFO ] ='u' , - [DSO_BINARY_TYPE__BUILDID_DEBUGINFO ] ='b' , - [DSO_BINARY_TYPE__SYSTEM_PATH_DSO ] ='d' , - [DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE ] ='K' , - [DSO_BINARY_TYPE__GUEST_KALLSYMS ] ='g' , - [DSO_BINARY_TYPE__GUEST_KMODULE ] ='G' , - [DSO_BINARY_TYPE__GUEST_VMLINUX ] ='V' , + [DSO_BINARY_TYPE__KALLSYMS ] ='k' , + [DSO_BINARY_TYPE__VMLINUX ] ='v' , + [DSO_BINARY_TYPE__JAVA_JIT ] ='j' , + [DSO_BINARY_TYPE__DEBUGLINK ] ='l' , + [DSO_BINARY_TYPE__BUILD_ID_CACHE ] ='B' , + [DSO_BINARY_TYPE__FEDORA_DEBUGINFO ] ='f' , + [DSO_BINARY_TYPE__UBUNTU_DEBUGINFO ] ='u' , + [DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO ] ='o' , + [DSO_BINARY_TYPE__BUILDID_DEBUGINFO ] ='b' , + [DSO_BINARY_TYPE__SYSTEM_PATH_DSO ] ='d' , + [DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE ] ='K' , + [DSO_BINARY_TYPE__GUEST_KALLSYMS ] ='g' , + [DSO_BINARY_TYPE__GUEST_KMODULE ] ='G' , + [DSO_BINARY_TYPE__GUEST_VMLINUX ] ='V' , };if (dso ==NULL || dso->symtab_type ==DSO_BINARY_TYPE__NOT_FOUND )@@ -64,6 +65,28 @@ int dso__binary_type_file(struct dso *dso, enum dso_binary_type type, symbol_conf.symfs, dso->long_name);break ; +case DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO : + { +char *last_slash; +size_t len; +size_t dir_size; + + last_slash = dso->long_name + dso->long_name_len; +while (last_slash != dso->long_name && *last_slash !='/' ) + last_slash--; + + len =scnprintf (file, size,"%s" , symbol_conf.symfs); + dir_size = last_slash - dso->long_name +2 ; +if (dir_size > (size - len)) { + ret =-1 ; +break ; + } + len +=scnprintf (file + len, dir_size,"%s" , dso->long_name); + len +=scnprintf (file + len , size - len,".debug%s" , + last_slash); +break ; + } +case DSO_BINARY_TYPE__BUILDID_DEBUGINFO :if (!dso->has_build_id) { ret =-1 ;tools/perf/util/dso.h +1
-0@@ -23,6 +23,7 @@ enum dso_binary_type {DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE ,DSO_BINARY_TYPE__KCORE ,DSO_BINARY_TYPE__GUEST_KCORE , +DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO , DSO_BINARY_TYPE__NOT_FOUND, };tools/perf/util/symbol.c +1
-1@@ -51,6 +51,7 @@ static enum dso_binary_type binary_type_symtab[] = {DSO_BINARY_TYPE__SYSTEM_PATH_DSO ,DSO_BINARY_TYPE__GUEST_KMODULE ,DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE , +DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO , DSO_BINARY_TYPE__NOT_FOUND, }; --1.8.4.rc3
Signature · 1 line
Ricardo Ribalda
Ingo Molnar
Acked-byQuoted 1 line · Ricardo Ribalda Delgado
Anything else to fix on this patch?
Looks good to me, thanks!
Ingo
tip-bot for Ricardo Ribalda Delgado
merge bot[tip:perf/core] perf symbols: Support for Openembedded/ Yocto -dbg packages
In reply to Ricardo Ribalda Delgadoperf symbols: Support for Openembedded/Yocto -dbg packages
Commit-ID: 9cd00941f8c274e6ca03ed238d96ddb0be474b86 Gitweb: http://git.kernel.org/tip/9cd00941f8c274e6ca03ed238d96ddb0be474b86 Author: Ricardo Ribalda Delgado <[email protected]> AuthorDate: Wed, 18 Sep 2013 15:56:14 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 9 Oct 2013 11:12:41 -0300
perf symbols: Support for Openembedded/Yocto -dbg packages
On OpenEmbedded the symbol files are located under a .debug folder on the same folder as the binary file.
This patch adds support for such files.
Without this patch on perf top you can see:
no symbols found in /usr/lib/gstreamer-1.0/libtheoraenc.so.1.1.2, maybe install a debug package?
84.56% libtheoraenc.so.1.1.2 [.] 0x000000000000b346
With this patch symbols are shown:
19.06% libtheoraenc.so.1.1.2 [.] oc_int_frag_satd_thresh_mmxext 9.76% libtheoraenc.so.1.1.2 [.] oc_analyze_mb_mode_luma 5.58% libtheoraenc.so.1.1.2 [.] oc_qii_state_advance 4.84% libtheoraenc.so.1.1.2 [.] oc_enc_tokenize_ac
...
--- tools/perf/util/dso.c | 49 +++++++++++++++++++++++++++++++++++------------- tools/perf/util/dso.h | 1 + tools/perf/util/symbol.c | 1 + 3 files changed, 38 insertions(+), 13 deletions(-)
tools/perf/util/dso.c +36 -13
@@ -7,19 +7,20 @@char dso__symtab_origin (const struct dso *dso) {static const char origin[] = { - [DSO_BINARY_TYPE__KALLSYMS ] ='k' , - [DSO_BINARY_TYPE__VMLINUX ] ='v' , - [DSO_BINARY_TYPE__JAVA_JIT ] ='j' , - [DSO_BINARY_TYPE__DEBUGLINK ] ='l' , - [DSO_BINARY_TYPE__BUILD_ID_CACHE ] ='B' , - [DSO_BINARY_TYPE__FEDORA_DEBUGINFO ] ='f' , - [DSO_BINARY_TYPE__UBUNTU_DEBUGINFO ] ='u' , - [DSO_BINARY_TYPE__BUILDID_DEBUGINFO ] ='b' , - [DSO_BINARY_TYPE__SYSTEM_PATH_DSO ] ='d' , - [DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE ] ='K' , - [DSO_BINARY_TYPE__GUEST_KALLSYMS ] ='g' , - [DSO_BINARY_TYPE__GUEST_KMODULE ] ='G' , - [DSO_BINARY_TYPE__GUEST_VMLINUX ] ='V' , + [DSO_BINARY_TYPE__KALLSYMS ] ='k' , + [DSO_BINARY_TYPE__VMLINUX ] ='v' , + [DSO_BINARY_TYPE__JAVA_JIT ] ='j' , + [DSO_BINARY_TYPE__DEBUGLINK ] ='l' , + [DSO_BINARY_TYPE__BUILD_ID_CACHE ] ='B' , + [DSO_BINARY_TYPE__FEDORA_DEBUGINFO ] ='f' , + [DSO_BINARY_TYPE__UBUNTU_DEBUGINFO ] ='u' , + [DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO ] ='o' , + [DSO_BINARY_TYPE__BUILDID_DEBUGINFO ] ='b' , + [DSO_BINARY_TYPE__SYSTEM_PATH_DSO ] ='d' , + [DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE ] ='K' , + [DSO_BINARY_TYPE__GUEST_KALLSYMS ] ='g' , + [DSO_BINARY_TYPE__GUEST_KMODULE ] ='G' , + [DSO_BINARY_TYPE__GUEST_VMLINUX ] ='V' , };if (dso ==NULL || dso->symtab_type ==DSO_BINARY_TYPE__NOT_FOUND )
@@ -64,6 +65,28 @@ int dso__binary_type_file(struct dso *dso, enum dso_binary_type type, symbol_conf.symfs, dso->long_name);break ; +case DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO : + { +char *last_slash; +size_t len; +size_t dir_size; + + last_slash = dso->long_name + dso->long_name_len; +while (last_slash != dso->long_name && *last_slash !='/' ) + last_slash--; + + len =scnprintf (file, size,"%s" , symbol_conf.symfs); + dir_size = last_slash - dso->long_name +2 ; +if (dir_size > (size - len)) { + ret =-1 ; +break ; + } + len +=scnprintf (file + len, dir_size,"%s" , dso->long_name); + len +=scnprintf (file + len , size - len,".debug%s" , + last_slash); +break ; + } +case DSO_BINARY_TYPE__BUILDID_DEBUGINFO :if (!dso->has_build_id) { ret =-1 ;
tools/perf/util/dso.h +1 -0
@@ -23,6 +23,7 @@ enum dso_binary_type {DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE ,DSO_BINARY_TYPE__KCORE ,DSO_BINARY_TYPE__GUEST_KCORE , +DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO , DSO_BINARY_TYPE__NOT_FOUND, };
tools/perf/util/symbol.c +1 -0
@@ -51,6 +51,7 @@ static enum dso_binary_type binary_type_symtab[] = {DSO_BINARY_TYPE__SYSTEM_PATH_DSO ,DSO_BINARY_TYPE__GUEST_KMODULE ,DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE , +DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO , DSO_BINARY_TYPE__NOT_FOUND, };