OSDN Git Service

android-x86/system-extras.git
6 years agoMerge "simpleperf: exclude kernel callchains when needed." am: fb1b7608f3
Yabin Cui [Tue, 25 Jul 2017 01:18:34 +0000 (01:18 +0000)]
Merge "simpleperf: exclude kernel callchains when needed." am: fb1b7608f3
am: 889d56b701

Change-Id: Iea25fd646e01c3f684720f441ce3a0b2b169b94e

6 years agoMerge "simpleperf: exclude kernel callchains when needed."
Yabin Cui [Tue, 25 Jul 2017 01:13:13 +0000 (01:13 +0000)]
Merge "simpleperf: exclude kernel callchains when needed."
am: fb1b7608f3

Change-Id: Ibc789d4267b8185cb86fc0fdf9f2aa7c735c87ba

6 years agoMerge "simpleperf: exclude kernel callchains when needed."
Treehugger Robot [Tue, 25 Jul 2017 01:06:26 +0000 (01:06 +0000)]
Merge "simpleperf: exclude kernel callchains when needed."

6 years agosimpleperf: exclude kernel callchains when needed.
Yabin Cui [Mon, 24 Jul 2017 21:59:46 +0000 (14:59 -0700)]
simpleperf: exclude kernel callchains when needed.

Exclude kernel callchains when users only monitor events in user space.
After this change, when users use `record -e cpu-cycles:u --trace-offcpu`,
the samples of the implicitly added sched:sched_switch event won't contain
any kernel callchain.

Bug: http://b/37572306
Test: run simpleperf_unit_test.
Change-Id: Iffcb61bac796e734825e68f847f24b4006b44360

6 years agoMerge "Track google-benchmark API change." am: 239663cf97
Elliott Hughes [Sat, 22 Jul 2017 01:20:22 +0000 (01:20 +0000)]
Merge "Track google-benchmark API change." am: 239663cf97
am: e2feba2535

Change-Id: Ifc6f0f80dede21c6d919df0c25eb47c7fa124add

6 years agoMerge "simpleperf: adjust sample freq instead of checking it." am: 6dd50e65b7
Yabin Cui [Sat, 22 Jul 2017 01:20:05 +0000 (01:20 +0000)]
Merge "simpleperf: adjust sample freq instead of checking it." am: 6dd50e65b7
am: 3777a2d811

Change-Id: I46a0b2cea0d7ab2d64336e1fdbebfa9111393607

6 years agoMerge "Track google-benchmark API change."
Elliott Hughes [Sat, 22 Jul 2017 01:18:47 +0000 (01:18 +0000)]
Merge "Track google-benchmark API change."
am: 239663cf97

Change-Id: Id43e42b2f5fbf58c32b5d70b00e5671d7e244914

6 years agoMerge "simpleperf: adjust sample freq instead of checking it."
Yabin Cui [Sat, 22 Jul 2017 01:18:37 +0000 (01:18 +0000)]
Merge "simpleperf: adjust sample freq instead of checking it."
am: 6dd50e65b7

Change-Id: Id445154d4530b9d4a9c3d237a21e3da6f16612e2

6 years agoMerge "Track google-benchmark API change."
Treehugger Robot [Sat, 22 Jul 2017 01:14:59 +0000 (01:14 +0000)]
Merge "Track google-benchmark API change."

6 years agoMerge "simpleperf: adjust sample freq instead of checking it."
Treehugger Robot [Sat, 22 Jul 2017 01:12:16 +0000 (01:12 +0000)]
Merge "simpleperf: adjust sample freq instead of checking it."

6 years agoMerge "simpleperf: add tests for scripts." am: 07fb9f29fa
Yabin Cui [Sat, 22 Jul 2017 01:03:15 +0000 (01:03 +0000)]
Merge "simpleperf: add tests for scripts." am: 07fb9f29fa
am: a158d70c84

Change-Id: Icd2e7fed64ba89db1549215b7a976fde56252dec

6 years agoMerge "simpleperf: add tests for scripts."
Yabin Cui [Sat, 22 Jul 2017 01:00:48 +0000 (01:00 +0000)]
Merge "simpleperf: add tests for scripts."
am: 07fb9f29fa

Change-Id: Ia42dfd2f4981dd735bc2846743969aabf7d24bf9

6 years agoMerge "simpleperf: add tests for scripts."
Treehugger Robot [Sat, 22 Jul 2017 00:52:19 +0000 (00:52 +0000)]
Merge "simpleperf: add tests for scripts."

6 years agoMerge "simpleperf: support tracing offcpu time." am: 8f4bd93ba0
Yabin Cui [Sat, 22 Jul 2017 00:33:32 +0000 (00:33 +0000)]
Merge "simpleperf: support tracing offcpu time." am: 8f4bd93ba0
am: 5c8e262829

