Skip to content

Replace GetPalThreadIdForLogging() with GetOSThreadId() in NativeAOT #121322

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

Merged
merged 5 commits into from
Nov 4, 2025
Merged

Replace GetPalThreadIdForLogging() with GetOSThreadId() in NativeAOT #121322

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
729f135
Initial plan
Copilot Nov 3, 2025
44f39e0
Add proper GetOSThreadId method and use it instead of GetPalThreadIdF…
Copilot Nov 3, 2025
7e7ca48
Add documentation comment to GetOSThreadId method
Copilot Nov 3, 2025
c2f0906
Remove GetPalThreadIdForLogging and replace all usages with GetOSThre…
Copilot Nov 3, 2025
5dda3ca
Update src/coreclr/nativeaot/Runtime/thread.cpp
jkotas Nov 3, 2025
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
2 changes: 1 addition & 1 deletion src/coreclr/nativeaot/Runtime/eventpipe/ep-rt-aot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@ ep_rt_thread_handle_t ep_rt_aot_setup_thread (void)

ep_rt_thread_id_t ep_rt_aot_thread_get_id (ep_rt_thread_handle_t thread_handle)
{
return (ep_rt_thread_id_t)thread_handle->GetPalThreadIdForLogging();
return (ep_rt_thread_id_t)thread_handle->GetOSThreadId();
}

#ifdef EP_CHECKED_BUILD
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/nativeaot/Runtime/gcenv.ee.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ void GCToEEInterface::LogErrorToHost(const char *message)

uint64_t GCToEEInterface::GetThreadOSThreadId(Thread* thread)
{
return (uint64_t)thread->GetPalThreadIdForLogging();
return (uint64_t)thread->GetOSThreadId();
}

bool GCToEEInterface::GetStringConfigValue(const char* privateKey, const char* publicKey, const char** value)
Expand Down
7 changes: 4 additions & 3 deletions src/coreclr/nativeaot/Runtime/thread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,8 @@ bool Thread::IsGCSpecial()
return IsStateSet(TSF_IsGcSpecialThread);
}

uint64_t Thread::GetPalThreadIdForLogging()
// Returns the OS thread ID.
uint64_t Thread::GetOSThreadId()
{
return m_threadId;
}
Expand Down Expand Up @@ -817,7 +818,7 @@ void Thread::HijackReturnAddressWorker(StackFrameIterator* frameIterator, Hijack
*ppvRetAddrLocation = (void*)pfnHijackFunction;

STRESS_LOG2(LF_STACKWALK, LL_INFO10000, "InternalHijack: TgtThread = %llx, IP = %p\n",
GetPalThreadIdForLogging(), frameIterator->GetRegisterSet()->GetIP());
GetOSThreadId(), frameIterator->GetRegisterSet()->GetIP());
}
}
#endif // FEATURE_HIJACK
Expand Down Expand Up @@ -871,7 +872,7 @@ bool Thread::Redirect()
redirectionContext->SetIp(origIP);

STRESS_LOG2(LF_STACKWALK, LL_INFO10000, "InternalRedirect: TgtThread = %llx, IP = %p\n",
GetPalThreadIdForLogging(), origIP);
GetOSThreadId(), origIP);

return true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/nativeaot/Runtime/thread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ class Thread : private RuntimeThreadLocals
ee_alloc_context * GetEEAllocContext();
gc_alloc_context * GetAllocContext();

uint64_t GetPalThreadIdForLogging();
uint64_t GetOSThreadId();

void GcScanRoots(ScanFunc* pfnEnumCallback, ScanContext * pvCallbackData);

Expand Down