Skip to content

Move a lock to protect m_pDynamicStaticsInfo #95769

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
jkotas merged 3 commits into from
Dec 8, 2023
Merged

Move a lock to protect m_pDynamicStaticsInfo #95769

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9465482
Move a lock to protect m_pDynamicStaticsInfo
HJLeee Dec 7, 2023
7e8cbe6
apply feedback
HJLeee Dec 8, 2023
2c43f41
cast to LONG
HJLeee Dec 8, 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
Prev Previous commit
Next Next commit
apply feedback
  • Loading branch information
@HJLeee
HJLeee committed Dec 8, 2023
commit 7e8cbe614a502bc47e057f03676036790fe2343c
26 changes: 11 additions & 15 deletions src/coreclr/vm/ceeload.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1550,29 +1550,25 @@ DWORD Module::AllocateDynamicEntry(MethodTable *pMT)
}
CONTRACTL_END;

DWORD newId = InterlockedExchangeAdd((LONG*)&m_cDynamicEntries, 1);

CrstHolder ch(&m_Crst);
DWORD newId = m_cDynamicEntries++;

if (newId >= m_maxDynamicEntries)
{
if (newId >= m_maxDynamicEntries)
SIZE_T maxDynamicEntries = max(16, m_maxDynamicEntries);
while (maxDynamicEntries <= newId)
{
SIZE_T maxDynamicEntries = max(16, m_maxDynamicEntries);
while (maxDynamicEntries <= newId)
{
maxDynamicEntries *= 2;
}
maxDynamicEntries *= 2;
}

DynamicStaticsInfo* pNewDynamicStaticsInfo = (DynamicStaticsInfo*)
(void*)GetLoaderAllocator()->GetHighFrequencyHeap()->AllocMem(S_SIZE_T(sizeof(DynamicStaticsInfo)) * S_SIZE_T(maxDynamicEntries));
DynamicStaticsInfo* pNewDynamicStaticsInfo = (DynamicStaticsInfo*)
(void*)GetLoaderAllocator()->GetHighFrequencyHeap()->AllocMem(S_SIZE_T(sizeof(DynamicStaticsInfo)) * S_SIZE_T(maxDynamicEntries));

if (m_pDynamicStaticsInfo)
memcpy(pNewDynamicStaticsInfo, m_pDynamicStaticsInfo, sizeof(DynamicStaticsInfo) * m_maxDynamicEntries);
if (m_pDynamicStaticsInfo)
memcpy(pNewDynamicStaticsInfo, m_pDynamicStaticsInfo, sizeof(DynamicStaticsInfo) * m_maxDynamicEntries);

m_pDynamicStaticsInfo = pNewDynamicStaticsInfo;
m_maxDynamicEntries = maxDynamicEntries;
}
m_pDynamicStaticsInfo = pNewDynamicStaticsInfo;
m_maxDynamicEntries = maxDynamicEntries;
}

m_pDynamicStaticsInfo[newId].pEnclosingMT = pMT;
Expand Down