Change-Id: I10380a7b1f5538fe78e71ff4e2ce405d4121d48a

6 years agoMerge "simpleperf: support tracing offcpu time."
Yabin Cui [Sat, 22 Jul 2017 00:31:33 +0000 (00:31 +0000)]
Merge "simpleperf: support tracing offcpu time."
am: 8f4bd93ba0

Change-Id: Ia9faf209a1ae74cc920c945125f7e3a368372b44

6 years agoMerge "simpleperf: support tracing offcpu time."
Treehugger Robot [Sat, 22 Jul 2017 00:25:56 +0000 (00:25 +0000)]
Merge "simpleperf: support tracing offcpu time."

6 years agoTrack google-benchmark API change.
Elliott Hughes [Fri, 21 Jul 2017 23:19:55 +0000 (16:19 -0700)]
Track google-benchmark API change.

Bug: N/A
Test: builds
Change-Id: I55e43db662c834da52dbc8de522ee6ccbd3f8b5e

6 years agosimpleperf: adjust sample freq instead of checking it.
Yabin Cui [Fri, 21 Jul 2017 22:52:26 +0000 (15:52 -0700)]
simpleperf: adjust sample freq instead of checking it.

Linux kernel introduces methods to adjust max sample rate
based on load with patch "perf: Drop sample rate when sampling is too slow".
It is annoying if the first time recording with -f xxx option successes,
but following runs fail because the max sample rate is decreased.
So instead of checking if sample_freq <= max_sample_rate, I prefer to
change it to adjust sample_freq in range of [1, max_sample_rate].

Test: run simpleperf_unit_test.
Change-Id: Ic2e93b7fb861c704a4aa8199d08b5b0650db2c23

6 years agosimpleperf: support tracing offcpu time.
Yabin Cui [Thu, 20 Jul 2017 00:54:57 +0000 (17:54 -0700)]
simpleperf: support tracing offcpu time.

1. Add --trace-offcpu option in record command, to record the callstack
when a thread is scheduled off cpu.
2. Change the report command to report time spent not running on cpu
when --trace-offcpu option is used for recording.
3. Add related unittests and runtests.

Bug: http://b/37572306
Test: run simpleperf_unit_test.

Change-Id: Ia50cc39c8dde0c8fb1b1facbcb26bbd0a7ab1351

6 years agoMerge "Add swapPSS support to showmap" am: c8deb72c58
Mathieu Chartier [Fri, 21 Jul 2017 22:22:54 +0000 (22:22 +0000)]
Merge "Add swapPSS support to showmap" am: c8deb72c58
am: a9a1e59a84

Change-Id: I4c2e16d288444245954e5717ff10b9dce75c7c60

6 years agoMerge "Add swapPSS support to showmap"
Mathieu Chartier [Fri, 21 Jul 2017 22:20:26 +0000 (22:20 +0000)]
Merge "Add swapPSS support to showmap"
am: c8deb72c58

Change-Id: I3632cb067501be2061af1c7a0f60f4cd5efb91fd

6 years agoMerge "Add swapPSS support to showmap"
Treehugger Robot [Fri, 21 Jul 2017 22:14:54 +0000 (22:14 +0000)]
Merge "Add swapPSS support to showmap"

6 years agosimpleperf: add tests for scripts.
Yabin Cui [Tue, 18 Jul 2017 01:08:57 +0000 (18:08 -0700)]
simpleperf: add tests for scripts.

Also adjust scripts based on test results:
1. Use `pidof` in app_profiler.py.
2. Improve the way finding source files in annotate.py.
3. Change report.py to be a python wrapper of simpleperf report command,
   so users don't need to find different simpleperf binaries for different platforms.
4. Change README.md accordingly.

Bug: http://b/63006886
Test: run test.py on all platforms.

Change-Id: I00b098a1c72824226e509d7b1e5405c7cc43b856

6 years agoAdd swapPSS support to showmap
Mathieu Chartier [Fri, 21 Jul 2017 19:08:14 +0000 (12:08 -0700)]
Add swapPSS support to showmap

The swap column in showmap is sometimes misleading since it is total
swap and not proportional. Shared dirty RAM is often shared swap with
the zygote and other processes.

Added a swapPSS column to the showmap output that shows the swapPss
which is proportional swap usage (from smaps).

Test: looked at showmap for a device that is swapping
Bug: 36457259

Change-Id: If43d39354d53f6cfc2c7681ce294e2729c638876

6 years agoMerge changes from topic 'mke2fs_2' am: 6f998b3e59
Jin Qian [Fri, 21 Jul 2017 19:10:43 +0000 (19:10 +0000)]
Merge changes from topic 'mke2fs_2' am: 6f998b3e59
am: a05b989ff4

