Enhance the init of vmlinux_path and add new path
cover Enhance the init of vmlinux_path and add new path
These pathset improves perf processing of the paths to vmlinux files:
1. it refactors the vmlinux_path__init procedure, to allow a simple usage in future: instead of adding several lines for every future vmlinux path, make it possible to simply add a path itself (1 line) to an array.
2. Some distibutions separate debuginfo to vmlinux.debug file. This patchset adds a path to vmlinux.debug, so that perf could use its symbols.
Ekaterina Tumanova (2):
perf: Refactor vmlinux_path_init
perf: add the path to vmlinux.debug
tools/perf/util/symbol.c | 65 +++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 31 deletions(-)
Signature · 1 line
2.3.9
PATCH 1/2 perf: Refactor vmlinux_path_init
Refactor vmlinux_path_init function to ease subsequent additions of new vmlinux locations.
--- tools/perf/util/symbol.c | 64 +++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 31 deletions(-)
tools/perf/util/symbol.c +33 -31
@@ -1860,24 +1860,43 @@ static void vmlinux_path__exit(void)zfree (&vmlinux_path); } +static const char *const vmlinux_paths[] = { +"vmlinux" , +"/boot/vmlinux" +}; + +static const char *const vmlinux_paths_upd[] = { +"/boot/vmlinux-%s" , +"/usr/lib/debug/boot/vmlinux-%s" , +"/lib/modules/%s/build/vmlinux" , +"/usr/lib/debug/lib/modules/%s/vmlinux" +}; + +static int vmlinux_path__update (const char *new_entry) +{ + vmlinux_path[vmlinux_path__nr_entries] =strdup (new_entry); +if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) +return -1 ; + ++vmlinux_path__nr_entries; + +return 0 ; +} +static int vmlinux_path__init (struct perf_env *env) {struct utsname uts;char bf[PATH_MAX ];char *kernel_version; +unsigned int i; - vmlinux_path =malloc (sizeof (char *) *6 ); + vmlinux_path =malloc (sizeof (char *) * (ARRAY_SIZE (vmlinux_paths) + +ARRAY_SIZE (vmlinux_paths_upd)));if (vmlinux_path ==NULL )return -1 ; - vmlinux_path[vmlinux_path__nr_entries] =strdup ("vmlinux" ); -if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) - goto out_fail; - ++vmlinux_path__nr_entries; - vmlinux_path[vmlinux_path__nr_entries] =strdup ("/boot/vmlinux" ); -if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) - goto out_fail; - ++vmlinux_path__nr_entries; +for (i =0 ; i <ARRAY_SIZE (vmlinux_paths); i++) +if (vmlinux_path__update (vmlinux_paths[i]) <0 ) + goto out_fail;/* only try kernel version if no symfs was given */ if (symbol_conf.symfs[0 ] !=0 )
@@ -1892,28 +1911,11 @@ static int vmlinux_path__init(struct perf_env *env) kernel_version = uts.release; } -snprintf (bf,sizeof (bf),"/boot/vmlinux-%s" , kernel_version); - vmlinux_path[vmlinux_path__nr_entries] =strdup (bf); -if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) - goto out_fail; - ++vmlinux_path__nr_entries; -snprintf (bf,sizeof (bf),"/usr/lib/debug/boot/vmlinux-%s" , - kernel_version); - vmlinux_path[vmlinux_path__nr_entries] =strdup (bf); -if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) - goto out_fail; - ++vmlinux_path__nr_entries; -snprintf (bf,sizeof (bf),"/lib/modules/%s/build/vmlinux" , kernel_version); - vmlinux_path[vmlinux_path__nr_entries] =strdup (bf); -if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) - goto out_fail; - ++vmlinux_path__nr_entries; -snprintf (bf,sizeof (bf),"/usr/lib/debug/lib/modules/%s/vmlinux" , - kernel_version); - vmlinux_path[vmlinux_path__nr_entries] =strdup (bf); -if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) - goto out_fail; - ++vmlinux_path__nr_entries; +for (i =0 ; i <ARRAY_SIZE (vmlinux_paths_upd); i++) { +snprintf (bf,sizeof (bf), vmlinux_paths_upd[i], kernel_version); +if (vmlinux_path__update (bf) <0 ) + goto out_fail; + }return 0 ;
Signature · 1 line
2.3.9
Re: [PATCH 1/2] perf: Refactor vmlinux_path_init
Quoted 5 lines · Ekaterina Tumanova
Refactor
vmlinux_path_initfunction to ease subsequent additions of new vmlinux locations.Signed-off-by Ekaterina Tumanova <[email protected]>
thanks,
jirka
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 1/2] perf: Refactor vmlinux_path_init
In reply to Ekaterina TumanovaEm Wed, Nov 25, 2015 at 05:32:45PM +0100, Ekaterina Tumanova escreveu:
Quoted 20 lines
Refactor
vmlinux_path_initfunction to ease subsequent additions of new vmlinux locations.Signed-off-by Ekaterina Tumanova <[email protected]>--- tools/perf/util/symbol.c | 64 +++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 31 deletions(-)tools/perf/util/symbol.c +3
-0@@ -1860,24 +1860,43 @@ static void vmlinux_path__exit(void)zfree (&vmlinux_path); } +static const char *const vmlinux_paths[] = { +"vmlinux" , +"/boot/vmlinux"
tools/perf/util/symbol.c static void vmlinux_path__exit(void) · line 1875
Quoted 10 lines
tools/perf/util/symbol.c +10
-0+}; + +static const char *const vmlinux_paths_upd[] = { +"/boot/vmlinux-%s" , +"/usr/lib/debug/boot/vmlinux-%s" , +"/lib/modules/%s/build/vmlinux" , +"/usr/lib/debug/lib/modules/%s/vmlinux" +}; + +static int vmlinux_path__update (const char *new_entry)
Changing this to vmlinux_path__add().
Quoted 72 lines
tools/perf/util/symbol.c +20
-31+{ + vmlinux_path[vmlinux_path__nr_entries] =strdup (new_entry); +if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) +return -1 ; + ++vmlinux_path__nr_entries; + +return 0 ; +} +static int vmlinux_path__init (struct perf_env *env) {struct utsname uts;char bf[PATH_MAX ];char *kernel_version; +unsigned int i; - vmlinux_path =malloc (sizeof (char *) *6 ); + vmlinux_path =malloc (sizeof (char *) * (ARRAY_SIZE (vmlinux_paths) + +ARRAY_SIZE (vmlinux_paths_upd)));if (vmlinux_path ==NULL )return -1 ; - vmlinux_path[vmlinux_path__nr_entries] =strdup ("vmlinux" ); -if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) - goto out_fail; - ++vmlinux_path__nr_entries; - vmlinux_path[vmlinux_path__nr_entries] =strdup ("/boot/vmlinux" ); -if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) - goto out_fail; - ++vmlinux_path__nr_entries; +for (i =0 ; i <ARRAY_SIZE (vmlinux_paths); i++) +if (vmlinux_path__update (vmlinux_paths[i]) <0 ) + goto out_fail;/* only try kernel version if no symfs was given */ if (symbol_conf.symfs[0 ] !=0 )@@ -1892,28 +1911,11 @@ static int vmlinux_path__init(struct perf_env *env) kernel_version = uts.release; } -snprintf (bf,sizeof (bf),"/boot/vmlinux-%s" , kernel_version); - vmlinux_path[vmlinux_path__nr_entries] =strdup (bf); -if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) - goto out_fail; - ++vmlinux_path__nr_entries; -snprintf (bf,sizeof (bf),"/usr/lib/debug/boot/vmlinux-%s" , - kernel_version); - vmlinux_path[vmlinux_path__nr_entries] =strdup (bf); -if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) - goto out_fail; - ++vmlinux_path__nr_entries; -snprintf (bf,sizeof (bf),"/lib/modules/%s/build/vmlinux" , kernel_version); - vmlinux_path[vmlinux_path__nr_entries] =strdup (bf); -if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) - goto out_fail; - ++vmlinux_path__nr_entries; -snprintf (bf,sizeof (bf),"/usr/lib/debug/lib/modules/%s/vmlinux" , - kernel_version); - vmlinux_path[vmlinux_path__nr_entries] =strdup (bf); -if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) - goto out_fail; - ++vmlinux_path__nr_entries; +for (i =0 ; i <ARRAY_SIZE (vmlinux_paths_upd); i++) { +snprintf (bf,sizeof (bf), vmlinux_paths_upd[i], kernel_version); +if (vmlinux_path__update (bf) <0 ) + goto out_fail; + }return 0 ;Signature · 1 line
2.3.9
tip-bot for Ekaterina Tumanova
merge bot[tip:perf/core] perf symbols: Refactor vmlinux_path__init() to ease path additions
In reply to Ekaterina Tumanovaperf symbols: Refactor vmlinux_path__init() to ease path additions
Commit-ID: aac4864727f4b3838ec1c03277bbc47a237b7516 Gitweb: http://git.kernel.org/tip/aac4864727f4b3838ec1c03277bbc47a237b7516 Author: Ekaterina Tumanova <[email protected]> AuthorDate: Wed, 25 Nov 2015 17:32:45 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 26 Nov 2015 16:49:29 -0300
perf symbols: Refactor vmlinux_path__init() to ease path additions
Refactor vmlinux_path__init() to ease subsequent additions of new vmlinux locations.
--- tools/perf/util/symbol.c | 64 +++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 31 deletions(-)
tools/perf/util/symbol.c +33 -31
@@ -1860,24 +1860,43 @@ static void vmlinux_path__exit(void)zfree (&vmlinux_path); } +static const char *const vmlinux_paths[] = { +"vmlinux" , +"/boot/vmlinux" +}; + +static const char *const vmlinux_paths_upd[] = { +"/boot/vmlinux-%s" , +"/usr/lib/debug/boot/vmlinux-%s" , +"/lib/modules/%s/build/vmlinux" , +"/usr/lib/debug/lib/modules/%s/vmlinux" +}; + +static int vmlinux_path__add (const char *new_entry) +{ + vmlinux_path[vmlinux_path__nr_entries] =strdup (new_entry); +if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) +return -1 ; + ++vmlinux_path__nr_entries; + +return 0 ; +} +static int vmlinux_path__init (struct perf_env *env) {struct utsname uts;char bf[PATH_MAX ];char *kernel_version; +unsigned int i; - vmlinux_path =malloc (sizeof (char *) *6 ); + vmlinux_path =malloc (sizeof (char *) * (ARRAY_SIZE (vmlinux_paths) + +ARRAY_SIZE (vmlinux_paths_upd)));if (vmlinux_path ==NULL )return -1 ; - vmlinux_path[vmlinux_path__nr_entries] =strdup ("vmlinux" ); -if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) - goto out_fail; - ++vmlinux_path__nr_entries; - vmlinux_path[vmlinux_path__nr_entries] =strdup ("/boot/vmlinux" ); -if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) - goto out_fail; - ++vmlinux_path__nr_entries; +for (i =0 ; i <ARRAY_SIZE (vmlinux_paths); i++) +if (vmlinux_path__add (vmlinux_paths[i]) <0 ) + goto out_fail;/* only try kernel version if no symfs was given */ if (symbol_conf.symfs[0 ] !=0 )
@@ -1892,28 +1911,11 @@ static int vmlinux_path__init(struct perf_env *env) kernel_version = uts.release; } -snprintf (bf,sizeof (bf),"/boot/vmlinux-%s" , kernel_version); - vmlinux_path[vmlinux_path__nr_entries] =strdup (bf); -if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) - goto out_fail; - ++vmlinux_path__nr_entries; -snprintf (bf,sizeof (bf),"/usr/lib/debug/boot/vmlinux-%s" , - kernel_version); - vmlinux_path[vmlinux_path__nr_entries] =strdup (bf); -if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) - goto out_fail; - ++vmlinux_path__nr_entries; -snprintf (bf,sizeof (bf),"/lib/modules/%s/build/vmlinux" , kernel_version); - vmlinux_path[vmlinux_path__nr_entries] =strdup (bf); -if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) - goto out_fail; - ++vmlinux_path__nr_entries; -snprintf (bf,sizeof (bf),"/usr/lib/debug/lib/modules/%s/vmlinux" , - kernel_version); - vmlinux_path[vmlinux_path__nr_entries] =strdup (bf); -if (vmlinux_path[vmlinux_path__nr_entries] ==NULL ) - goto out_fail; - ++vmlinux_path__nr_entries; +for (i =0 ; i <ARRAY_SIZE (vmlinux_paths_upd); i++) { +snprintf (bf,sizeof (bf), vmlinux_paths_upd[i], kernel_version); +if (vmlinux_path__add (bf) <0 ) + goto out_fail; + }return 0 ;
PATCH 2/2 perf: add the path to vmlinux.debug
In reply to Ekaterina TumanovaCurrently when debuginfo is separated to vmlinux.debug, it's contents get ignored. Let's change that and add it to the vmlinux_path list.
--- tools/perf/util/symbol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/perf/util/symbol.c +2 -1
@@ -1869,7 +1869,8 @@ static const char * const vmlinux_paths_upd[] = {"/boot/vmlinux-%s" ,"/usr/lib/debug/boot/vmlinux-%s" ,"/lib/modules/%s/build/vmlinux" , - "/usr/lib/debug/lib/modules/%s/vmlinux" +"/usr/lib/debug/lib/modules/%s/vmlinux" , + "/usr/lib/debug/boot/vmlinux-%s.debug" };static int vmlinux_path__update (const char *new_entry)
Signature · 1 line
2.3.9
Re: [PATCH 2/2] perf: add the path to vmlinux.debug
Quoted 5 lines · Ekaterina Tumanova
Currently when debuginfo is separated to vmlinux.debug, it's contents get ignored. Let's change that and add it to the
vmlinux_pathlist.Signed-off-by Ekaterina Tumanova <[email protected]>
thanks,
jirka
tip-bot for Ekaterina Tumanova
merge bot[tip:perf/core] perf symbols: Add the path to vmlinux.debug
In reply to Ekaterina Tumanovaperf symbols: Add the path to vmlinux.debug
Commit-ID: f55ae9540d16a355e61cb57b035aab9e1ae2da28 Gitweb: http://git.kernel.org/tip/f55ae9540d16a355e61cb57b035aab9e1ae2da28 Author: Ekaterina Tumanova <[email protected]> AuthorDate: Wed, 25 Nov 2015 17:32:46 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 26 Nov 2015 16:50:35 -0300
perf symbols: Add the path to vmlinux.debug
Currently when debuginfo is separated to vmlinux.debug, it's contents get ignored. Let's change that and add it to the vmlinux_path list.
--- tools/perf/util/symbol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/perf/util/symbol.c +2 -1
@@ -1869,7 +1869,8 @@ static const char * const vmlinux_paths_upd[] = {"/boot/vmlinux-%s" ,"/usr/lib/debug/boot/vmlinux-%s" ,"/lib/modules/%s/build/vmlinux" , - "/usr/lib/debug/lib/modules/%s/vmlinux" +"/usr/lib/debug/lib/modules/%s/vmlinux" , + "/usr/lib/debug/boot/vmlinux-%s.debug" };static int vmlinux_path__add (const char *new_entry)
Arnaldo Carvalho de Melo
maintainerEm Wed, Nov 25, 2015 at 05:32:44PM +0100, Ekaterina Tumanova escreveu:
Quoted 10 lines
These pathset improves perf processing of the paths to vmlinux files:
1. it refactors thevmlinux_path__initprocedure, to allow a simple usage in future: instead of adding several lines for every future vmlinux path, make it possible to simply add a path itself (1 line) to an array.
2. Some distibutions separate debuginfo to vmlinux.debug file. This patchset adds a path to vmlinux.debug, so that perf could use its symbols.Ekaterina Tumanova (2):
perf: Refactorvmlinux_path_init
perf: add the path to vmlinux.debug
Applied both, after renaming vmlinux_path__update() to vmlinux_path__add(), as this "adds" entries to vmlinux_path.
- Arnaldo