Merge "simpleperf: build libsimpleperf_inplace_sampler library." am: d9d2318176 am...

am: 504ae2f14c

Change-Id: I5a23cc8c46bb5d20eb0f0471572c601943a77318

diff --combined simpleperf/cpu_hotplug_test.cpp
index 66dbd0b,16e0e5c..a1715ec
--- 1/simpleperf/cpu_hotplug_test.cpp
--- 2/simpleperf/cpu_hotplug_test.cpp
+++ b/simpleperf/cpu_hotplug_test.cpp
@@@ -17,7 -17,6 +17,6 @@@
  #include <gtest/gtest.h>
  
  #include <sys/stat.h>
- #include <sys/syscall.h>
  #include <unistd.h>
  #if defined(__BIONIC__)
  #include <sys/system_properties.h>
@@@ -32,6 -31,7 +31,7 @@@
  #include <android-base/logging.h>
  #include <android-base/stringprintf.h>
  
+ #include "environment.h"
  #include "event_attr.h"
  #include "event_fd.h"
  #include "event_type.h"
@@@ -199,24 -199,13 +199,24 @@@ bool FindAHotpluggableCpu(int* hotplugg
  struct CpuToggleThreadArg {
    int toggle_cpu;
    std::atomic<bool> end_flag;
 +  std::atomic<bool> cpu_hotplug_failed;
 +
 +  CpuToggleThreadArg(int cpu)
 +      : toggle_cpu(cpu), end_flag(false), cpu_hotplug_failed(false) {
 +  }
  };
  
  static void CpuToggleThread(CpuToggleThreadArg* arg) {
    while (!arg->end_flag) {
 -    CHECK(SetCpuOnline(arg->toggle_cpu, true));
 +    if (!SetCpuOnline(arg->toggle_cpu, true)) {
 +      arg->cpu_hotplug_failed = true;
 +      break;
 +    }
      std::this_thread::sleep_for(cpu_hotplug_interval);
 -    CHECK(SetCpuOnline(arg->toggle_cpu, false));
 +    if (!SetCpuOnline(arg->toggle_cpu, false)) {
 +      arg->cpu_hotplug_failed = true;
 +      break;
 +    }
      std::this_thread::sleep_for(cpu_hotplug_interval);
    }
  }
@@@ -234,7 -223,9 +234,7 @@@ TEST(cpu_offline, offline_while_recordi
    if (!FindAHotpluggableCpu(&test_cpu)) {
      return;
    }
 -  CpuToggleThreadArg cpu_toggle_arg;
 -  cpu_toggle_arg.toggle_cpu = test_cpu;
 -  cpu_toggle_arg.end_flag = false;
 +  CpuToggleThreadArg cpu_toggle_arg(test_cpu);
    std::thread cpu_toggle_thread(CpuToggleThread, &cpu_toggle_arg);
  
    std::unique_ptr<EventTypeAndModifier> event_type_modifier = ParseEventType("cpu-cycles");
@@@ -249,7 -240,7 +249,7 @@@
    auto report_step = std::chrono::seconds(15);
    size_t iterations = 0;
  
 -  while (cur_time < end_time) {
 +  while (cur_time < end_time && !cpu_toggle_arg.cpu_hotplug_failed) {
      if (cur_time + report_step < std::chrono::steady_clock::now()) {
        // Report test time.
        auto diff = std::chrono::duration_cast<std::chrono::seconds>(
@@@ -270,9 -261,6 +270,9 @@@
        GTEST_LOG_(INFO) << "Test offline while recording for " << iterations << " times.";
      }
    }
 +  if (cpu_toggle_arg.cpu_hotplug_failed) {
 +    GTEST_LOG_(INFO) << "Test ends because of cpu hotplug failure.";
 +  }
    cpu_toggle_arg.end_flag = true;
    cpu_toggle_thread.join();
  }
@@@ -290,7 -278,9 +290,7 @@@ TEST(cpu_offline, offline_while_ioctl_e
    if (!FindAHotpluggableCpu(&test_cpu)) {
      return;
    }
 -  CpuToggleThreadArg cpu_toggle_arg;
 -  cpu_toggle_arg.toggle_cpu = test_cpu;
 -  cpu_toggle_arg.end_flag = false;
 +  CpuToggleThreadArg cpu_toggle_arg(test_cpu);
    std::thread cpu_toggle_thread(CpuToggleThread, &cpu_toggle_arg);
  
    std::unique_ptr<EventTypeAndModifier> event_type_modifier = ParseEventType("cpu-cycles");
@@@ -305,7 -295,7 +305,7 @@@
    auto report_step = std::chrono::seconds(15);
    size_t iterations = 0;
  
 -  while (cur_time < end_time) {
 +  while (cur_time < end_time && !cpu_toggle_arg.cpu_hotplug_failed) {
      if (cur_time + report_step < std::chrono::steady_clock::now()) {
        // Report test time.
        auto diff = std::chrono::duration_cast<std::chrono::seconds>(
@@@ -329,9 -319,6 +329,9 @@@
        GTEST_LOG_(INFO) << "Test offline while ioctl(PERF_EVENT_IOC_ENABLE) for " << iterations << " times.";
      }
    }
 +  if (cpu_toggle_arg.cpu_hotplug_failed) {
 +    GTEST_LOG_(INFO) << "Test ends because of cpu hotplug failure.";
 +  }
    cpu_toggle_arg.end_flag = true;
    cpu_toggle_thread.join();
  }
@@@ -343,7 -330,7 +343,7 @@@ struct CpuSpinThreadArg 
  };
  
  static void CpuSpinThread(CpuSpinThreadArg* arg) {
-   arg->tid = syscall(__NR_gettid);
+   arg->tid = gettid();
    while (!arg->end_flag) {
      cpu_set_t mask;
      CPU_ZERO(&mask);
@@@ -363,7 -350,9 +363,7 @@@ TEST(cpu_offline, offline_while_user_pr
    if (!FindAHotpluggableCpu(&test_cpu)) {
      return;
    }
 -  CpuToggleThreadArg cpu_toggle_arg;
 -  cpu_toggle_arg.toggle_cpu = test_cpu;
 -  cpu_toggle_arg.end_flag = false;
 +  CpuToggleThreadArg cpu_toggle_arg(test_cpu);
    std::thread cpu_toggle_thread(CpuToggleThread, &cpu_toggle_arg);
  
    // Start cpu spinner.
@@@ -389,7 -378,7 +389,7 @@@
    auto report_step = std::chrono::seconds(15);
    size_t iterations = 0;
  
 -  while (cur_time < end_time) {
 +  while (cur_time < end_time && !cpu_toggle_arg.cpu_hotplug_failed) {
      if (cur_time + report_step < std::chrono::steady_clock::now()) {
        auto diff = std::chrono::duration_cast<std::chrono::seconds>(
            std::chrono::steady_clock::now() - start_time);
@@@ -414,17 -403,13 +414,17 @@@
        GTEST_LOG_(INFO) << "Test offline while user process profiling for " << iterations << " times.";
      }
    }
 +  if (cpu_toggle_arg.cpu_hotplug_failed) {
 +    GTEST_LOG_(INFO) << "Test ends because of cpu hotplug failure.";
 +  }
    cpu_toggle_arg.end_flag = true;
    cpu_toggle_thread.join();
    cpu_spin_arg.end_flag = true;
    cpu_spin_thread.join();
    // Check if the cpu-cycle event is still available on test_cpu.
 -  ASSERT_TRUE(SetCpuOnline(test_cpu, true));
 -  ASSERT_TRUE(EventFd::OpenEventFile(attr, -1, test_cpu, nullptr, true) != nullptr);
 +  if (SetCpuOnline(test_cpu, true)) {
 +    ASSERT_TRUE(EventFd::OpenEventFile(attr, -1, test_cpu, nullptr, true) != nullptr);
 +  }
  }
  
  // http://b/19863147.
@@@ -448,14 -433,10 +448,14 @@@ TEST(cpu_offline, offline_while_recordi
    const size_t TEST_ITERATION_COUNT = 10u;
    for (size_t i = 0; i < TEST_ITERATION_COUNT; ++i) {
      int record_cpu = 0;
 -    ASSERT_TRUE(SetCpuOnline(test_cpu, true));
 +    if (!SetCpuOnline(test_cpu, true)) {
 +      break;
 +    }
      std::unique_ptr<EventFd> event_fd = EventFd::OpenEventFile(attr, getpid(), record_cpu, nullptr);
      ASSERT_TRUE(event_fd != nullptr);
 -    ASSERT_TRUE(SetCpuOnline(test_cpu, false));
 +    if (!SetCpuOnline(test_cpu, false)) {
 +      break;
 +    }
      event_fd = nullptr;
      event_fd = EventFd::OpenEventFile(attr, getpid(), record_cpu, nullptr);
      ASSERT_TRUE(event_fd != nullptr);