Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change taskset usage to improve compatibility #958

Merged
merged 2 commits into from
Mar 6, 2023
Merged

Change taskset usage to improve compatibility #958

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77b842c
Change taskset usage to improve compatibility
zasgar Mar 3, 2023
8599edd
Update perf_profiler_bpf_test.cc
zasgar Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/stirling/source_connectors/perf_profiler/perf_profiler_bpf_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,21 +130,27 @@ class CPUPinnedSubProcesses final : public PerfProfilerTestSubProcesses {
void StartAll() override {
ASSERT_TRUE(fs::Exists(binary_path_));
ASSERT_TRUE(fs::Exists(kTasksetBinPath));
const auto processor_count = std::thread::hardware_concurrency();
if (processor_count > 0) {
ASSERT_GE(processor_count, kNumSubProcs);
}

const system::ProcParser proc_parser;

for (size_t i = 0; i < kNumSubProcs; ++i) {
sub_processes_.push_back(std::make_unique<SubProcess>());
auto sub_process = std::make_unique<SubProcess>();

// Run the sub-process & pin it to a CPU.
const std::string kTasksetBinPath = "/usr/bin/taskset";
ASSERT_OK(sub_processes_[i]->Start({kTasksetBinPath, "-c", std::to_string(i), binary_path_}));
std::string mask = absl::StrFormat("%#x", 1 << i);
ASSERT_OK(sub_process->Start({std::string(kTasksetBinPath), mask, binary_path_}));

// Grab the PID and generate a UPID.
const int pid = sub_processes_[i]->child_pid();
const int pid = sub_process->child_pid();
ASSERT_OK_AND_ASSIGN(const uint64_t ts, proc_parser.GetPIDStartTimeTicks(pid));
pids_.push_back(pid);
struct_upids_.push_back({{static_cast<uint32_t>(pid)}, ts});
upids_.emplace(0, pid, ts);
sub_processes_.emplace_back(std::move(sub_process));
}
}

Expand All @@ -158,7 +164,7 @@ class CPUPinnedSubProcesses final : public PerfProfilerTestSubProcesses {
}

private:
static constexpr std::string_view kTasksetBinPath = "/usr/bin/taskset";
static constexpr std::string_view kTasksetBinPath = "/bin/taskset";
std::vector<std::unique_ptr<SubProcess>> sub_processes_;
const std::string binary_path_;
};
Expand Down