From ab9c019411c28d6081b305448f170416feb0512a Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Thu, 10 Oct 2024 20:55:56 -0700 Subject: [PATCH] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20change?= =?UTF-8?q?s=20to=20main=20this=20commit=20is=20based=20on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Created using spr 1.3.4 [skip ci] --- compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp | 4 ++-- compiler-rt/lib/sanitizer_common/sanitizer_linux.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp index a4e58133c79f0..31750cf65ab6e 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp +++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp @@ -1086,7 +1086,7 @@ ThreadLister::Result ThreadLister::ListThreads( } } -const char *ThreadLister::LoadStatus(int tid) { +const char *ThreadLister::LoadStatus(tid_t tid) { auto cleanup = at_scope_exit([&] { // Resize back to capacity if it is downsized by `ReadFileToVector`. buffer_.resize(buffer_.capacity()); @@ -1097,7 +1097,7 @@ const char *ThreadLister::LoadStatus(int tid) { return buffer_.data(); } -bool ThreadLister::IsAlive(int tid) { +bool ThreadLister::IsAlive(tid_t tid) { // /proc/%d/task/%d/status uses same call to detect alive threads as // proc_task_readdir. See task_state implementation in Linux. static const char kPrefix[] = "\nPPid:"; diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.h b/compiler-rt/lib/sanitizer_common/sanitizer_linux.h index 07d9528813b3f..8b7874bb5a349 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.h @@ -103,10 +103,10 @@ class ThreadLister { Ok, }; Result ListThreads(InternalMmapVector *threads); - const char *LoadStatus(int tid); + const char *LoadStatus(tid_t tid); private: - bool IsAlive(int tid); + bool IsAlive(tid_t tid); InternalScopedString task_path_; InternalScopedString status_path_;