Merge "simpleperf: fix an error in checking monitored targets." am: 264b69316c am: 4801c5f9af am: ff836c2652

am: e254ac7919

Change-Id: I688978bb05b6361edabfe040ee134c3d0e9f4e2a

2 files changed, 12 insertions, 1 deletions

diff --git a/simpleperf/cmd_record_test.cpp b/simpleperf/cmd_record_test.cpp
index 35e871fe..c3fb8f26 100644
--- a/simpleperf/cmd_record_test.cpp
+++ b/simpleperf/cmd_record_test.cpp
@@ -385,3 +385,14 @@ TEST(record_cmd, stop_when_no_more_targets) {
   while (tid == 0);
   ASSERT_TRUE(RecordCmd()->Run({"-o", tmpfile.path, "-t", std::to_string(tid)}));
 }
+
+TEST(record_cmd, donot_stop_when_having_targets) {
+  std::vector<std::unique_ptr<Workload>> workloads;
+  CreateProcesses(1, &workloads);
+  std::string pid = std::to_string(workloads[0]->GetPid());
+  uint64_t start_time_in_ns = GetSystemClock();
+  TemporaryFile tmpfile;
+  ASSERT_TRUE(RecordCmd()->Run({"-o", tmpfile.path, "-p", pid, "--duration", "3"}));
+  uint64_t end_time_in_ns = GetSystemClock();
+  ASSERT_GT(end_time_in_ns - start_time_in_ns, static_cast<uint64_t>(2e9));
+}
diff --git a/simpleperf/event_selection_set.cpp b/simpleperf/event_selection_set.cpp
index 71c6c723..bc1f5a8b 100644
--- a/simpleperf/event_selection_set.cpp
+++ b/simpleperf/event_selection_set.cpp
@@ -813,7 +813,7 @@ bool EventSelectionSet::HasSampler() {
   for (auto& group : groups_) {
     for (auto& sel : group) {
       if (!sel.event_fds.empty()) {
-        return false;
+        return true;
       }
       for (auto& sampler : sel.inplace_samplers) {
         if (!sampler->IsClosed()) {