perf tools: improve perf support on Android
cover perf tools: improve perf support on Android
From: Michael Lentine <[email protected]>
This short series of patches allow for the execution of perf natively on the android devices.
The following changes are implemented:
- Have cat be the default page. Android does not have less or more pager. this is a generic change which cleans up the code a bit
- Remap library paths to allow for data reporting on a linux pc with data collected from an android device.
Patches relative to tip.git.
Michael Lentine (2):
perf tools: add a fallback for pager to use cat if less does not exist. perf tools: add automatic remapping of Android libraries
tools/perf/util/map.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++- tools/perf/util/pager.c | 12 +++---- 2 files changed, 94 insertions(+), 7 deletions(-)
Signature · 1 line
1.9.1.423.g4596e3a
PATCH 1/2 perf tools: add cat as fallback pager
From: Michael Lentine <[email protected]>
This patch adds a fallback to cat for the pager. This is useful on environmnents, such as Android, where less does not exist. It is better to default to cat than to abort.
--- tools/perf/util/pager.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
tools/perf/util/pager.c +6 -6
@@ -57,13 +57,13 @@ void setup_pager(void) }if (!pager) pager =getenv ("PAGER" ); -if (!pager) { -if (!access ("/usr/bin/pager" ,X_OK )) - pager ="/usr/bin/pager" ; - } -if (!pager) +if (!(pager ||access ("/usr/bin/pager" ,X_OK ))) + pager ="/usr/bin/pager" ; +if (!(pager ||access ("/usr/bin/less" ,X_OK ))) pager ="less" ; -else if (!*pager || !strcmp (pager,"cat" )) +if (!pager) + pager ="cat" ; +if (!*pager || !strcmp (pager,"cat" ))return ; spawned_pager =1 ;/* means we are emitting to terminal */
Signature · 1 line
1.9.1.423.g4596e3a
Re: [PATCH 1/2] perf tools: add cat as fallback pager
Quoted 19 lines · Stephane Eranian
From: Michael Lentine <[email protected]>
This patch adds a fallback to cat for the pager. This is useful on environmnents, such as Android, where less does not exist. It is better to default to cat than to abort.
Reviewed-by Stephane Eranian <[email protected]>Signed-off-by Michael Lentine <[email protected]>--- tools/perf/util/pager.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)tools/perf/util/pager.c +0
-0@@ -57,13 +57,13 @@ void setup_pager(void) }if (!pager)
tools/perf/util/pager.c void setup_pager(void) · line 63
Quoted 10 lines
tools/perf/util/pager.c +3
-5pager =getenv ("PAGER" ); -if (!pager) { -if (!access ("/usr/bin/pager" ,X_OK )) - pager ="/usr/bin/pager" ; - } -if (!pager) +if (!(pager ||access ("/usr/bin/pager" ,X_OK ))) + pager ="/usr/bin/pager" ; +if (!(pager ||access ("/usr/bin/less" ,X_OK ))) pager ="less" ;
If you check for /usr/bin/less shouldn't the full path be used here?
David
PATCH 2/2 perf tools: add automatic remapping of Android libraries
In reply to Stephane EranianFrom: Michael Lentine <[email protected]>
This patch automtically adjusts the path of MMAP records associated with Android system libraries. It enables running perf reporting tools directly on the Android system natively.
--- tools/perf/util/map.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-)
tools/perf/util/map.c +88 -1
@@ -32,6 +32,86 @@ static inline int is_no_dso_memory(const char *filename) !strcmp (filename,"[heap]" ); } +static inline int is_android_lib (const char *filename) +{ +return !strncmp (filename,"/data/app-lib" ,13 ) || + !strncmp (filename,"/system/lib" ,11 ); +} + +static inline bool replace_android_lib (const char *filename,char **newfilename) +{ +const char *libname; +char *app_abi; +size_t app_abi_length, new_length; +size_t lib_length =0 ; + + libname =strrchr (filename,'/' ); +if (libname) + lib_length =strlen (libname); + + app_abi =getenv ("APP_ABI" ); +if (!app_abi) +return false; + + app_abi_length =strlen (app_abi); + +if (!strncmp (filename,"/data/app-lib" ,13 )) { +char *apk_path; + +if (!app_abi_length) +return false; + + new_length =7 + app_abi_length + lib_length; + + apk_path =getenv ("APK_PATH" ); +if (apk_path) { +snprintf (*newfilename, new_length +strlen (apk_path) +1 , +"%s/libs/%s/%s" , apk_path, app_abi, libname); + }else { +snprintf (*newfilename, new_length, +"libs/%s/%s" , app_abi, libname); + } +return true; + } + +if (!strncmp (filename,"/system/lib/" ,11 )) { +char *ndk, *app; +const char *arch; +size_t ndk_length; +size_t app_length; + + ndk =getenv ("NDK_ROOT" ); + app =getenv ("APP_PLATFORM" ); + +if (!(ndk && app)) +return false; + + ndk_length =strlen (ndk); + app_length =strlen (app); + +if (!(ndk_length && app_length && app_abi_length)) +return false; + + arch = !strncmp (app_abi,"arm" ,3 ) ?"arm" : + !strncmp (app_abi,"mips" ,4 ) ?"mips" : + !strncmp (app_abi,"x86" ,3 ) ?"x86" :NULL ; + +if (!arch) +return false; + + new_length =27 + ndk_length + + app_length + lib_length + +strlen (arch); + +snprintf (*newfilename, new_length, +"%s/platforms/%s/arch-%s/usr/lib/%s" , + ndk, app, arch, libname); + +return true; + } +return false; +} +void map__init (struct map *map,enum map_type type,u64 start,u64 end,u64 pgoff,struct dso *dso) {
@@ -59,8 +139,9 @@ struct map *map__new(struct list_head *dsos__list, u64 start, u64 len,if (map !=NULL ) {char newfilename[PATH_MAX ];struct dso *dso; -int anon, no_dso, vdso; +int anon, no_dso, vdso, android; + android =is_android_lib (filename); anon =is_anon_memory (filename); vdso =is_vdso_map (filename); no_dso =is_no_dso_memory (filename);
@@ -75,6 +156,12 @@ struct map *map__new(struct list_head *dsos__list, u64 start, u64 len, filename = newfilename; } +if (android) { +char *newfilename_ptr = newfilename; +if (replace_android_lib (filename, &newfilename_ptr)) + filename = newfilename; + } +if (vdso) { pgoff =0 ; dso =vdso__dso_findnew (dsos__list);
Signature · 1 line
1.9.1.423.g4596e3a
Re: [PATCH 2/2] perf tools: add automatic remapping of Android libraries
Quoted 5 lines · Stephane Eranian
From: Michael Lentine <[email protected]>
This patch automtically adjusts the path of MMAP records associated with Android system libraries. It enables running perf reporting tools directly on the Android system natively.
could the changelog have more info about the lib name changes?
SNIP
Quoted 7 lines
tools/perf/util/map.c +7
-0+ +if (!strncmp (filename,"/data/app-lib" ,13 )) { +char *apk_path; + +if (!app_abi_length) +return false; +
tools/perf/util/map.c static inline int is_no_dso_memory(const char *filename) · line 73
Quoted 10 lines
tools/perf/util/map.c +10
-0+ new_length =7 + app_abi_length + lib_length; + + apk_path =getenv ("APK_PATH" ); +if (apk_path) { +snprintf (*newfilename, new_length +strlen (apk_path) +1 , +"%s/libs/%s/%s" , apk_path, app_abi, libname); + }else { +snprintf (*newfilename, new_length, +"libs/%s/%s" , app_abi, libname); + }
missing check for overflowing PATH_MAX for 'new_length' and 'new_length + strlen(apk_path) + 1'
Quoted 21 lines
tools/perf/util/map.c +21
-0+return true; + } + +if (!strncmp (filename,"/system/lib/" ,11 )) { +char *ndk, *app; +const char *arch; +size_t ndk_length; +size_t app_length; + + ndk =getenv ("NDK_ROOT" ); + app =getenv ("APP_PLATFORM" ); + +if (!(ndk && app)) +return false; + + ndk_length =strlen (ndk); + app_length =strlen (app); + +if (!(ndk_length && app_length && app_abi_length)) +return false; +
tools/perf/util/map.c static inline int is_no_dso_memory(const char *filename) · line 104
Quoted 10 lines
tools/perf/util/map.c +10
-0+ arch = !strncmp (app_abi,"arm" ,3 ) ?"arm" : + !strncmp (app_abi,"mips" ,4 ) ?"mips" : + !strncmp (app_abi,"x86" ,3 ) ?"x86" :NULL ; + +if (!arch) +return false; + + new_length =27 + ndk_length + + app_length + lib_length + +strlen (arch);
missing check for overflowing PATH_MAX for 'new_length'
Quoted 10 lines
tools/perf/util/map.c +10
-0+ +snprintf (*newfilename, new_length, +"%s/platforms/%s/arch-%s/usr/lib/%s" , + ndk, app, arch, libname); + +return true; + } +return false; +} +
SNIP
tools/perf/util/map.c struct map *map__new(struct list_head *dsos__list, u64 start, u64 len, · line 162
Quoted 4 lines
tools/perf/util/map.c +4
-0+if (android) { +char *newfilename_ptr = newfilename; +if (replace_android_lib (filename, &newfilename_ptr)) + filename = newfilename;
Why is the newfilename_ptr needed? We could pass newfilename directly to replace_android_lib function
if (replace_android_lib(filename, newfilename)) filename = newfilename;
thanks,
jirka