[Java.Interop.Tools.Cecil] use MemoryMappedFile in DirectoryAssemblyResolver #1103
Conversation
This file contains hidden or 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
…esolver Context: dotnet/linker#1130 Context: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1783420 In dotnet/linker#1130, their version of `DirectoryAssemblyResolver` was reworked to use `MemoryMappedFile` in the .NET 6 timeframe. This commit ports these changes here, as we have MSBuild tasks in xamarin/xamarin-android that use `DirectoryAssemblyResolver`. Primarily, the `<GenerateJavaStubs />` MSBuild task uses `DirectoryAssemblyResolver` to iterate over types in assembly to emit Java source code and generate `AndroidManifest.xml`. The results of these changes in a `dotnet new maui` project, an initial clean build: GenerateJavaStubs = 1.318 s, 1 calls. GenerateJavaStubs = 1.254 s, 1 calls. Saving ~64ms or about ~5% in this example. The current version of the linker's resolver in .NET 8+ has moved to the dotnet/runtime repo at: https://github.com/dotnet/runtime/blob/cd7d006030a7feace9076fa275fb5bffc1bf4a90/src/tools/illink/src/linker/Linker/AssemblyResolver.cs
dellis1972
reviewed
Apr 25, 2023
|
|
||
| public ICollection<string> SearchDirectories {get; private set;} | ||
|
|
||
| readonly List<MemoryMappedViewStream> viewStreams = new List<MemoryMappedViewStream> (); |
There was a problem hiding this comment.
Is there any chance this will be called on different threads?
There was a problem hiding this comment.
If you used the same DirectoryAssemblyResolver on different threads, I think it would already run into problems with Cecil. Such as: #43
Most of our usage is one per MSBuild task:
dellis1972
approved these changes
Apr 25, 2023
jonathanpeppers
added a commit
to jonathanpeppers/xamarin-android
that referenced
this pull request
Apr 25, 2023
|
Testing this here: dotnet/android#7991 |
|
It appears there is some subtle problem here: Maybe we can't do this in cases we are also going to write to the |
|
@jonpryor I think the latest on dotnet/android#7991 is green. I restarted one lane because 1 test failed. |
Formatting Fixes
jonpryor
pushed a commit
to dotnet/android
that referenced
this pull request
May 8, 2023
Changes: dotnet/java-interop@3c2a066...a91ae7f * dotnet/java-interop@a91ae7f9: [generator] improve *Implementor constructors (dotnet/java-interop#1105) * dotnet/java-interop@7d42864d: [Java.Interop.Tools.Cecil] DirectoryAssemblyResolver+MemoryMappedFile (dotnet/java-interop#1103) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Context: dotnet/linker#1130
Context: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1783420
In dotnet/linker#1130, their version of
DirectoryAssemblyResolverwas reworked to useMemoryMappedFilein the .NET 6 timeframe. This commit ports these changes here, as we have MSBuild tasks in xamarin/xamarin-android that useDirectoryAssemblyResolver.Primarily, the
<GenerateJavaStubs />MSBuild task usesDirectoryAssemblyResolverto iterate over types in assembly to emit Java source code and generateAndroidManifest.xml.The results of these changes in a
dotnet new mauiproject, an initial clean build:Saving ~64ms or about ~5% in this example.
The current version of the linker's resolver in .NET 8+ has moved to the dotnet/runtime repo at:
https://github.com/dotnet/runtime/blob/cd7d006030a7feace9076fa275fb5bffc1bf4a90/src/tools/illink/src/linker/Linker/AssemblyResolver.cs