This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
[WIP] Collectible Assemblies and AssemblyLoadContext #8677
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,7 +17,29 @@ namespace BINDER_SPACE | |
| class AssemblyIdentityUTF8; | ||
| }; | ||
|
|
||
| class AppDomain; | ||
|
|
||
| #ifdef FEATURE_COLLECTIBLE_ALC | ||
|
|
||
| class Object; | ||
| class Assembly; | ||
| class LoaderAllocator; | ||
|
|
||
| class DECLSPEC_UUID("68220E65-3D3F-42E2-BAD6-2D07419DAB5E") ICollectibleAssemblyLoadContext : public IUnknown | ||
| { | ||
| public: | ||
| STDMETHOD(GetLoaderAllocator)( | ||
| /* [retval][out] */ LoaderAllocator** pLoaderAllocator) = 0; | ||
| }; | ||
|
|
||
| #endif // FEATURE_COLLECTIBLE_ALC | ||
|
|
||
| class CLRPrivBinderAssemblyLoadContext : | ||
| #ifndef FEATURE_COLLECTIBLE_ALC | ||
| public IUnknownCommon<ICLRPrivBinder> | ||
| #else // !FEATURE_COLLECTIBLE_ALC | ||
| public IUnknownCommon<ICLRPrivBinder, ICollectibleAssemblyLoadContext> | ||
| #endif // FEATURE_COLLECTIBLE_ALC | ||
| { | ||
| public: | ||
|
|
||
|
|
@@ -45,14 +67,35 @@ class CLRPrivBinderAssemblyLoadContext : public IUnknownCommon<ICLRPrivBinder> | |
| /* [out] */ HRESULT *pResult, | ||
| /* [out] */ ICLRPrivAssembly **ppAssembly); | ||
|
|
||
| #ifdef FEATURE_COLLECTIBLE_ALC | ||
|
|
||
| //========================================================================= | ||
| // IAssemblyLoadContext functions | ||
| //------------------------------------------------------------------------- | ||
| STDMETHOD(GetLoaderAllocator)( | ||
| /* [retval][out] */ LoaderAllocator** pLoaderAllocator); | ||
|
|
||
| #endif // FEATURE_COLLECTIBLE_ALC | ||
|
|
||
| public: | ||
| //========================================================================= | ||
| // Class functions | ||
| //------------------------------------------------------------------------- | ||
|
|
||
| static HRESULT SetupContext(DWORD dwAppDomainId, | ||
| CLRPrivBinderCoreCLR *pTPABinder, | ||
| #ifdef FEATURE_COLLECTIBLE_ALC | ||
| LoaderAllocator* pLoaderAllocator, | ||
| void* loaderAllocatorHandle, | ||
| #endif | ||
| UINT_PTR ptrAssemblyLoadContext, | ||
| CLRPrivBinderAssemblyLoadContext **ppBindContext); | ||
|
|
||
| #ifdef FEATURE_COLLECTIBLE_ALC | ||
| void PrepareForLoadContextRelease(INT_PTR ptrManagedStrongAssemblyLoadContext); | ||
| void ReleaseLoadContext(); | ||
| #endif | ||
|
|
||
| CLRPrivBinderAssemblyLoadContext(); | ||
|
|
||
| inline BINDER_SPACE::ApplicationContext *GetAppContext() | ||
|
|
@@ -80,6 +123,11 @@ class CLRPrivBinderAssemblyLoadContext : public IUnknownCommon<ICLRPrivBinder> | |
| CLRPrivBinderCoreCLR *m_pTPABinder; | ||
|
|
||
| INT_PTR m_ptrManagedAssemblyLoadContext; | ||
|
|
||
|
There was a problem hiding this comment. Shouldnt these fields be under #ifdef FEATURE_COLLECTIBLE_ALC? There was a problem hiding this comment. hm actually maybe no, the field is used indirectly through GetManagedAssemblyLoadContext() which was already there before collectible ALC. There was a problem hiding this comment. I was referring to the loadAllocator fields below :) There was a problem hiding this comment. Errata, fixed by commit c3dfee1 |
||
| #ifdef FEATURE_COLLECTIBLE_ALC | ||
| LoaderAllocator* m_pAssemblyLoaderAllocator; | ||
| void* m_loaderAllocatorHandle; | ||
| #endif | ||
| }; | ||
|
|
||
| #endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1051,6 +1051,9 @@ | |
| </Type> | ||
| <Type Name="System.Runtime.Loader.AssemblyLoadContext" condition="FEATURE_HOST_ASSEMBLY_RESOLVER"> | ||
| <Member Name="#ctor" /> | ||
| <Member Name="#ctor(System.Boolean)" Condition="FEATURE_COLLECTIBLE_ALC"/> | ||
|
There was a problem hiding this comment. New public APIs can't be conditioned here either since System.Runtime.Loader type-forwards There was a problem hiding this comment. Commit 63993c5 should fix this. |
||
| <Member Name="Finalize" Condition="FEATURE_COLLECTIBLE_ALC"/> | ||
| <Member MemberType="Property" Name="IsCollectible" Condition="FEATURE_COLLECTIBLE_ALC"/> | ||
| <Member MemberType="Property" Name="Default" /> | ||
| <Member Name="GetAssemblyName(System.String)" /> | ||
| <Member Name="GetLoadContext(System.Reflection.Assembly)" /> | ||
|
|
@@ -1063,8 +1066,12 @@ | |
| <Member Name="Resolve(System.IntPtr,System.Reflection.AssemblyName)" /> | ||
| <Member Name="ResolveUsingResolvingEvent(System.IntPtr,System.Reflection.AssemblyName)" /> | ||
| <Member Name="ResolveUnmanagedDll(System.String,System.IntPtr)" /> | ||
| <Member Name="OnUnloadingStatic(System.IntPtr)" Condition="FEATURE_COLLECTIBLE_ALC"/> | ||
| <Member Name="OnUnloading" /> | ||
| <Member Name="LoadUnmanagedDll(System.String)" /> | ||
| <Member Name="LoadUnmanagedDllFromPath(System.String)" /> | ||
| <Member Name="Unload" Condition="FEATURE_COLLECTIBLE_ALC"/> | ||
| <Member Name="UnloadCollectible" Condition="FEATURE_COLLECTIBLE_ALC"/> | ||
| <Member Name="GetLoadedAssemblies" /> | ||
| <Member Name="get_Default" /> | ||
| <Member Name="SetProfileOptimizationRoot(System.String)" /> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
DestroyContext implementation (earlier) assumes that
m_ptrManagedAssemblyLoadContextis a weak handle while this one does not? How is this consistency being maintained (or what are invariants here)?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually,
DestroyContextswitchedm_ptrManagedAssemblyLoadContextfrom a weak to a strong handle.This method is called later by
AssemblyLoaderAllocator::OnUnloadingto actually let the managedAssemblyLoadContextto be finalized (if necessary).Maybe we should rename these methods
DestroyContextandReleaseManagedAssemblyLoadContextto better reflect their actual behaviorThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree - the naming update, and comments, would be helpful here. I would suggest DestroyContext to be something like PrepareForLoadContextRelease and ReleaseManagedAssemblyLoadContext to be ReleaseLoadContext (so that, in future, additional cleanup can be added that is not related to managed instance).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Partially fixed by commit 0cc6d4d (comments may have to be improved)