diff options
| author | Yabin Cui <yabinc@google.com> | 2018-07-26 12:50:08 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-26 12:50:08 -0700 |
| commit | e4575dfcaa8145cc1f5795850ebd4efedb195403 (patch) | |
| tree | 31794c32885ad2c37b22bbe525691109d9bc1f3d | |
| parent | 34928248335950fa3031ddbc93bc03268b0223e1 (diff) | |
| parent | 8d81763715bc681243955d831cc36dd2ea2998b7 (diff) | |
| download | extras-e4575dfcaa8145cc1f5795850ebd4efedb195403.tar.gz | |
Merge "simpleperf: enforce clockid support in Android Q."
am: 8d81763715
Change-Id: Iec5fb44da069fe38968ccc5e91893091e2329d89
| -rw-r--r-- | simpleperf/cmd_record_test.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/simpleperf/cmd_record_test.cpp b/simpleperf/cmd_record_test.cpp index 6cc82024..2f30df66 100644 --- a/simpleperf/cmd_record_test.cpp +++ b/simpleperf/cmd_record_test.cpp @@ -629,17 +629,16 @@ TEST(record_cmd, exit_with_parent_option) { TEST(record_cmd, clockid_option) { TEST_REQUIRE_HW_COUNTER(); - if (!IsSettingClockIdSupported()) { - ASSERT_FALSE(RunRecordCmd({"--clockid", "monotonic"})); - } else { - TemporaryFile tmpfile; - ASSERT_TRUE(RunRecordCmd({"--clockid", "monotonic"}, tmpfile.path)); - std::unique_ptr<RecordFileReader> reader = RecordFileReader::CreateInstance(tmpfile.path); - ASSERT_TRUE(reader); - std::unordered_map<std::string, std::string> info_map; - ASSERT_TRUE(reader->ReadMetaInfoFeature(&info_map)); - ASSERT_EQ(info_map["clockid"], "monotonic"); - } + // clockid is supported in kernel >= 4.1. If not supported, please cherry pick kernel patch: + // 34f439278cef7b perf: Add per event clockid support + ASSERT_TRUE(IsSettingClockIdSupported()); + TemporaryFile tmpfile; + ASSERT_TRUE(RunRecordCmd({"--clockid", "monotonic"}, tmpfile.path)); + std::unique_ptr<RecordFileReader> reader = RecordFileReader::CreateInstance(tmpfile.path); + ASSERT_TRUE(reader); + std::unordered_map<std::string, std::string> info_map; + ASSERT_TRUE(reader->ReadMetaInfoFeature(&info_map)); + ASSERT_EQ(info_map["clockid"], "monotonic"); } TEST(record_cmd, generate_samples_by_hw_counters) { |