Skip to content

Fix DAC syncblk API so the SOS tests stop failing intermittently #86339

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
May 17, 2023
Merged

Fix DAC syncblk API so the SOS tests stop failing intermittently #86339

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d6533f
Fix DAC syncblk API
May 16, 2023
4cc7fff
Actually fix the problem: only fill in the syncblk data if there are …
May 16, 2023
061ed11
Fix build problems
May 16, 2023
c4ea205
Add SBNumber index validation to API
May 16, 2023
b471da0
Revert change
May 17, 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
59 changes: 32 additions & 27 deletions src/coreclr/debug/daccess/request.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3667,46 +3667,51 @@ ClrDataAccess::GetSyncBlockData(unsigned int SBNumber, struct DacpSyncBlockData

ZeroMemory(pSyncBlockData,sizeof(DacpSyncBlockData));
pSyncBlockData->SyncBlockCount = (SyncBlockCache::s_pSyncBlockCache->m_FreeSyncTableIndex) - 1;
PTR_SyncTableEntry ste = PTR_SyncTableEntry(dac_cast<TADDR>(g_pSyncTable)+(sizeof(SyncTableEntry) * SBNumber));
pSyncBlockData->bFree = ((dac_cast<TADDR>(ste->m_Object.Load())) & 1);
pSyncBlockData->bFree = TRUE;

if (pSyncBlockData->bFree == FALSE)
if (pSyncBlockData->SyncBlockCount > 0 && SBNumber <= pSyncBlockData->SyncBlockCount)
{
pSyncBlockData->Object = (CLRDATA_ADDRESS)dac_cast<TADDR>(ste->m_Object.Load());
PTR_SyncTableEntry ste = PTR_SyncTableEntry(dac_cast<TADDR>(g_pSyncTable)+(sizeof(SyncTableEntry) * SBNumber));
pSyncBlockData->bFree = ((dac_cast<TADDR>(ste->m_Object.Load())) & 1);

if (ste->m_SyncBlock != NULL)
if (pSyncBlockData->bFree == FALSE)
{
SyncBlock *pBlock = PTR_SyncBlock(ste->m_SyncBlock);
pSyncBlockData->SyncBlockPointer = HOST_CDADDR(pBlock);
#ifdef FEATURE_COMINTEROP
if (pBlock->m_pInteropInfo)
pSyncBlockData->Object = (CLRDATA_ADDRESS)dac_cast<TADDR>(ste->m_Object.Load());

if (ste->m_SyncBlock != NULL)
{
pSyncBlockData->COMFlags |= (pBlock->m_pInteropInfo->DacGetRawRCW() != 0) ? SYNCBLOCKDATA_COMFLAGS_RCW : 0;
pSyncBlockData->COMFlags |= (pBlock->m_pInteropInfo->GetCCW() != NULL) ? SYNCBLOCKDATA_COMFLAGS_CCW : 0;
SyncBlock *pBlock = PTR_SyncBlock(ste->m_SyncBlock);
pSyncBlockData->SyncBlockPointer = HOST_CDADDR(pBlock);
#ifdef FEATURE_COMINTEROP
if (pBlock->m_pInteropInfo)
{
pSyncBlockData->COMFlags |= (pBlock->m_pInteropInfo->DacGetRawRCW() != 0) ? SYNCBLOCKDATA_COMFLAGS_RCW : 0;
pSyncBlockData->COMFlags |= (pBlock->m_pInteropInfo->GetCCW() != NULL) ? SYNCBLOCKDATA_COMFLAGS_CCW : 0;
#ifdef FEATURE_COMINTEROP_UNMANAGED_ACTIVATION
pSyncBlockData->COMFlags |= (pBlock->m_pInteropInfo->GetComClassFactory() != NULL) ? SYNCBLOCKDATA_COMFLAGS_CF : 0;
pSyncBlockData->COMFlags |= (pBlock->m_pInteropInfo->GetComClassFactory() != NULL) ? SYNCBLOCKDATA_COMFLAGS_CF : 0;
#endif // FEATURE_COMINTEROP_UNMANAGED_ACTIVATION
}
}
#endif // FEATURE_COMINTEROP

pSyncBlockData->MonitorHeld = pBlock->m_Monitor.GetMonitorHeldStateVolatile();
pSyncBlockData->Recursion = pBlock->m_Monitor.GetRecursionLevel();
pSyncBlockData->HoldingThread = HOST_CDADDR(pBlock->m_Monitor.GetHoldingThread());
pSyncBlockData->appDomainPtr = PTR_HOST_TO_TADDR(AppDomain::GetCurrentDomain());
pSyncBlockData->MonitorHeld = pBlock->m_Monitor.GetMonitorHeldStateVolatile();
pSyncBlockData->Recursion = pBlock->m_Monitor.GetRecursionLevel();
pSyncBlockData->HoldingThread = HOST_CDADDR(pBlock->m_Monitor.GetHoldingThread());
pSyncBlockData->appDomainPtr = PTR_HOST_TO_TADDR(AppDomain::GetCurrentDomain());

// TODO: Microsoft, implement the wait list
pSyncBlockData->AdditionalThreadCount = 0;
// TODO: Microsoft, implement the wait list
pSyncBlockData->AdditionalThreadCount = 0;

if (pBlock->m_Link.m_pNext != NULL)
{
PTR_SLink pLink = pBlock->m_Link.m_pNext;
do
if (pBlock->m_Link.m_pNext != NULL)
{
pSyncBlockData->AdditionalThreadCount++;
pLink = pBlock->m_Link.m_pNext;
PTR_SLink pLink = pBlock->m_Link.m_pNext;
do
{
pSyncBlockData->AdditionalThreadCount++;
pLink = pBlock->m_Link.m_pNext;
}
while ((pLink != NULL) &&
(pSyncBlockData->AdditionalThreadCount < 1000));
}
while ((pLink != NULL) &&
(pSyncBlockData->AdditionalThreadCount < 1000));
}
}
}
Expand Down