summaryrefslogtreecommitdiffstats
path: root/libcutils
diff options
context:
space:
mode:
authorsergeyv <sergeyv@google.com>2016-04-30 00:07:44 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-30 00:07:44 +0000
commit4a5736c08a31be67540e2da43f55eeb942c4ae64 (patch)
treedb236dc8e0af470d1309a374e8cec9e4a648039b /libcutils
parent26ce1e1234d441dcb830986baed846ce75c72565 (diff)
parentd7dfadbd4c66a8b6f1f8e0be805c211b83e88c16 (diff)
downloadsystem_core-4a5736c08a31be67540e2da43f55eeb942c4ae64.tar.gz
system_core-4a5736c08a31be67540e2da43f55eeb942c4ae64.tar.bz2
system_core-4a5736c08a31be67540e2da43f55eeb942c4ae64.zip
Merge "atrace: read package names from multiple sysprops" into nyc-dev
am: d7dfadbd4c * commit 'd7dfadbd4c66a8b6f1f8e0be805c211b83e88c16': atrace: read package names from multiple sysprops Change-Id: I518cf650728c0d15a618ec8e40b26b2fe0385972
Diffstat (limited to 'libcutils')
-rw-r--r--libcutils/trace-dev.c21
1 files changed, 7 insertions, 14 deletions
diff --git a/libcutils/trace-dev.c b/libcutils/trace-dev.c
index 5df1c5a90..778e4f03b 100644
--- a/libcutils/trace-dev.c
+++ b/libcutils/trace-dev.c
@@ -66,24 +66,17 @@ void atrace_set_tracing_enabled(bool enabled)
// values listed in the app_cmdlines property.
static bool atrace_is_cmdline_match(const char* cmdline)
{
- char value[PROPERTY_VALUE_MAX];
- char* start = value;
-
- property_get("debug.atrace.app_cmdlines", value, "");
-
- while (start != NULL) {
- char* end = strchr(start, ',');
+ int count = property_get_int32("debug.atrace.app_number", 0);
- if (end != NULL) {
- *end = '\0';
- end++;
- }
+ char buf[PROPERTY_KEY_MAX];
+ char value[PROPERTY_VALUE_MAX];
- if (strcmp(cmdline, start) == 0) {
+ for (int i = 0; i < count; i++) {
+ snprintf(buf, sizeof(buf), "debug.atrace.app_%d", i);
+ property_get(buf, value, "");
+ if (strcmp(value, cmdline) == 0) {
return true;
}
-
- start = end;
}
return false;