diff options
| author | Yabin Cui <yabinc@google.com> | 2020-10-21 13:48:53 -0700 |
|---|---|---|
| committer | Yabin Cui <yabinc@google.com> | 2020-10-28 14:16:25 -0700 |
| commit | 8d005defa48893cb58cea6cc616ddfc6cb28a216 (patch) | |
| tree | 98a90d4704c6b11cdb0d0c6b2c09459e27a1baa0 /simpleperf/command.cpp | |
| parent | 7ebc9e6cd61d5b167ccccbea85f42387370f51a7 (diff) | |
| download | extras-8d005defa48893cb58cea6cc616ddfc6cb28a216.tar.gz | |
simpleperf: Add merge cmd.
The merge cmd merges recording files. The files should be recorded in the same
environment using the same event types.
Bug: 159156784
Test: run simpleperf_unit_test.
Change-Id: I6002728246e59957235e811d4c74099961eeae4f
Diffstat (limited to 'simpleperf/command.cpp')
| -rw-r--r-- | simpleperf/command.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/simpleperf/command.cpp b/simpleperf/command.cpp index 01e659d0..d0222c0a 100644 --- a/simpleperf/command.cpp +++ b/simpleperf/command.cpp @@ -177,6 +177,7 @@ extern void RegisterHelpCommand(); extern void RegisterInjectCommand(); extern void RegisterListCommand(); extern void RegisterKmemCommand(); +extern void RegisterMergeCommand(); extern void RegisterRecordCommand(); extern void RegisterReportCommand(); extern void RegisterReportSampleCommand(); @@ -192,6 +193,7 @@ class CommandRegister { RegisterHelpCommand(); RegisterInjectCommand(); RegisterKmemCommand(); + RegisterMergeCommand(); RegisterReportCommand(); RegisterReportSampleCommand(); #if defined(__linux__) |