perf map: Use strstarts() to look for Android libraries
PATCH 1/1 perf map: Use strstarts() to look for Android libraries
I took your ok to use strstarts() as an Acked-by, ok?
If nobody have any other consideration I'll keep this in my private perf/core branch for later submission,
- Arnaldo
commit 565cb8e4fb09ddee6e4d1e8112218a212c2ef54d
Author: Arnaldo Carvalho de Melo <[email protected]> Date: Mon Mar 9 16:53:41 2020 -0300
perf map: Use strstarts() to look for Android libraries
And add the '/' to avoid looking at things like "/system/libsomething", when all we want to know if it is like "/system/lib/something", i.e. if it is in that system library dir.
Using strstarts() avoids off-by-one errors like recently fixed in this file.
Since this adds the '/' I separated this patch, another patch will make this consistent by removing other strncmp(str, prefix, manually calculated prefix length) usage.
tools/perf/util/map.c +4 -4
@@ -44,8 +44,8 @@ static inline int is_no_dso_memory(const char *filename)static inline int is_android_lib (const char *filename) { -return !strncmp (filename,"/data/app-lib" ,13 ) || - !strncmp (filename,"/system/lib" ,11 ); +return strstarts (filename,"/data/app-lib/" ) || +strstarts (filename,"/system/lib/" ); }static inline bool replace_android_lib (const char *filename,char *newfilename)
@@ -65,7 +65,7 @@ static inline bool replace_android_lib(const char *filename, char *newfilename) app_abi_length =strlen (app_abi); -if (!strncmp (filename,"/data/app-lib" ,13 )) { +if (strstarts (filename,"/data/app-lib/" )) {char *apk_path;if (!app_abi_length)
@@ -89,7 +89,7 @@ static inline bool replace_android_lib(const char *filename, char *newfilename)return true; } -if (!strncmp (filename,"/system/lib/" ,12 )) { +if (strstarts (filename,"/system/lib/" )) {char *ndk, *app;const char *arch;size_t ndk_length;