VSadov/Satori
1
0
Fork 0
mirror of https://github.com/VSadov/Satori.git synced 2025-06-08 03:27:04 +09:00
Code Activity

Fixes after rebasing

Browse source
This commit is contained in:
vsadov 2023-07-19 09:33:59 -07:00
parent 4bc84d3255
commit 5e1777708e
1 changed files with 58 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

88
src/coreclr/gc/objecthandle.cpp
View file

@ -993,11 +993,13 @@ void TraceVariableHandles(HANDLESCANPROC pfnTrace, ScanContext *sc, uintptr_t lp
if (walk->pBuckets[i] != NULL)
{
int uCPUindex = getSlotNumber(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
#if !defined(FEATURE_SATORI_GC)
int uCPUlimit = getNumberOfSlots();
assert(uCPUlimit > 0);
int uCPUstep = getThreadCount(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
for ( ; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
#endif
{
HHANDLETABLE hTable = pTable[uCPUindex];
if (hTable)
@ -1066,11 +1068,13 @@ void Ref_TracePinningRoots(uint32_t condemned, uint32_t maxgen, ScanContext* sc,
if (walk->pBuckets[i] != NULL)
{
int uCPUindex = getSlotNumber(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
#if !defined(FEATURE_SATORI_GC)
int uCPUlimit = getNumberOfSlots();
assert(uCPUlimit > 0);
int uCPUstep = getThreadCount(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
for ( ; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
for (; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
#endif
{
HHANDLETABLE hTable = pTable[uCPUindex];
if (hTable)
@ -1113,11 +1117,13 @@ void Ref_TraceNormalRoots(uint32_t condemned, uint32_t maxgen, ScanContext* sc,
if (walk->pBuckets[i] != NULL)
{
int uCPUindex = getSlotNumber(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
#if !defined(FEATURE_SATORI_GC)
int uCPUlimit = getNumberOfSlots();
assert(uCPUlimit > 0);
int uCPUstep = getThreadCount(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
for ( ; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
for (; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
#endif
{
HHANDLETABLE hTable = pTable[uCPUindex];
if (hTable)
@ -1147,11 +1153,13 @@ void Ref_TraceNormalRoots(uint32_t condemned, uint32_t maxgen, ScanContext* sc,
if (walk->pBuckets[i] != NULL)
{
int uCPUindex = getSlotNumber(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
#if !defined(FEATURE_SATORI_GC)
int uCPUlimit = getNumberOfSlots();
assert(uCPUlimit > 0);
int uCPUstep = getThreadCount(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
for ( ; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
for (; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
#endif
{
HHANDLETABLE hTable = pTable[uCPUindex];
if (hTable)
@ -1224,11 +1232,13 @@ void Ref_CheckReachable(uint32_t condemned, uint32_t maxgen, ScanContext *sc)
if (walk->pBuckets[i] != NULL)
{
int uCPUindex = getSlotNumber(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
#if !defined(FEATURE_SATORI_GC)
int uCPUlimit = getNumberOfSlots();
assert(uCPUlimit > 0);
int uCPUstep = getThreadCount(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
for ( ; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
for (; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
#endif
{
HHANDLETABLE hTable = pTable[uCPUindex];
if (hTable)
@ -1316,11 +1326,11 @@ bool Ref_ScanDependentHandlesForPromotion(DhContext *pDhContext)
if (walk->pBuckets[i] != NULL)
{
int uCPUindex = getSlotNumber(pDhContext->m_pScanContext);
int uCPUlimit = getNumberOfSlots();
assert(uCPUlimit > 0);
// int uCPUlimit = getNumberOfSlots();
// assert(uCPUlimit > 0);
int uCPUstep = getThreadCount(pDhContext->m_pScanContext);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
for ( ; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
// for ( ; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
{
HHANDLETABLE hTable = pTable[uCPUindex];
if (hTable)
@ -1365,11 +1375,13 @@ void Ref_ScanDependentHandlesForClearing(uint32_t condemned, uint32_t maxgen, Sc
if (walk->pBuckets[i] != NULL)
{
int uCPUindex = getSlotNumber(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
#if !defined(FEATURE_SATORI_GC)
int uCPUlimit = getNumberOfSlots();
assert(uCPUlimit > 0);
int uCPUstep = getThreadCount(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
for ( ; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
for (; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
#endif
{
HHANDLETABLE hTable = pTable[uCPUindex];
if (hTable)
@ -1433,11 +1445,13 @@ void Ref_ScanDependentHandlesForRelocation(uint32_t condemned, uint32_t maxgen,
if (walk->pBuckets[i] != NULL)
{
int uCPUindex = getSlotNumber(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
#if !defined(FEATURE_SATORI_GC)
int uCPUlimit = getNumberOfSlots();
assert(uCPUlimit > 0);
int uCPUstep = getThreadCount(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
for ( ; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
for (; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
#endif
{
HHANDLETABLE hTable = pTable[uCPUindex];
if (hTable)
@ -1494,11 +1508,13 @@ void ScanSizedRefByCPU(uint32_t maxgen, HANDLESCANPROC scanProc, ScanContext* sc
if (walk->pBuckets[i] != NULL)
{
int uCPUindex = getSlotNumber(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
#if !defined(FEATURE_SATORI_GC)
int uCPUlimit = getNumberOfSlots();
assert(uCPUlimit > 0);
int uCPUstep = getThreadCount(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
for ( ; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
for (; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
#endif
{
HHANDLETABLE hTable = pTable[uCPUindex];
if (hTable)
@ -1546,11 +1562,13 @@ void Ref_CheckAlive(uint32_t condemned, uint32_t maxgen, ScanContext *sc)
if (walk->pBuckets[i] != NULL)
{
int uCPUindex = getSlotNumber(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
#if !defined(FEATURE_SATORI_GC)
int uCPUlimit = getNumberOfSlots();
assert(uCPUlimit > 0);
int uCPUstep = getThreadCount(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
for ( ; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
for (; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
#endif
{
HHANDLETABLE hTable = pTable[uCPUindex];
if (hTable)
@ -1616,11 +1634,13 @@ void Ref_UpdatePointers(uint32_t condemned, uint32_t maxgen, ScanContext* sc, Re
if (walk->pBuckets[i] != NULL)
{
int uCPUindex = getSlotNumber(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
#if !defined(FEATURE_SATORI_GC)
int uCPUlimit = getNumberOfSlots();
assert(uCPUlimit > 0);
int uCPUstep = getThreadCount(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
for ( ; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
for (; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
#endif
{
HHANDLETABLE hTable = pTable[uCPUindex];
if (hTable)
@ -1742,11 +1762,13 @@ void Ref_UpdatePinnedPointers(uint32_t condemned, uint32_t maxgen, ScanContext*
if (walk->pBuckets[i] != NULL)
{
int uCPUindex = getSlotNumber(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
#if !defined(FEATURE_SATORI_GC)
int uCPUlimit = getNumberOfSlots();
assert(uCPUlimit > 0);
int uCPUstep = getThreadCount(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
for ( ; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
for (; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
#endif
{
HHANDLETABLE hTable = pTable[uCPUindex];
if (hTable)
@ -1804,11 +1826,13 @@ void Ref_AgeHandles(uint32_t condemned, uint32_t maxgen, ScanContext* sc)
if (walk->pBuckets[i] != NULL)
{
int uCPUindex = getSlotNumber(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
#if !defined(FEATURE_SATORI_GC)
int uCPUlimit = getNumberOfSlots();
assert(uCPUlimit > 0);
int uCPUstep = getThreadCount(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
for ( ; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
for (; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
#endif
{
HHANDLETABLE hTable = pTable[uCPUindex];
if (hTable)
@ -1863,11 +1887,13 @@ void Ref_RejuvenateHandles(uint32_t condemned, uint32_t maxgen, ScanContext* sc)
if (walk->pBuckets[i] != NULL)
{
int uCPUindex = getSlotNumber(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
#if !defined(FEATURE_SATORI_GC)
int uCPUlimit = getNumberOfSlots();
assert(uCPUlimit > 0);
int uCPUstep = getThreadCount(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
for ( ; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
for (; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
#endif
{
HHANDLETABLE hTable = pTable[uCPUindex];
if (hTable)
@ -1919,11 +1945,13 @@ void Ref_VerifyHandleTable(uint32_t condemned, uint32_t maxgen, ScanContext* sc)
if (walk->pBuckets[i] != NULL)
{
int uCPUindex = getSlotNumber(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
#if !defined(FEATURE_SATORI_GC)
int uCPUlimit = getNumberOfSlots();
assert(uCPUlimit > 0);
int uCPUstep = getThreadCount(sc);
HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
for ( ; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
for (; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
#endif
{
HHANDLETABLE hTable = pTable[uCPUindex];
if (hTable)