Skip to content

[jnimarshalmethod-gen] Avoid creating AppDomains #720

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

Merged
jonpryor merged 1 commit into from
Sep 18, 2020
+2 −7
Merged

[jnimarshalmethod-gen] Avoid creating AppDomains #720

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions tools/jnimarshalmethod-gen/App.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,13 @@ class App : MarshalByRefObject

public static int Main (string [] args)
{
var domain = AppDomain.CreateDomain ("workspace");
var app = (App)domain.CreateInstanceAndUnwrap (typeof (App).Assembly.FullName, typeof (App).FullName);

var app = new App ();
app.AddMonoPathToResolverSearchDirectories ();

var assemblies = app.ProcessArguments (args);
app.ProcessAssemblies (assemblies);
var filesToDelete = app.FilesToDelete;

AppDomain.Unload (domain);

foreach (var path in filesToDelete)
File.Delete (path);

Expand Down Expand Up @@ -282,8 +278,7 @@ public int Compare (MethodInfo a, MethodInfo b)

void CreateMarshalMethodAssembly (string path)
{
var assembly = Assembly.LoadFile (Path.GetFullPath (path));

var assembly = Assembly.Load (File.ReadAllBytes (Path.GetFullPath (path)));
var baseName = Path.GetFileNameWithoutExtension (path);
var assemblyName = new AssemblyName (baseName + "-JniMarshalMethods");
var fileName = assemblyName.Name + ".dll";
Expand Down