Skip to content
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

Jump to bottom

Move PendingTypeLoadTable from the ClassLoader object to a global structure #96653

Merged
merged 5 commits into from
Jan 26, 2024
Merged

Move PendingTypeLoadTable from the ClassLoader object to a global structure #96653

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
776380d
Move PendingTypeLoadTable from the ClassLoader object to a global str…
davidwrighton Dec 14, 2023
61b1e6d
First round of fixes
davidwrighton Jan 24, 2024
e34c835
Address more feedback
davidwrighton Jan 24, 2024
86aa908
Code review updates
davidwrighton Jan 24, 2024
91b8506
Hopefully final set of updates
davidwrighton Jan 25, 2024
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
3 changes: 3 additions & 0 deletions src/coreclr/vm/ceemain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@
#include "disassembler.h"
#include "jithost.h"
#include "pgo.h"
#include "pendingload.h"

#ifndef TARGET_UNIX
#include "dwreport.h"
Expand Down Expand Up @@ -623,6 +624,8 @@ void EEStartupHelper()
// This needs to be done before the EE has started
InitializeStartupFlags();

PendingTypeLoadTable::Init();

IfFailGo(ExecutableAllocator::StaticInitialize(FatalErrorHandler));

Thread::StaticInitialize();
Expand Down
82 changes: 27 additions & 55 deletions src/coreclr/vm/clsload.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ Module * ClassLoader::ComputeLoaderModule(MethodTable * pMT,
methodInst);
}
/*static*/
Module *ClassLoader::ComputeLoaderModule(TypeKey *typeKey)
Module *ClassLoader::ComputeLoaderModule(const TypeKey *typeKey)
{
CONTRACTL
{
Expand Down Expand Up @@ -729,7 +729,7 @@ void ClassLoader::LazyPopulateCaseInsensitiveHashTables()
}

/*static*/
void DECLSPEC_NORETURN ClassLoader::ThrowTypeLoadException(TypeKey *pKey,
void DECLSPEC_NORETURN ClassLoader::ThrowTypeLoadException(const TypeKey *pKey,
UINT resIDWhy)
{
STATIC_CONTRACT_THROWS;
Expand All @@ -743,7 +743,7 @@ void DECLSPEC_NORETURN ClassLoader::ThrowTypeLoadException(TypeKey *pKey,

#endif

TypeHandle ClassLoader::LoadConstructedTypeThrowing(TypeKey *pKey,
TypeHandle ClassLoader::LoadConstructedTypeThrowing(const TypeKey *pKey,
LoadTypesFlag fLoadTypes /*= LoadTypes*/,
ClassLoadLevel level /*=CLASS_LOADED*/,
const InstantiationContext *pInstContext /*=NULL*/)
Expand Down Expand Up @@ -873,7 +873,7 @@ void ClassLoader::TryEnsureLoaded(TypeHandle typeHnd, ClassLoadLevel level)
}

/* static */
TypeHandle ClassLoader::LookupTypeKey(TypeKey *pKey, EETypeHashTable *pTable)
TypeHandle ClassLoader::LookupTypeKey(const TypeKey *pKey, EETypeHashTable *pTable)
{
CONTRACTL {
NOTHROW;
Expand All @@ -890,7 +890,7 @@ TypeHandle ClassLoader::LookupTypeKey(TypeKey *pKey, EETypeHashTable *pTable)
}

/* static */
TypeHandle ClassLoader::LookupInLoaderModule(TypeKey *pKey)
TypeHandle ClassLoader::LookupInLoaderModule(const TypeKey *pKey)
{
CONTRACTL {
NOTHROW;
Expand All @@ -910,7 +910,7 @@ TypeHandle ClassLoader::LookupInLoaderModule(TypeKey *pKey)


/* static */
TypeHandle ClassLoader::LookupTypeHandleForTypeKey(TypeKey *pKey)
TypeHandle ClassLoader::LookupTypeHandleForTypeKey(const TypeKey *pKey)
{
CONTRACTL
{
Expand Down Expand Up @@ -1674,12 +1674,6 @@ ClassLoader::~ClassLoader()
}
CONTRACTL_END

#ifdef _DEBUG
// Do not walk m_pUnresolvedClassHash at destruct time as it is loaderheap allocated memory
// and may already have been deallocated via an AllocMemTracker.
m_pUnresolvedClassHash = (PendingTypeLoadTable*)(UINT_PTR)0xcccccccc;
#endif

#ifdef _DEBUG
// LOG((
// LF_CLASSLOADER,
Expand Down Expand Up @@ -1719,7 +1713,6 @@ ClassLoader::~ClassLoader()

FreeModules();

m_UnresolvedClassLock.Destroy();
m_AvailableClassLock.Destroy();
m_AvailableTypesLock.Destroy();
}
Expand All @@ -1744,7 +1737,6 @@ ClassLoader::ClassLoader(Assembly *pAssembly)

m_pAssembly = pAssembly;

m_pUnresolvedClassHash = NULL;
m_cUnhashedModules = 0;

#ifdef _DEBUG
Expand Down Expand Up @@ -1775,12 +1767,6 @@ VOID ClassLoader::Init(AllocMemTracker *pamTracker)
{
STANDARD_VM_CONTRACT;

m_pUnresolvedClassHash = PendingTypeLoadTable::Create(GetAssembly()->GetLowFrequencyHeap(),
UNRESOLVED_CLASS_HASH_BUCKETS,
pamTracker);

m_UnresolvedClassLock.Init(CrstUnresolvedClassLock);

// This lock is taken within the classloader whenever we have to enter a
// type in one of the modules governed by the loader.
// The process of creating these types may be reentrant. The ordering has
Expand Down Expand Up @@ -2620,7 +2606,7 @@ ClassLoader::LoadApproxParentThrowing(
// Perform a single phase of class loading
// It is the caller's responsibility to lock
/*static*/
TypeHandle ClassLoader::DoIncrementalLoad(TypeKey *pTypeKey, TypeHandle typeHnd, ClassLoadLevel currentLevel)
TypeHandle ClassLoader::DoIncrementalLoad(const TypeKey *pTypeKey, TypeHandle typeHnd, ClassLoadLevel currentLevel)
{
CONTRACTL
{
Expand Down Expand Up @@ -2694,7 +2680,7 @@ TypeHandle ClassLoader::DoIncrementalLoad(TypeKey *pTypeKey, TypeHandle typeHnd,
// For canonical instantiations of generic types, create a brand new method table
// For other constructed types, create a type desc and template method table if necessary
// For all other types, create a method table
TypeHandle ClassLoader::CreateTypeHandleForTypeKey(TypeKey* pKey, AllocMemTracker* pamTracker)
TypeHandle ClassLoader::CreateTypeHandleForTypeKey(const TypeKey* pKey, AllocMemTracker* pamTracker)
{
CONTRACT(TypeHandle)
{
Expand Down Expand Up @@ -2809,7 +2795,7 @@ TypeHandle ClassLoader::CreateTypeHandleForTypeKey(TypeKey* pKey, AllocMemTracke
// particular, exact parent info (base class and interfaces) is loaded
// in a later phase
/*static*/
TypeHandle ClassLoader::PublishType(TypeKey *pTypeKey, TypeHandle typeHnd)
TypeHandle ClassLoader::PublishType(const TypeKey *pTypeKey, TypeHandle typeHnd)
{
CONTRACTL
{
Expand Down Expand Up @@ -3009,7 +2995,7 @@ static void PushFinalLevels(TypeHandle typeHnd, ClassLoadLevel targetLevel, cons


//
TypeHandle ClassLoader::LoadTypeHandleForTypeKey(TypeKey *pTypeKey,
TypeHandle ClassLoader::LoadTypeHandleForTypeKey(const TypeKey *pTypeKey,
TypeHandle typeHnd,
ClassLoadLevel targetLevel/*=CLASS_LOADED*/,
const InstantiationContext *pInstContext/*=NULL*/)
Expand All @@ -3033,8 +3019,7 @@ TypeHandle ClassLoader::LoadTypeHandleForTypeKey(TypeKey *pTypeKey,
SString name;
TypeString::AppendTypeKeyDebug(name, pTypeKey);
LOG((LF_CLASSLOADER, LL_INFO10000, "PHASEDLOAD: LoadTypeHandleForTypeKey for type %s to level %s\n", name.GetUTF8(), classLoadLevelName[targetLevel]));
CrstHolder unresolvedClassLockHolder(&m_UnresolvedClassLock);
m_pUnresolvedClassHash->Dump();
PendingTypeLoadTable::GetTable()->Dump();
}
#endif

Expand Down Expand Up @@ -3066,7 +3051,7 @@ TypeHandle ClassLoader::LoadTypeHandleForTypeKey(TypeKey *pTypeKey,
}

//
TypeHandle ClassLoader::LoadTypeHandleForTypeKeyNoLock(TypeKey *pTypeKey,
TypeHandle ClassLoader::LoadTypeHandleForTypeKeyNoLock(const TypeKey *pTypeKey,
ClassLoadLevel targetLevel/*=CLASS_LOADED*/,
const InstantiationContext *pInstContext/*=NULL*/)
{
Expand Down Expand Up @@ -3106,11 +3091,11 @@ TypeHandle ClassLoader::LoadTypeHandleForTypeKeyNoLock(TypeKey *pTypeKey,
class PendingTypeLoadHolder
{
Thread * m_pThread;
PendingTypeLoadEntry * m_pEntry;
PendingTypeLoadTable::Entry * m_pEntry;
PendingTypeLoadHolder * m_pPrevious;

public:
PendingTypeLoadHolder(PendingTypeLoadEntry * pEntry)
PendingTypeLoadHolder(PendingTypeLoadTable::Entry * pEntry)
{
LIMITED_METHOD_CONTRACT;

Expand All @@ -3129,7 +3114,7 @@ class PendingTypeLoadHolder
m_pThread->SetPendingTypeLoad(m_pPrevious);
}

static bool CheckForDeadLockOnCurrentThread(PendingTypeLoadEntry * pEntry)
static bool CheckForDeadLockOnCurrentThread(PendingTypeLoadTable::Entry * pEntry)
{
LIMITED_METHOD_CONTRACT;

Expand All @@ -3151,7 +3136,7 @@ class PendingTypeLoadHolder
//
TypeHandle
ClassLoader::LoadTypeHandleForTypeKey_Body(
TypeKey * pTypeKey,
const TypeKey * pTypeKey,
TypeHandle typeHnd,
ClassLoadLevel targetLevel)
{
Expand Down Expand Up @@ -3182,14 +3167,16 @@ ClassLoader::LoadTypeHandleForTypeKey_Body(
#endif
}

ReleaseHolder<PendingTypeLoadEntry> pLoadingEntry;
CrstHolderWithState unresolvedClassLockHolder(&m_UnresolvedClassLock, false);
ReleaseHolder<PendingTypeLoadTable::Entry> pLoadingEntry;
DWORD dwHashedTypeKey;
PendingTypeLoadTable::Shard *pPendingTypeLoadShard = PendingTypeLoadTable::GetTable()->GetShard(*pTypeKey, this, &dwHashedTypeKey);
CrstHolderWithState unresolvedClassLockHolder(pPendingTypeLoadShard->GetCrst(), false);

retry:
unresolvedClassLockHolder.Acquire();

// Is it in the hash of classes currently being loaded?
pLoadingEntry = m_pUnresolvedClassHash->GetValue(pTypeKey);
pLoadingEntry = pPendingTypeLoadShard->FindPendingTypeLoadEntry(dwHashedTypeKey, *pTypeKey);
if (pLoadingEntry)
{
pLoadingEntry->AddRef();
Expand Down Expand Up @@ -3234,15 +3221,8 @@ ClassLoader::LoadTypeHandleForTypeKey_Body(
goto retry;
}

{
// Wait for class to be loaded by another thread. This is where we start tracking the
// entry, so there is an implicit Acquire in our use of Assign here.
CrstHolder loadingEntryLockHolder(&pLoadingEntry->m_Crst);
_ASSERTE(pLoadingEntry->HasLock());
}

// Result of other thread loading the class
HRESULT hr = pLoadingEntry->m_hrResult;
HRESULT hr = pLoadingEntry->DelayForProgress(&typeHnd);

if (FAILED(hr)) {

Expand Down Expand Up @@ -3277,9 +3257,6 @@ ClassLoader::LoadTypeHandleForTypeKey_Body(
pLoadingEntry->ThrowException();
}

// Get a pointer to the EEClass being loaded
typeHnd = pLoadingEntry->m_typeHandle;

if (!typeHnd.IsNull())
{
// If the type load on the other thread loaded the type to the needed level, return it here.
Expand Down Expand Up @@ -3309,12 +3286,7 @@ ClassLoader::LoadTypeHandleForTypeKey_Body(

// It was not loaded, and it is not being loaded, so we must load it. Create a new LoadingEntry
// and acquire it immediately so that other threads will block.
pLoadingEntry = new PendingTypeLoadEntry(*pTypeKey, typeHnd); // this atomically creates a crst and acquires it

if (!(m_pUnresolvedClassHash->InsertValue(pLoadingEntry)))
{
COMPlusThrowOM();
}
pLoadingEntry = pPendingTypeLoadShard->InsertPendingTypeLoadEntry(dwHashedTypeKey, *pTypeKey, typeHnd); // this atomically creates a crst and acquires it

// Leave the global lock, so that other threads may now start waiting on our class's lock
unresolvedClassLockHolder.Release();
Expand Down Expand Up @@ -3352,7 +3324,7 @@ ClassLoader::LoadTypeHandleForTypeKey_Body(

// Unlink this class from the unresolved class list.
unresolvedClassLockHolder.Acquire();
m_pUnresolvedClassHash->DeleteValue(pTypeKey);
pPendingTypeLoadShard->RemovePendingTypeLoadEntry(pLoadingEntry);

// Release the lock before proceeding. The unhandled exception filters take number of locks that
// have ordering violations with this lock.
Expand All @@ -3365,13 +3337,13 @@ ClassLoader::LoadTypeHandleForTypeKey_Body(

// Unlink this class from the unresolved class list.
unresolvedClassLockHolder.Acquire();
m_pUnresolvedClassHash->DeleteValue(pTypeKey);
pPendingTypeLoadShard->RemovePendingTypeLoadEntry(pLoadingEntry);
unresolvedClassLockHolder.Release();

// Unblock any thread waiting to load same type as in TypeLoadEntry. This should be done
// after pLoadingEntry is removed from m_pUnresolvedClassHash. Otherwise the other thread
// after pLoadingEntry is removed from the PendingTypeLoadTable. Otherwise the other thread
// (which was waiting) will keep spinning for a while after waking up, till the current thread removes
// pLoadingEntry from m_pUnresolvedClassHash. This can cause hang in situation when the current
// pLoadingEntry from the PendingTypeLoadTable. This can cause hang in situation when the current
// thread is a background thread and so will get very less processor cycle to perform subsequent
// operations to remove the entry from hash later.
pLoadingEntry->UnblockWaiters();
Expand Down
Loading