Change-Id: I933147222ff66d7d9ab90e105541eb7711bf708c

6 years agoext4_utils: copy mke2fs.conf to recovery /etc am: e4d07364c5
Jin Qian [Fri, 21 Jul 2017 19:10:39 +0000 (19:10 +0000)]
ext4_utils: copy mke2fs.conf to recovery /etc am: e4d07364c5
am: fb0ddb227c

Change-Id: I73aaa645c9e8deed5ac810ba17bcaa9ccb9ca546

6 years agoMerge changes from topic 'mke2fs_2'
Jin Qian [Fri, 21 Jul 2017 19:06:43 +0000 (19:06 +0000)]
Merge changes from topic 'mke2fs_2'
am: 6f998b3e59

Change-Id: Ib65dfb01e37a2b334023df2cbf75363015ea041a

6 years agoext4_utils: copy mke2fs.conf to recovery /etc
Jin Qian [Fri, 21 Jul 2017 19:06:23 +0000 (19:06 +0000)]
ext4_utils: copy mke2fs.conf to recovery /etc
am: e4d07364c5

Change-Id: I098a285f42b1cc5bb8048d5c71014764cfec1113

6 years agoMerge changes from topic 'mke2fs_2'
Treehugger Robot [Fri, 21 Jul 2017 19:00:46 +0000 (19:00 +0000)]
Merge changes from topic 'mke2fs_2'

* changes:
  ext4_utils: copy mke2fs.conf to /etc
  ext4_utils: copy mke2fs.conf to recovery /etc

6 years agoext4_utils: copy mke2fs.conf to /etc
Jin Qian [Wed, 7 Jun 2017 18:32:16 +0000 (11:32 -0700)]
ext4_utils: copy mke2fs.conf to /etc

mke2fs tool reads /etc/mke2fs.conf for filesystem configurations

Bug: 35219933
Change-Id: I2af633ffd3b37f9f5ad287375ea40b212bf61a01
(cherry picked from commit a5950e562e89ac2c110070993a93ae3f8503fe37)

6 years agoext4_utils: copy mke2fs.conf to recovery /etc
Jin Qian [Thu, 8 Jun 2017 00:52:27 +0000 (17:52 -0700)]
ext4_utils: copy mke2fs.conf to recovery /etc

Bug: 35219933
Change-Id: I9af35a32adde24d751e5b11f9efcf6eca252db74
(cherry picked from commit 4fb76ecad69f85921f0c0ffb03f4559db898aba2)

