Skip to content

R
runtime

dotNET Platform / runtime
12 个月 前同步成功

通知 1
Star 1
Fork 0
R
runtime

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 f648c546 编写于 作者: E Elinor Fung 提交者： GitHub
浏览文件
操作

Remove unused code in app domain (#204)

上级 316152ac
隐藏空白更改
内联 并排
Showing with 43 addition and 345 deletion
src/coreclr/src/vm/appdomain.cpp
浏览文件 @ f648c546
......@@ -648,8 +648,6 @@ BaseDomain::BaseDomain()
}
CONTRACTL_END;
m_fDisableInterfaceCache = FALSE;
m_pTPABinderContext = NULL;
// Make sure the container is set to NULL so that it gets loaded when it is used.
......@@ -912,33 +910,6 @@ void AppDomain::SetNativeDllSearchDirectories(LPCWSTR wszNativeDllSearchDirector
}
}
void AppDomain::ReleaseFiles()
{
STANDARD_VM_CONTRACT;
// Shutdown assemblies
AssemblyIterator i = IterateAssembliesEx((AssemblyIterationFlags)(
kIncludeLoaded | kIncludeExecution | kIncludeFailedToLoad | kIncludeLoading));
CollectibleAssemblyHolder<DomainAssembly *> pAsm;
while (i.Next(pAsm.This()))
{
if (pAsm->GetCurrentAssembly() == NULL)
{
// Might be domain neutral or not, but should have no live objects as it has not been
// really loaded yet. Just reset it.
_ASSERTE(FitsIn<DWORD>(i.GetIndex()));
m_Assemblies.Set(this, static_cast<DWORD>(i.GetIndex()), NULL);
delete pAsm.Extract();
}
else
{
pAsm->ReleaseFiles();
}
}
} // AppDomain::ReleaseFiles
OBJECTREF* BaseDomain::AllocateObjRefPtrsInLargeTable(int nRequested, OBJECTREF** ppLazyAllocate)
{
CONTRACTL
......@@ -1026,29 +997,6 @@ void AppDomain::InsertClassForCLSID(MethodTable* pMT, BOOL fForceInsert /*=FALSE
}
}
void AppDomain::InsertClassForCLSID(MethodTable* pMT, GUID *pGuid)
{
CONTRACT_VOID
{
NOTHROW;
PRECONDITION(CheckPointer(pMT));
PRECONDITION(CheckPointer(pGuid));
}
CONTRACT_END;
LPVOID val = (LPVOID)pMT;
{
LockHolder lh(this);
CVID* cvid = pGuid;
if (LookupClass(*cvid) != pMT)
{
m_clsidHash.InsertValue(GetKeyFromGUID(pGuid), val);
}
}
RETURN;
}
#endif // DACCESS_COMPILE
#ifdef FEATURE_COMINTEROP
......@@ -2786,8 +2734,6 @@ AppDomain::AppDomain()
#ifdef _DEBUG
m_dwIterHolders=0;
m_dwRefTakers=0;
m_dwCreationHolders=0;
#endif
#ifdef FEATURE_TYPEEQUIVALENCE
......@@ -2819,8 +2765,6 @@ AppDomain::~AppDomain()
#ifndef CROSSGEN_COMPILE
_ASSERTE(m_dwCreationHolders == 0);
// release the TPIndex. note that since TPIndex values are recycled the TPIndex
// can only be released once all threads in the AppDomain have exited.
if (GetTPIndex().m_dwIndex != 0)
......
src/coreclr/src/vm/appdomain.hpp
浏览文件 @ f648c546
......@@ -966,15 +966,6 @@ public:
return NULL;
}
void SetDisableInterfaceCache()
{
m_fDisableInterfaceCache = TRUE;
}
BOOL GetDisableInterfaceCache()
{
return m_fDisableInterfaceCache;
}
#ifdef FEATURE_COMINTEROP
MngStdInterfacesInfo * GetMngStdInterfacesInfo()
{
......@@ -1166,7 +1157,6 @@ protected:
// Used to protect the assembly list. Taken also by GC or debugger thread, therefore we have to avoid
// triggering GC while holding this lock (by switching the thread to GC_NOTRIGGER while it is held).
CrstExplicitInit m_crstAssemblyList;
BOOL m_fDisableInterfaceCache; // RCW COM interface cache
ListLock m_ClassInitLock;
JitListLock m_JITLock;
ListLock m_ILStubGenLock;
......@@ -1676,8 +1666,6 @@ public:
// final assembly cleanup
void ShutdownFreeLoaderAllocators();
void ReleaseFiles();
virtual BOOL IsAppDomain() { LIMITED_METHOD_DAC_CONTRACT; return TRUE; }
virtual PTR_AppDomain AsAppDomain() { LIMITED_METHOD_CONTRACT; return dac_cast<PTR_AppDomain>(this); }
......@@ -2034,7 +2022,6 @@ public:
PEAssembly* FindCachedFile(AssemblySpec* pSpec, BOOL fThrow = TRUE);
BOOL IsCached(AssemblySpec *pSpec);
#endif // DACCESS_COMPILE
void CacheStringsForDAC();
BOOL AddFileToCache(AssemblySpec* pSpec, PEAssembly *pFile, BOOL fAllowFailure = FALSE);
BOOL RemoveFileFromCache(PEAssembly *pFile);
......@@ -2132,7 +2119,6 @@ public:
// Create a quick lookup for classes loaded into this domain based on their GUID.
//
void InsertClassForCLSID(MethodTable* pMT, BOOL fForceInsert = FALSE);
void InsertClassForCLSID(MethodTable* pMT, GUID *pGuid);
#ifdef FEATURE_COMINTEROP
private:
......@@ -2275,29 +2261,6 @@ public:
static void ExceptionUnwind(Frame *pFrame);
static void RefTakerAcquire(AppDomain* pDomain)
{
WRAPPER_NO_CONTRACT;
if(!pDomain)
return;
pDomain->AddRef();
#ifdef _DEBUG
FastInterlockIncrement(&pDomain->m_dwRefTakers);
#endif
}
static void RefTakerRelease(AppDomain* pDomain)
{
WRAPPER_NO_CONTRACT;
if(!pDomain)
return;
#ifdef _DEBUG
_ASSERTE(pDomain->m_dwRefTakers);
FastInterlockDecrement(&pDomain->m_dwRefTakers);
#endif
pDomain->Release();
}
#ifdef _DEBUG
BOOL IsHeldByIterator()
......@@ -2306,12 +2269,6 @@ public:
return m_dwIterHolders>0;
}
BOOL IsHeldByRefTaker()
{
LIMITED_METHOD_CONTRACT;
return m_dwRefTakers>0;
}
void IteratorRelease()
{
LIMITED_METHOD_CONTRACT;
......@@ -2333,16 +2290,7 @@ public:
return m_Stage >= STAGE_ACTIVE;
}
// Range for normal execution of code in the appdomain, currently used for
// appdomain resource monitoring since we don't care to update resource usage
// unless it's in these stages (as fields of AppDomain may not be valid if it's
// not within these stages)
BOOL IsUserActive()
{
LIMITED_METHOD_DAC_CONTRACT;
return m_Stage >= STAGE_ACTIVE && m_Stage <= STAGE_OPEN;
}
BOOL IsValid()
{
LIMITED_METHOD_DAC_CONTRACT;
......@@ -2356,36 +2304,6 @@ public:
#endif
}
#ifdef _DEBUG
BOOL IsBeingCreated()
{
LIMITED_METHOD_CONTRACT;
return m_dwCreationHolders > 0;
}
void IncCreationCount()
{
LIMITED_METHOD_CONTRACT;
FastInterlockIncrement(&m_dwCreationHolders);
_ASSERTE(m_dwCreationHolders > 0);
}
void DecCreationCount()
{
LIMITED_METHOD_CONTRACT;
FastInterlockDecrement(&m_dwCreationHolders);
_ASSERTE(m_dwCreationHolders > -1);
}
#endif
BOOL NotReadyForManagedCode()
{
LIMITED_METHOD_CONTRACT;
return m_Stage < STAGE_READYFORMANAGEDCODE;
}
static void RaiseExitProcessEvent();
Assembly* RaiseResourceResolveEvent(DomainAssembly* pAssembly, LPCSTR szName);
......@@ -2595,8 +2513,6 @@ private:
#ifdef _DEBUG
Volatile<LONG> m_dwIterHolders;
Volatile<LONG> m_dwRefTakers;
Volatile<LONG> m_dwCreationHolders;
#endif
//
......@@ -2830,11 +2746,6 @@ public:
#endif
}; // class AppDomain
// This holder is to be used to take a reference to make sure AppDomain* is still valid
// Please do not use if you are aleady ADU-safe
typedef Wrapper<AppDomain*,AppDomain::RefTakerAcquire,AppDomain::RefTakerRelease,NULL> AppDomainRefTaker;
// Just a ref holder
typedef ReleaseHolder<AppDomain> AppDomainRefHolder;
......
src/coreclr/src/vm/ceeload.cpp
浏览文件 @ f648c546
......@@ -3339,15 +3339,6 @@ void Module::StartUnload()
}
#endif // CROSSGEN_COMPILE
void Module::ReleaseILData(void)
{
WRAPPER_NO_CONTRACT;
ReleaseISymUnmanagedReader();
}
//---------------------------------------------------------------------------------------
//
// Simple wrapper around calling IsAfContentType_WindowsRuntime() against the flags
......@@ -13225,18 +13216,6 @@ void ReflectionModule::ResumeMetadataCapture()
CaptureModuleMetaDataToMemory();
}
void ReflectionModule::ReleaseILData()
{
WRAPPER_NO_CONTRACT;
if (m_pISymUnmanagedWriter)
{
m_pISymUnmanagedWriter->Release();
m_pISymUnmanagedWriter = NULL;
}
Module::ReleaseILData();
}
#endif // !CROSSGEN_COMPILE
#endif // !DACCESS_COMPILE
......
src/coreclr/src/vm/ceeload.h
浏览文件 @ f648c546
......@@ -2053,9 +2053,6 @@ protected:
// concurrently with other uses of the reader (i.e. not shutdown/unload time)
void ReleaseISymUnmanagedReader(void);
virtual void ReleaseILData();
#endif // DACCESS_COMPILE
// IL stub cache
......@@ -3307,8 +3304,6 @@ public:
static ReflectionModule *Create(Assembly *pAssembly, PEFile *pFile, AllocMemTracker *pamTracker, LPCWSTR szName, BOOL fIsTransient);
void Initialize(AllocMemTracker *pamTracker, LPCWSTR szName);
void Destruct();
void ReleaseILData();
#endif // !DACCESS_COMPILE && !CROSSGEN_COMPILE
// Overides functions to access sections
......
src/coreclr/src/vm/domainfile.cpp
浏览文件 @ f648c546
......@@ -109,47 +109,6 @@ LoaderAllocator * DomainFile::GetLoaderAllocator()
#ifndef DACCESS_COMPILE
void DomainFile::ReleaseFiles()
{
WRAPPER_NO_CONTRACT;
Module* pModule=GetCurrentModule();
if(pModule)
pModule->StartUnload();
if (m_pFile)
m_pFile->ReleaseIL();
if(m_pOriginalFile)
m_pOriginalFile->ReleaseIL();
if(pModule)
pModule->ReleaseILData();
}
BOOL DomainFile::TryEnsureActive()
{
CONTRACT(BOOL)
{
INSTANCE_CHECK;
THROWS;
GC_TRIGGERS;
}
CONTRACT_END;
BOOL success = TRUE;
EX_TRY
{
EnsureActive();
}
EX_CATCH
{
success = FALSE;
}
EX_END_CATCH(RethrowTransientExceptions);
RETURN success;
}
// Optimization intended for EnsureLoadLevel only
#include <optsmallperfcritical.h>
void DomainFile::EnsureLoadLevel(FileLoadLevel targetLevel)
......@@ -1262,22 +1221,6 @@ DomainAssembly::~DomainAssembly()
}
}
void DomainAssembly::ReleaseFiles()
{
STANDARD_VM_CONTRACT;
if(m_pAssembly)
m_pAssembly->StartUnload();
ModuleIterator i = IterateModules(kModIterIncludeLoading);
while (i.Next())
{
if (i.GetDomainFile() != this)
i.GetDomainFile()->ReleaseFiles();
}
DomainFile::ReleaseFiles();
}
void DomainAssembly::SetAssembly(Assembly* pAssembly)
{
STANDARD_VM_CONTRACT;
......
src/coreclr/src/vm/domainfile.h
浏览文件 @ f648c546
......@@ -139,9 +139,6 @@ class DomainFile
}
#endif
void ReleaseFiles() DAC_EMPTY();
virtual BOOL IsAssembly() = 0;
DomainAssembly *GetDomainAssembly();
......@@ -221,9 +218,6 @@ class DomainFile
return EnsureLoadLevel(FILE_LOAD_LOADLIBRARY);
}
// This wraps EnsureActive, suppressing non-transient exceptions
BOOL TryEnsureActive();
// EnsureLoadLevel is a generic routine used to ensure that the file is not in a delay loaded
// state (unless it needs to be.) This should be used when a particular level of loading
// is required for an operation. Note that deadlocks are tolerated so the level may be one
......@@ -500,10 +494,6 @@ public:
return m_pLoaderAllocator;
}
#ifndef DACCESS_COMPILE
void ReleaseFiles();
#endif // DACCESS_COMPILE
// Finds only loaded hmods
DomainFile *FindIJWModule(HMODULE hMod);
......
src/coreclr/src/vm/pefile.cpp
浏览文件 @ f648c546
......@@ -132,24 +132,6 @@ PEFile::~PEFile()
}
}
#ifndef DACCESS_COMPILE
void PEFile::ReleaseIL()
{
WRAPPER_NO_CONTRACT;
if (m_openedILimage!=NULL )
{
ReleaseMetadataInterfaces(TRUE, TRUE);
if (m_identity != NULL)
{
m_identity->Release();
m_identity=NULL;
}
m_openedILimage->Release();
m_openedILimage = NULL;
}
}
#endif
/* static */
PEFile *PEFile::Open(PEImage *image)
{
......@@ -1993,31 +1975,7 @@ PEAssembly::~PEAssembly()
}
#ifndef DACCESS_COMPILE
void PEAssembly::ReleaseIL()
{
CONTRACTL
{
INSTANCE_CHECK;
NOTHROW;
GC_TRIGGERS;
MODE_ANY;
}
CONTRACTL_END;
GCX_PREEMP();
if (m_creator != NULL)
{
m_creator->Release();
m_creator=NULL;
}
PEFile::ReleaseIL();
}
#endif
/* static */
PEAssembly *PEAssembly::OpenSystem(IUnknown * pAppCtx)
{
STANDARD_VM_CONTRACT;
......
src/coreclr/src/vm/pefile.h
浏览文件 @ f648c546
......@@ -420,8 +420,6 @@ protected:
#ifndef DACCESS_COMPILE
PEFile(PEImage *image);
virtual ~PEFile();
virtual void ReleaseIL();
#else
virtual ~PEFile() {}
#endif
......@@ -639,10 +637,6 @@ class PEAssembly : public PEFile
ULONG HashIdentity();
#ifndef DACCESS_COMPILE
virtual void ReleaseIL();
#endif
// ------------------------------------------------------------
// Descriptive strings
// ------------------------------------------------------------
......
src/coreclr/src/vm/runtimecallablewrapper.cpp
浏览文件 @ f648c546
......@@ -2125,8 +2125,7 @@ RCW* RCW::CreateRCWInternal(IUnknown *pUnk, DWORD dwSyncBlockIndex, DWORD flags,
}
AppDomain * pAppDomain = GetAppDomain();
if((flags & CF_QueryForIdentity) ||
(pAppDomain && pAppDomain->GetDisableInterfaceCache()))
if(flags & CF_QueryForIdentity)
{
IUnknown *pUnkTemp = NULL;
HRESULT hr = SafeQueryInterfacePreemp(pUnk, IID_IUnknown, &pUnkTemp);
......@@ -3966,81 +3965,66 @@ IUnknown* RCW::GetComIPForMethodTableFromCache(MethodTable* pMT)
if (pUnk == NULL)
RETURN NULL;
// See if we should cache the result in the fast inline cache. This cache can only store interface pointers
// returned from QI's in the same context where we created the RCW.
bool fAllowCache = true;
bool fAllowOutOfContextCache = true;
if (!pMT->IsProjectedFromWinRT() && !pMT->IsWinRTRedirectedInterface(TypeHandle::Interop_ManagedToNative) && !pMT->IsWinRTRedirectedDelegate())
{
AppDomain *pAppDomain = GetAppDomain();
if (pAppDomain && pAppDomain->GetDisableInterfaceCache())
{
// Caching is disabled in this AD
fAllowCache = false;
}
else
{
// This is not a WinRT interface and we could in theory use the out-of-context auxiliary cache,
// at worst we would just do
// fAllowOutOfContextCache = !IsURTAggregated()
// however such a change has some breaking potential (COM proxies would live much longer) and is
// considered to risky for an in-place release.
// This is not a WinRT interface and we could in theory use the out-of-context auxiliary cache,
// at worst we would just do
// fAllowOutOfContextCache = !IsURTAggregated()
// however such a change has some breaking potential (COM proxies would live much longer) and is
// considered to risky for an in-place release.
fAllowOutOfContextCache = false;
}
fAllowOutOfContextCache = false;
}
// try to cache the interface pointer in the inline cache
// try to cache the interface pointer in the inline cache. This cache can only store interface pointers
// returned from QI's in the same context where we created the RCW.
bool fInterfaceCached = false;
if (fAllowCache)
if (GetWrapperCtxCookie() == pCtxCookie || IsFreeThreaded())
{
if (GetWrapperCtxCookie() == pCtxCookie || IsFreeThreaded())
for (i = 0; i < INTERFACE_ENTRY_CACHE_SIZE; i++)
{
for (i = 0; i < INTERFACE_ENTRY_CACHE_SIZE; i++)
if (m_aInterfaceEntries[i].IsFree() && m_aInterfaceEntries[i].Init(pMT, pUnk))
{
if (m_aInterfaceEntries[i].IsFree() && m_aInterfaceEntries[i].Init(pMT, pUnk))
// If the component is not aggregated then we need to ref-count
if (!IsURTAggregated())
{
// If the component is not aggregated then we need to ref-count
if (!IsURTAggregated())
{
// Get an extra addref to hold this reference alive in our cache
cbRef = SafeAddRef(pUnk);
LogInteropAddRef(pUnk, cbRef, "RCW::GetComIPForMethodTableFromCache: Addref because storing pUnk in InterfaceEntry cache");
// Notify Jupiter we have done a AddRef
// We should do this *after* we made a AddRef because we should never
// be in a state where report refs > actual refs
RCWWalker::AfterInterfaceAddRef(this);
}
fInterfaceCached = true;
break;
// Get an extra addref to hold this reference alive in our cache
cbRef = SafeAddRef(pUnk);
LogInteropAddRef(pUnk, cbRef, "RCW::GetComIPForMethodTableFromCache: Addref because storing pUnk in InterfaceEntry cache");
// Notify Jupiter we have done a AddRef
// We should do this *after* we made a AddRef because we should never
// be in a state where report refs > actual refs
RCWWalker::AfterInterfaceAddRef(this);
}
fInterfaceCached = true;
break;
}
}
}
if (!fInterfaceCached && fAllowOutOfContextCache)
{
// We couldn't insert into the inline cache, either because it didn't fit, or because
// we are in a wrong COM context. We'll use the RCWAuxiliaryData structure.
GetOrCreateAuxiliaryData()->CacheInterfacePointer(pMT, pUnk, (IsFreeThreaded() ? NULL : pCtxCookie));
// If the component is not aggregated then we need to ref-count
if (!IsURTAggregated())
{
// Get an extra addref to hold this reference alive in our cache
cbRef = SafeAddRef(pUnk);
LogInteropAddRef(pUnk, cbRef, "RCW::GetComIPForMethodTableFromCache: Addref because storing pUnk in the auxiliary interface pointer cache");
if (!fInterfaceCached && fAllowOutOfContextCache)
{
// We couldn't insert into the inline cache, either because it didn't fit, or because
// we are in a wrong COM context. We'll use the RCWAuxiliaryData structure.
GetOrCreateAuxiliaryData()->CacheInterfacePointer(pMT, pUnk, (IsFreeThreaded() ? NULL : pCtxCookie));
// Notify Jupiter we have done a AddRef
// We should do this *after* we made a AddRef because we should never
// be in a state where report refs > actual refs
RCWWalker::AfterInterfaceAddRef(this);
}
// If the component is not aggregated then we need to ref-count
if (!IsURTAggregated())
{
// Get an extra addref to hold this reference alive in our cache
cbRef = SafeAddRef(pUnk);
LogInteropAddRef(pUnk, cbRef, "RCW::GetComIPForMethodTableFromCache: Addref because storing pUnk in the auxiliary interface pointer cache");
fInterfaceCached = true;
// Notify Jupiter we have done a AddRef
// We should do this *after* we made a AddRef because we should never
// be in a state where report refs > actual refs
RCWWalker::AfterInterfaceAddRef(this);
}
fInterfaceCached = true;
}
// Make sure we cache successful QI's for variant interfaces. This is so we can cast an RCW for
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或