From: Jiri Olsa <jolsa@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Michael Lentine <mlentine@google.com>,
Jiri Olsa <jolsa@kernel.org>
Subject: [PATCH 22/22] perf tools: Add automatic remapping of Android libraries
Date: Wed, 21 May 2014 15:12:44 +0200 [thread overview]
Message-ID: <1400677964-25160-23-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1400677964-25160-1-git-send-email-jolsa@kernel.org>
From: Michael Lentine <mlentine@google.com>
This patch automatically adjusts the path of MMAP records
associated with Android system libraries.
The Android system is organized with system libraries found in
/system/lib and user libraries in /data/app-lib. On the host system
(not running Android), system libraries can be found in the downloaded
NDK directory under ${NDK_ROOT}/platforms/${APP_PLATFORM}/arch-${ARCH}/usr/lib
and the user libraries are installed under libs/${APP_ABI} within
the apk build directory. This patch makes running the reporting
tools possible on the host system using the libraries from the NDK.
Signed-off-by: Michael Lentine <mlentine@google.com>
Reviewed-by: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1400579330-5043-3-git-send-email-eranian@google.com
[ fixed 'space required before the open parenthesis' checkpatch.pl errors ]
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/util/map.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 94 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index ba5f5c0c..8ccbb32 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -32,6 +32,93 @@ 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) {
+ new_length += strlen(apk_path) + 1;
+ if (new_length > PATH_MAX)
+ return false;
+ snprintf(newfilename, new_length,
+ "%s/libs/%s/%s", apk_path, app_abi, libname);
+ } else {
+ if (new_length > PATH_MAX)
+ return false;
+ 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);
+
+ if (new_length > PATH_MAX)
+ return false;
+ 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 +146,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 +163,11 @@ struct map *map__new(struct list_head *dsos__list, u64 start, u64 len,
filename = newfilename;
}
+ if (android) {
+ if (replace_android_lib(filename, newfilename))
+ filename = newfilename;
+ }
+
if (vdso) {
pgoff = 0;
dso = vdso__dso_findnew(dsos__list);
--
1.8.3.1
next prev parent reply other threads:[~2014-05-21 13:13 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-21 13:12 [GIT PULL 00/22] perf/core improvements and fixes Jiri Olsa
2014-05-21 13:12 ` [PATCH 01/22] perf tools: Add ->cmp(), ->collapse() and ->sort() to perf_hpp_fmt Jiri Olsa
2014-05-21 13:12 ` [PATCH 02/22] perf tools: Convert sort entries to hpp formats Jiri Olsa
2014-05-21 13:12 ` [PATCH 03/22] perf tools: Use hpp formats to sort hist entries Jiri Olsa
2014-05-21 13:12 ` [PATCH 04/22] perf tools: Support event grouping in hpp ->sort() Jiri Olsa
2014-05-21 13:12 ` [PATCH 05/22] perf tools: Use hpp formats to sort final output Jiri Olsa
2014-05-21 13:12 ` [PATCH 06/22] perf tools: Consolidate output field handling to hpp format routines Jiri Olsa
2014-05-21 13:12 ` [PATCH 07/22] perf ui: Get rid of callback from __hpp__fmt() Jiri Olsa
2014-05-21 13:12 ` [PATCH 08/22] perf tools: Allow hpp fields to be sort keys Jiri Olsa
2014-05-21 13:12 ` [PATCH 09/22] perf tools: Consolidate management of default sort orders Jiri Olsa
2014-05-21 13:12 ` [PATCH 10/22] perf tools: Call perf_hpp__init() before setting up GUI browsers Jiri Olsa
2014-05-21 13:12 ` [PATCH 11/22] perf report: Add -F option to specify output fields Jiri Olsa
2014-05-21 13:12 ` [PATCH 12/22] perf tools: Add ->sort() member to struct sort_entry Jiri Olsa
2014-05-21 13:12 ` [PATCH 13/22] perf report/tui: Fix a bug when --fields/sort is given Jiri Olsa
2014-05-21 13:12 ` [PATCH 14/22] perf top: Add --fields option to specify output fields Jiri Olsa
2014-05-21 13:12 ` [PATCH 15/22] perf tools: Skip elided sort entries Jiri Olsa
2014-05-21 13:12 ` [PATCH 16/22] perf hists: Reset width of output fields with header length Jiri Olsa
2014-05-21 13:12 ` [PATCH 17/22] perf tools: Get rid of obsolete hist_entry__sort_list Jiri Olsa
2014-05-21 13:12 ` [PATCH 18/22] perf tools: Introduce reset_output_field() Jiri Olsa
2014-05-21 13:12 ` [PATCH 19/22] perf tests: Factor out print_hists_*() Jiri Olsa
2014-05-21 13:12 ` [PATCH 20/22] perf tests: Add a testcase for histogram output sorting Jiri Olsa
2014-05-21 13:12 ` [PATCH 21/22] perf tools: Add cat as fallback pager Jiri Olsa
2014-05-21 13:12 ` Jiri Olsa [this message]
2014-05-22 9:38 ` [GIT PULL 00/22] perf/core improvements and fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400677964-25160-23-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mlentine@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.