6 years agoMerge "simpleperf: update simpleperf prebuilts to build 4194070." am: c35e698dfc
Yabin Cui [Thu, 20 Jul 2017 01:12:03 +0000 (01:12 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build 4194070." am: c35e698dfc
am: 1e197ca08a

Change-Id: If0fc6655bc2ff0fd86230e226f66868c744be9fd

6 years agoMerge "simpleperf: update simpleperf prebuilts to build 4194070."
Yabin Cui [Thu, 20 Jul 2017 01:09:33 +0000 (01:09 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build 4194070."
am: c35e698dfc

Change-Id: I8b638b8c61e89bb4e69fd3595761216de816cd9b

6 years agoMerge "simpleperf: update simpleperf prebuilts to build 4194070."
Yabin Cui [Thu, 20 Jul 2017 00:58:44 +0000 (00:58 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build 4194070."

7 years agosimpleperf: update simpleperf prebuilts to build 4194070.
Yabin Cui [Wed, 19 Jul 2017 17:11:45 +0000 (10:11 -0700)]
simpleperf: update simpleperf prebuilts to build 4194070.

Taken from branch aosp-master.

Test: None.

Change-Id: Ie060ccd602cec70a1bae1c6bbca85f0d045606ac

7 years agoMerge "simpleperf: add test for dumping regs for tracepoint events." am: 87fcb8c6c1
Yabin Cui [Tue, 18 Jul 2017 02:50:34 +0000 (02:50 +0000)]
Merge "simpleperf: add test for dumping regs for tracepoint events." am: 87fcb8c6c1
am: eb21435bf2

Change-Id: Ib0e0fa4ff6b5e8451ca69fa6b27aed14229222ab

7 years agoMerge "simpleperf: add test for dumping regs for tracepoint events."
Yabin Cui [Tue, 18 Jul 2017 02:48:06 +0000 (02:48 +0000)]
Merge "simpleperf: add test for dumping regs for tracepoint events."
am: 87fcb8c6c1

Change-Id: If27da0ebd6cc1a25bb0f44b9ce8b80ed1ff5c60f

7 years agoMerge "simpleperf: add test for dumping regs for tracepoint events."
Treehugger Robot [Tue, 18 Jul 2017 02:44:41 +0000 (02:44 +0000)]
Merge "simpleperf: add test for dumping regs for tracepoint events."

7 years agosimpleperf: add test for dumping regs for tracepoint events.
Yabin Cui [Mon, 17 Jul 2017 21:36:37 +0000 (14:36 -0700)]
simpleperf: add test for dumping regs for tracepoint events.

If the test fails, probably a kernel patch is missing:
5b09a094f2 arm64: perf: Fix callchain parse error with kernel tracepoint events

To support the test, also enable recording tracepoint events in
app's context.

Bug: http://b/29520177
Test: run CtsSimpleperfTestCases64 on devices.

Change-Id: I085114113732366305e92f6a1e6c3b6efc6ff5ff

7 years agoMerge "Add event monitoring to Inferno." am: 945911cbae
Fabien Sanglard [Mon, 17 Jul 2017 18:45:32 +0000 (18:45 +0000)]
Merge "Add event monitoring to Inferno." am: 945911cbae
am: 878c04ed7d

Change-Id: I382e276fbd8c045732c7c4cdde0ff478993484e8

7 years agoMerge "Add event monitoring to Inferno."
Fabien Sanglard [Mon, 17 Jul 2017 18:43:03 +0000 (18:43 +0000)]
Merge "Add event monitoring to Inferno."
am: 945911cbae

Change-Id: I93d6d92ef1fab873c9144d70b271b61c26694930

7 years agoMerge "Add event monitoring to Inferno."
Treehugger Robot [Mon, 17 Jul 2017 18:35:22 +0000 (18:35 +0000)]
Merge "Add event monitoring to Inferno."

7 years agoMerge "simpleperf: replace config file with cmdline options." am: e5ad887a62
Yabin Cui [Mon, 17 Jul 2017 18:23:29 +0000 (18:23 +0000)]
Merge "simpleperf: replace config file with cmdline options." am: e5ad887a62
am: 271a040687

Change-Id: Ieb735fa3f8ecbcc8a037e114faecd94ad73e6748

7 years agoMerge "simpleperf: replace config file with cmdline options."
Yabin Cui [Mon, 17 Jul 2017 18:21:31 +0000 (18:21 +0000)]
Merge "simpleperf: replace config file with cmdline options."
am: e5ad887a62

Change-Id: I71c585b603dff3c762512f7b88209ed8d2bbedbe

7 years agoMerge "simpleperf: replace config file with cmdline options."
Yabin Cui [Mon, 17 Jul 2017 18:13:28 +0000 (18:13 +0000)]
Merge "simpleperf: replace config file with cmdline options."

7 years agoMerge "simpleperf: change the way running cts tests." am: 9bc17045b0
Yabin Cui [Sat, 15 Jul 2017 05:29:25 +0000 (05:29 +0000)]
Merge "simpleperf: change the way running cts tests." am: 9bc17045b0
am: 36caf047e2

Change-Id: I3ffbac68c35a641a263eb9047d14c96cb36ee196

7 years agoMerge "simpleperf: change the way running cts tests."
Yabin Cui [Sat, 15 Jul 2017 05:24:27 +0000 (05:24 +0000)]
Merge "simpleperf: change the way running cts tests."
am: 9bc17045b0

Change-Id: Ib026e6cf03cbde6a943ac14a1f085ddea83207cd

7 years agoMerge "simpleperf: change the way running cts tests."
Treehugger Robot [Sat, 15 Jul 2017 05:18:31 +0000 (05:18 +0000)]
Merge "simpleperf: change the way running cts tests."

7 years agosimpleperf: change the way running cts tests.
Yabin Cui [Fri, 14 Jul 2017 22:59:56 +0000 (15:59 -0700)]
simpleperf: change the way running cts tests.

Before this CL, CtsSimpleperfTestCases copies itself to the app's
directory, then run it using run-as.

With this CL, CtsSimpleperfTestCases keeps itself in /data/local/tmp,
but forces stat/record cmd to run with --app option. This gives
more freedom to tests:
1. They can stay in shell's context with --in-app option.
2. The stat/record cmds are started in the shell's context, so
they can collect information no available in app's context (like
data in /sys/kernel/debug/tracing/events).

This is a preparation to add tests for recording tracepoint events.
It also matches the way we want users to use simpleperf (with --app option).

Bug: http://b/29520177
Test: run CtsSimpleperfTestCases.

Change-Id: I1709adfb1ff7169df87560226c197e473fdf8516

7 years agosimpleperf: replace config file with cmdline options.
Yabin Cui [Thu, 13 Jul 2017 21:49:42 +0000 (14:49 -0700)]
simpleperf: replace config file with cmdline options.

1. For binary_cache_builder.py, annoate.py and pprof_proto_generator.py,
there are only a few options, use a config file seems overkill, so
replace them with cmdline options.

2. Add cmdline interface for app_profiler.py. It is to simplify usage,
and can be called from tests (will be added).

3. Simplify the way to find tools (including adb,readelf,addr2line),
try to find them in default install location of sdk and ndk. And output
error/warning msg if not found.

4. Raise exception in python are not always helpful for users to find
problems, because the error msg is hidden by exception stack dump. So
replace some log_fatal() with log_exit().

5. Change README.md accordingly.

Bug: http://b/32834638
Test: run scripts manually.

Change-Id: Ic60e496edbe748b801d35144da29f40c3db3e250

7 years agoMerge "simpleperf: support "--app" option in record/stat command." am: 9aa1dc2f30
Yabin Cui [Fri, 14 Jul 2017 23:42:35 +0000 (23:42 +0000)]
Merge "simpleperf: support "--app" option in record/stat command." am: 9aa1dc2f30
am: 44139af1f4

Change-Id: I4f152fe72dc5ffea7995dddd85f115d21f72acb1

7 years agoMerge "simpleperf: support "--app" option in record/stat command."
Yabin Cui [Fri, 14 Jul 2017 23:38:33 +0000 (23:38 +0000)]
Merge "simpleperf: support "--app" option in record/stat command."
am: 9aa1dc2f30

Change-Id: I4ca9cac0a3400f59d8e66fdeb1b68af2a62e7f98

7 years agoMerge "simpleperf: support "--app" option in record/stat command."
Treehugger Robot [Fri, 14 Jul 2017 23:32:35 +0000 (23:32 +0000)]
Merge "simpleperf: support "--app" option in record/stat command."

7 years agoMerge changes from topic 'ext4_encryption_flag' am: 7ce805c97e
Tom Cherry [Fri, 14 Jul 2017 23:14:15 +0000 (23:14 +0000)]
Merge changes from topic 'ext4_encryption_flag' am: 7ce805c97e
am: 4e02dcd7d0

Change-Id: I562edcdf7fb0c8b84edfaf400702ce17d528c817

7 years agoext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT am: 1468fbabdd
Eric Biggers [Fri, 14 Jul 2017 23:14:11 +0000 (23:14 +0000)]
ext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT am: 1468fbabdd
am: de07b52713

Change-Id: I963381be3204e283381d41a79f608561f7195d44

7 years agoMerge changes from topic 'ext4_encryption_flag'
Tom Cherry [Fri, 14 Jul 2017 23:12:05 +0000 (23:12 +0000)]
Merge changes from topic 'ext4_encryption_flag'
am: 7ce805c97e

Change-Id: I11917818efdc536b35832116b4bafc7ecbaa29c7

7 years agoext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT
Eric Biggers [Fri, 14 Jul 2017 23:11:55 +0000 (23:11 +0000)]
ext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT
am: 1468fbabdd

Change-Id: I898cae635e00f2a01893b3d23b7c77f14fff684e

7 years agoMerge changes from topic 'ext4_encryption_flag'
Tom Cherry [Fri, 14 Jul 2017 23:06:30 +0000 (23:06 +0000)]
Merge changes from topic 'ext4_encryption_flag'

* changes:
  ext4_sb.h: make feature flags in fs_info 32-bit
  ext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT

7 years agosimpleperf: support "--app" option in record/stat command.
Yabin Cui [Wed, 12 Jul 2017 22:50:20 +0000 (15:50 -0700)]
simpleperf: support "--app" option in record/stat command.

By using --app [package_name] option, users don't need to
manually run run-as or look for the app's process.
It is also good for profiling app startup time.

For simpleperf, it now can start in the shell's context,
and be able to get tracing events information, which can
support profiling tracepoint events for apps. This is
useful for monitoring thread sleep time.

This CL is tested manually, but I will change the
way of running simpleperf cts test to test this.

Bug: http://b/34108866
Test: test manually.

Change-Id: I8db0390af8e49c56dc4860374153f753bbcf9b11

7 years agoAdd event monitoring to Inferno.
Fabien Sanglard [Thu, 13 Jul 2017 17:56:24 +0000 (10:56 -0700)]
Add event monitoring to Inferno.

Change-Id: Ifd695d3b13b0da74c1e87e05c89ceee1101fa22a

7 years agoMerge "Inferno: A framegrapher based on simpleperf" am: af30023228
Fabien Sanglard [Thu, 13 Jul 2017 16:52:33 +0000 (16:52 +0000)]
Merge "Inferno: A framegrapher based on simpleperf" am: af30023228
am: d8f0a1eb93

Change-Id: I595ef7ed445cd973d413ac8f712d4ff8b67fff14

7 years agoMerge "Inferno: A framegrapher based on simpleperf"
Fabien Sanglard [Thu, 13 Jul 2017 16:49:33 +0000 (16:49 +0000)]
Merge "Inferno: A framegrapher based on simpleperf"
am: af30023228

Change-Id: I9b8ca44ac7ffa79870fa40c7c52bfd60d1259413

7 years agoMerge "Inferno: A framegrapher based on simpleperf"
Fabien Sanglard [Thu, 13 Jul 2017 16:46:21 +0000 (16:46 +0000)]
Merge "Inferno: A framegrapher based on simpleperf"

7 years agoMerge "os-release.d: set the default version to four numbers." am: 80e0678406
Sen Jiang [Thu, 13 Jul 2017 05:52:53 +0000 (05:52 +0000)]
Merge "os-release.d: set the default version to four numbers." am: 80e0678406
am: 65f9088af1

Change-Id: I44152b354f0b872ef5b0c54bf4ac13496742cfbc

7 years agoMerge "os-release.d: set the default version to four numbers."
Sen Jiang [Thu, 13 Jul 2017 05:50:57 +0000 (05:50 +0000)]
Merge "os-release.d: set the default version to four numbers."
am: 80e0678406

Change-Id: Id75fbf587b59623b8c4ced6f108f880724362210

7 years agoMerge "os-release.d: set the default version to four numbers."
Treehugger Robot [Thu, 13 Jul 2017 05:46:38 +0000 (05:46 +0000)]
Merge "os-release.d: set the default version to four numbers."

7 years agoMerge "simpleperf: add test for recording cpu-clock." am: 9dc8dd6de2
Yabin Cui [Thu, 13 Jul 2017 01:35:10 +0000 (01:35 +0000)]
Merge "simpleperf: add test for recording cpu-clock." am: 9dc8dd6de2
am: 4f5d2f4357

Change-Id: Ifffef0768bfce6ae932f23d40c6d2c2bdb58d6c6

7 years agoMerge "simpleperf: add test for recording cpu-clock."
Yabin Cui [Thu, 13 Jul 2017 01:33:11 +0000 (01:33 +0000)]
Merge "simpleperf: add test for recording cpu-clock."
am: 9dc8dd6de2

Change-Id: I94a66720ceeeb0b95eca5eadb8fd529f5744d931

7 years agoMerge "simpleperf: add test for recording cpu-clock."
Treehugger Robot [Thu, 13 Jul 2017 01:30:30 +0000 (01:30 +0000)]
Merge "simpleperf: add test for recording cpu-clock."

7 years agoos-release.d: set the default version to four numbers.
Sen Jiang [Tue, 4 Apr 2017 20:24:56 +0000 (13:24 -0700)]
os-release.d: set the default version to four numbers.

We will report system_version and product_version separately to Omaha,
so revert back to using four numbers for version.

Test: cat $OUT/system/etc/os-release.d/system_version
Change-Id: Ife69a7a17d1a06cc9127540cb39f27ce4fd0c944
(cherry picked from commit d454042d764713ead2b87b78f4d2292d2d422d45)

7 years agoInferno: A framegrapher based on simpleperf
Fabien Sanglard [Wed, 28 Jun 2017 20:18:52 +0000 (13:18 -0700)]
Inferno: A framegrapher based on simpleperf

Inferno generates flamegraph for an entire process in one click.
The HTML report is automatically opened in the machine browser.

To run it on surfaceflinger, start UIBench to generate load and:
 - ./inferno.sh (Linux/MacOS)
 - ./inferno.bat (Windows)

See report.html for a sample report.

Change-Id: I35a20fcfe4b385dbf45832bef0ff69b80a44e1d6

7 years agoMerge "simpleperf: enforce support of dwarf based callgraph." am: 1564048fd3
Yabin Cui [Thu, 13 Jul 2017 00:46:37 +0000 (00:46 +0000)]
Merge "simpleperf: enforce support of dwarf based callgraph." am: 1564048fd3
am: 63d9e48597

Change-Id: I281bc4465071c642bad981196ab993c5b61bbf4c

7 years agoMerge "simpleperf: enforce support of dwarf based callgraph."
Yabin Cui [Thu, 13 Jul 2017 00:44:42 +0000 (00:44 +0000)]
Merge "simpleperf: enforce support of dwarf based callgraph."
am: 1564048fd3

Change-Id: I8fea0476d4e95ba9fa807760f2cf7e61b82a4c40

7 years agoMerge "simpleperf: enforce support of dwarf based callgraph."
Yabin Cui [Thu, 13 Jul 2017 00:42:36 +0000 (00:42 +0000)]
Merge "simpleperf: enforce support of dwarf based callgraph."

7 years agosimpleperf: enforce support of dwarf based callgraph.
Yabin Cui [Wed, 12 Jul 2017 21:50:07 +0000 (14:50 -0700)]
simpleperf: enforce support of dwarf based callgraph.

If it is not supported by the kernel, it may be because
a kernel patch "perf: Fix arch_perf_out_copy_user default",
or a configuration HAVE_PERF_USER_STACK_DUMP is missing.

Bug: http://b/63634097
Test: run simpleperf_unit_tests.
Change-Id: I4d3b2de72925c3566bcb0ebe41872919b7312687

7 years agosimpleperf: add test for recording cpu-clock.
Yabin Cui [Wed, 12 Jul 2017 21:25:46 +0000 (14:25 -0700)]
simpleperf: add test for recording cpu-clock.

Bug: http://b/63135835
Test: run the test on marlin.
Change-Id: I5b51eaafb596dc7df886b59b5ea208ae9c2c739a

7 years agoext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT
Eric Biggers [Mon, 15 May 2017 21:19:24 +0000 (14:19 -0700)]
ext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT

fs_mgr needs to know the value of the encrypt feature flag (added to
ext4 in upstream kernel v4.1) so it can enable it.

Bug: 36231741
Change-Id: I7475ea8424fa5a2c4712634eada3095e938e97e3

7 years agoext4_sb.h: make feature flags in fs_info 32-bit
Eric Biggers [Thu, 6 Jul 2017 19:44:40 +0000 (12:44 -0700)]
ext4_sb.h: make feature flags in fs_info 32-bit

The feature flag fields in the ext4 superblock are 32-bit, so they
should be 32-bit in fs_info too.

Bug: 36231741
Change-Id: I719953ac389d1c7f503db0b669c2815c44807f9f

7 years agoMerge "kernel.config: check console-ramoops-0" am: 3cd4b5a765
Mark Salyzyn [Wed, 28 Jun 2017 14:26:04 +0000 (14:26 +0000)]
Merge "kernel.config: check console-ramoops-0" am: 3cd4b5a765
am: 66a4b1bd79

Change-Id: I817d00383d64cf5f4a4562f66f330f0a95fe8e28

7 years agoMerge "kernel.config: check console-ramoops-0"
Mark Salyzyn [Wed, 28 Jun 2017 14:22:34 +0000 (14:22 +0000)]
Merge "kernel.config: check console-ramoops-0"
am: 3cd4b5a765

Change-Id: I6972df5357f71ffcda97cdcbacaba8aa4eb726e1

7 years agoMerge "kernel.config: check console-ramoops-0"
Treehugger Robot [Wed, 28 Jun 2017 14:19:03 +0000 (14:19 +0000)]
Merge "kernel.config: check console-ramoops-0"

7 years agoMerge "simpleperf: add demo for kotlin." am: d39db9b0f5
Yabin Cui [Tue, 27 Jun 2017 21:32:00 +0000 (21:32 +0000)]
Merge "simpleperf: add demo for kotlin." am: d39db9b0f5
am: 1e391c4bad

Change-Id: I8d7df6cc72bd42078a44b9c823cf1de3ec5a38cf

7 years agoMerge "simpleperf: add demo for kotlin."
Yabin Cui [Tue, 27 Jun 2017 21:28:31 +0000 (21:28 +0000)]
Merge "simpleperf: add demo for kotlin."
am: d39db9b0f5

Change-Id: Ie469016cf1d336ac2c88a0522c7913aee8d26ec1

7 years agokernel.config: check console-ramoops-0
Mark Salyzyn [Tue, 27 Jun 2017 16:36:52 +0000 (09:36 -0700)]
kernel.config: check console-ramoops-0

On later kernels /sys/fs/pstore/console-ramoops becomes
/sys/fs/pstore/console-ramoops-0. One or the other is
present, but not both.

Test: none
Bug: 63058217
Change-Id: I4b54cfdd9f347735ccd2debd08a1baa167c9a24f

7 years agoMerge "simpleperf: add demo for kotlin."
Yabin Cui [Tue, 27 Jun 2017 21:20:39 +0000 (21:20 +0000)]
Merge "simpleperf: add demo for kotlin."

7 years agosimpleperf: add demo for kotlin.
Yabin Cui [Tue, 27 Jun 2017 01:40:36 +0000 (18:40 -0700)]
simpleperf: add demo for kotlin.

And fix annotate.py to include kotlin source code.

Bug: http://b/32834638
Test: profile the app on bullhead and marlin using scripts manually.
Change-Id: Ic812cd2f8db7d047ceac58e3f5ae6a3f19e1879f

7 years agoMerge "use f2fs upstream host to generate image" am: 6a9444152f
Jin Qian [Mon, 26 Jun 2017 19:29:24 +0000 (19:29 +0000)]
Merge "use f2fs upstream host to generate image" am: 6a9444152f
am: 7c17f07be9

Change-Id: I85a4c546c1091be681a3222ac50cfb98f314d0cb

7 years agoMerge "use f2fs upstream host to generate image"
Jin Qian [Mon, 26 Jun 2017 19:23:47 +0000 (19:23 +0000)]
Merge "use f2fs upstream host to generate image"
am: 6a9444152f

Change-Id: I74846499dfc5e9c7058571353b442e90fd0ac998

7 years agoMerge "use f2fs upstream host to generate image"
Jin Qian [Mon, 26 Jun 2017 19:07:49 +0000 (19:07 +0000)]
Merge "use f2fs upstream host to generate image"

7 years agouse f2fs upstream host to generate image
Yang Jin [Thu, 22 Jun 2017 18:20:51 +0000 (11:20 -0700)]
use f2fs upstream host to generate image

calls make_f2fs -S <size> <filename>

Test: ./mkf2fsuserimg.sh ~/android/userdata.img 2000000000
Bug: 62493641
Change-Id: I4d3631a631fbdfbfc680eeba5f2a1dde204cba25
Merged-In: I4d3631a631fbdfbfc680eeba5f2a1dde204cba25

7 years agoMerge "simpleperf: fix the way to pull perf.data on windows." am: 7c8b89acad
Yabin Cui [Fri, 23 Jun 2017 21:48:16 +0000 (21:48 +0000)]
Merge "simpleperf: fix the way to pull perf.data on windows." am: 7c8b89acad
am: cac9fc0914

Change-Id: I2fe3a27759180ee49de41fe24d00b7645e007790

7 years agoMerge "simpleperf: fix the way to pull perf.data on windows."
Yabin Cui [Fri, 23 Jun 2017 21:43:14 +0000 (21:43 +0000)]
Merge "simpleperf: fix the way to pull perf.data on windows."
am: 7c8b89acad

Change-Id: I0978ba64f16c964a8b3a54f892eefb11ce6d80ad

7 years agoMerge "simpleperf: fix the way to pull perf.data on windows."
Yabin Cui [Fri, 23 Jun 2017 21:38:34 +0000 (21:38 +0000)]
Merge "simpleperf: fix the way to pull perf.data on windows."

7 years agosimpleperf: fix the way to pull perf.data on windows.
Yabin Cui [Wed, 21 Jun 2017 22:57:31 +0000 (15:57 -0700)]
simpleperf: fix the way to pull perf.data on windows.

Bug: http://b/32834638
Test: run app_profiler.py on linux/darwin/windows.
Change-Id: Id932ad7d0a21598eae7d844e6c33c6e64df22c5a

7 years agoMerge "simpleperf: fix x86 register dump on x86_64." am: 5abacf3bcf
Yabin Cui [Thu, 22 Jun 2017 22:06:57 +0000 (22:06 +0000)]
Merge "simpleperf: fix x86 register dump on x86_64." am: 5abacf3bcf
am: 1815f49dee

Change-Id: Ic4eac31d6bde6001e6beb5664b28de25bce3c96c

7 years agoMerge "simpleperf: fix x86 register dump on x86_64."
Yabin Cui [Thu, 22 Jun 2017 22:02:57 +0000 (22:02 +0000)]
Merge "simpleperf: fix x86 register dump on x86_64."
am: 5abacf3bcf

Change-Id: I988fca28fd873575d6bfb2b542d91b5eecb29f7b

7 years agoMerge "simpleperf: fix x86 register dump on x86_64."
Yabin Cui [Thu, 22 Jun 2017 21:58:47 +0000 (21:58 +0000)]
Merge "simpleperf: fix x86 register dump on x86_64."

7 years agosimpleperf: fix x86 register dump on x86_64.
Yabin Cui [Thu, 22 Jun 2017 20:02:29 +0000 (13:02 -0700)]
simpleperf: fix x86 register dump on x86_64.

x86_64 linux kernel doesn't support dumping registers like DS.
If simpleperf32 requests dumping these registers, it will fail.
So don't request them to avoid failure.

Bug: None.
Test: run simpleperf32 manually on x86_64.
Change-Id: I220ce5378bad8f0c3c9deb2ef32128fd3262b96d

7 years agoMerge "simpleperf: Support Ctrl-C in app_profiler.py." am: 7941d1917b
Yabin Cui [Thu, 22 Jun 2017 19:14:52 +0000 (19:14 +0000)]
Merge "simpleperf: Support Ctrl-C in app_profiler.py." am: 7941d1917b
am: c1a5f290f6

Change-Id: I2328a2844cccfe1db5db44a824374b44122d888f

7 years agoMerge "simpleperf: Support Ctrl-C in app_profiler.py."
Yabin Cui [Thu, 22 Jun 2017 19:10:29 +0000 (19:10 +0000)]
Merge "simpleperf: Support Ctrl-C in app_profiler.py."
am: 7941d1917b

Change-Id: If56fea0daa9fd9e3022dd19ad08b41e96c3e8b51