@@ -412,7 +412,7 @@ void ScanExtraStackRanges(const InternalMmapVector<Range> &ranges,
412412# if SANITIZER_FUCHSIA
413413
414414// Fuchsia handles all threads together with its own callback.
415- static void ProcessThreads (SuspendedThreadsList const &, Frontier *, tid_t ,
415+ static void ProcessThreads (SuspendedThreadsList const &, Frontier *, ThreadID ,
416416 uptr) {}
417417
418418# else
@@ -445,7 +445,7 @@ static void ProcessThreadRegistry(Frontier *frontier) {
445445
446446// Scans thread data (stacks and TLS) for heap pointers.
447447template <class Accessor >
448- static void ProcessThread (tid_t os_id, uptr sp,
448+ static void ProcessThread (ThreadID os_id, uptr sp,
449449 const InternalMmapVector<uptr> ®isters,
450450 InternalMmapVector<Range> &extra_ranges,
451451 Frontier *frontier, Accessor &accessor) {
@@ -556,16 +556,16 @@ static void ProcessThread(tid_t os_id, uptr sp,
556556}
557557
558558static void ProcessThreads (SuspendedThreadsList const &suspended_threads,
559- Frontier *frontier, tid_t caller_tid,
559+ Frontier *frontier, ThreadID caller_tid,
560560 uptr caller_sp) {
561- InternalMmapVector<tid_t > done_threads;
561+ InternalMmapVector<ThreadID > done_threads;
562562 InternalMmapVector<uptr> registers;
563563 InternalMmapVector<Range> extra_ranges;
564564 for (uptr i = 0 ; i < suspended_threads.ThreadCount (); i++) {
565565 registers.clear ();
566566 extra_ranges.clear ();
567567
568- const tid_t os_id = suspended_threads.GetThreadID (i);
568+ const ThreadID os_id = suspended_threads.GetThreadID (i);
569569 uptr sp = 0 ;
570570 PtraceRegistersStatus have_registers =
571571 suspended_threads.GetRegistersAndSP (i, ®isters, &sp);
@@ -589,10 +589,10 @@ static void ProcessThreads(SuspendedThreadsList const &suspended_threads,
589589
590590 if (flags ()->use_detached ) {
591591 CopyMemoryAccessor accessor;
592- InternalMmapVector<tid_t > known_threads;
592+ InternalMmapVector<ThreadID > known_threads;
593593 GetRunningThreadsLocked (&known_threads);
594594 Sort (done_threads.data (), done_threads.size ());
595- for (tid_t os_id : known_threads) {
595+ for (ThreadID os_id : known_threads) {
596596 registers.clear ();
597597 extra_ranges.clear ();
598598
@@ -712,7 +712,7 @@ static void CollectIgnoredCb(uptr chunk, void *arg) {
712712
713713// Sets the appropriate tag on each chunk.
714714static void ClassifyAllChunks (SuspendedThreadsList const &suspended_threads,
715- Frontier *frontier, tid_t caller_tid,
715+ Frontier *frontier, ThreadID caller_tid,
716716 uptr caller_sp) {
717717 const InternalMmapVector<u32 > &suppressed_stacks =
718718 GetSuppressionContext ()->GetSortedSuppressedStacks ();
@@ -790,13 +790,13 @@ static bool ReportUnsuspendedThreads(const SuspendedThreadsList &) {
790790
791791static bool ReportUnsuspendedThreads (
792792 const SuspendedThreadsList &suspended_threads) {
793- InternalMmapVector<tid_t > threads (suspended_threads.ThreadCount ());
793+ InternalMmapVector<ThreadID > threads (suspended_threads.ThreadCount ());
794794 for (uptr i = 0 ; i < suspended_threads.ThreadCount (); ++i)
795795 threads[i] = suspended_threads.GetThreadID (i);
796796
797797 Sort (threads.data (), threads.size ());
798798
799- InternalMmapVector<tid_t > known_threads;
799+ InternalMmapVector<ThreadID > known_threads;
800800 GetRunningThreadsLocked (&known_threads);
801801
802802 bool succeded = true ;
0 commit comments