Change type of LockOjectID and LockOwnerThreadID

dotnet · Jul 21, 2022 · 5fb79fd · 5fb79fd
1 parent 1988694
commit 5fb79fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/coreclr/vm/ClrEtwAll.man b/src/coreclr/vm/ClrEtwAll.man
@@ -1745,8 +1745,8 @@
                     <template tid="ContentionStart_V2">
                         <data name="ContentionFlags" inType="win:UInt8" map="ContentionFlagsMap" />
                         <data name="ClrInstanceID" inType="win:UInt16" />
-                        <data name="LockObjectID" inType="win:UInt64" outType="win:HexInt64" />
-                        <data name="LockOwnerThreadID" inType="win:UInt64" outType="win:HexInt64" />
+                        <data name="LockObjectID" inType="win:Pointer" />
+                        <data name="LockOwnerThreadID" inType="win:Pointer" />
                         <UserData>
                             <Contention xmlns="myNs">
                                 <ContentionFlags> %1 </ContentionFlags>

diff --git a/src/coreclr/vm/syncblk.cpp b/src/coreclr/vm/syncblk.cpp
@@ -2554,7 +2554,7 @@ BOOL AwareLock::EnterEpilogHelper(Thread* pCurThread, INT32 timeOut)
         QueryPerformanceCounter(&startTicks);
 
         // Fire a contention start event for a managed contention
-        FireEtwContentionStart_V2(ETW::ContentionLog::ContentionStructs::ManagedContention, GetClrInstanceId(), (ObjectID)OBJECTREFToObject(obj), (ThreadID)m_HoldingThread);
+        FireEtwContentionStart_V2(ETW::ContentionLog::ContentionStructs::ManagedContention, GetClrInstanceId(), OBJECTREFToObject(obj), m_HoldingThread);
     }
 
     // We cannot allow the AwareLock to be cleaned up underneath us by the GC.