ryujinx/GtkSharp
1
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2024-12-24 16:45:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

2008-09-24 Mike Kestner <mkestner@novell.com>

Browse source 
* glib/GType.cs: kill the FindTypeInReferences recursive loading
	algorithm and instead do a name-based search through the references
	of loaded assemblies only.  Fixes the original bug #400595 and it
	hopefully will have fewer sideeffects that the recursive loading
	approach.

svn path=/trunk/gtk-sharp/; revision=114008
This commit is contained in:
Mike Kestner 2008-09-24 20:06:47 +00:00
parent ead904c8a3
commit 51299b17bb
2 changed files with 33 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-09-24 Mike Kestner <mkestner@novell.com>
* glib/GType.cs: kill the FindTypeInReferences recursive loading
algorithm and instead do a name-based search through the references
of loaded assemblies only. Fixes the original bug #400595 and it
hopefully will have fewer sideeffects that the recursive loading
approach.
2008-09-24 Mike Kestner <mkestner@novell.com> 2008-09-24 Mike Kestner <mkestner@novell.com>
* glib/GType.cs: just fail on location null or empty instead of * glib/GType.cs: just fail on location null or empty instead of

56
glib/GType.cs
View file

@ -152,35 +152,6 @@ namespace GLib {
// cctor already calls g_type_init. // cctor already calls g_type_init.
} }
static Type FindTypeInReferences (string type_name, Assembly asm, Hashtable visited)
{
if (visited.Contains (asm))
return null;
visited [asm] = asm;
Type result = asm.GetType (type_name);
if (result == null) {
if (asm.Location == null || asm.Location.Length == 0)
return null;
string asm_dir = Path.GetDirectoryName (asm.Location);
foreach (AssemblyName ref_name in asm.GetReferencedAssemblies ()) {
Assembly ref_asm;
try {
if (File.Exists (Path.Combine (asm_dir, ref_name.Name + ".dll")))
ref_asm = Assembly.LoadFrom (Path.Combine (asm_dir, ref_name.Name + ".dll"));
else
ref_asm = Assembly.Load (ref_name);
result = FindTypeInReferences (type_name, ref_asm, visited);
if (result != null)
break;
} catch (Exception) {
/* Failure to load a referenced assembly is not an error */
}
}
}
return result;
}
public static Type LookupType (IntPtr typeid) public static Type LookupType (IntPtr typeid)
{ {
if (types.Contains (typeid)) if (types.Contains (typeid))
@ -197,9 +168,32 @@ namespace GLib {
} }
if (result == null) { if (result == null) {
Hashtable visited = new Hashtable (); // Because of lazy loading of references, it's possible the type's assembly
// needs to be loaded. We will look for it by name in the references of
// the currently loaded assemblies. Hopefully a recursive traversal is
// not needed. We avoid one for now because of problems experienced
// in a patch from bug #400595, and a desire to keep memory usage low
// by avoiding a complete loading of all dependent assemblies.
string ns = type_name.Substring (0, type_name.LastIndexOf ('.'));
string asm_name = ns.ToLower ().Replace ('.', '-') + "-sharp";
foreach (Assembly asm in assemblies) { foreach (Assembly asm in assemblies) {
result = FindTypeInReferences (type_name, asm, visited); foreach (AssemblyName ref_name in asm.GetReferencedAssemblies ()) {
if (ref_name.Name != asm_name)
continue;
string asm_dir = Path.GetDirectoryName (asm.Location);
try {
Assembly ref_asm;
if (File.Exists (Path.Combine (asm_dir, ref_name.Name + ".dll")))
ref_asm = Assembly.LoadFrom (Path.Combine (asm_dir, ref_name.Name + ".dll"));
else
ref_asm = Assembly.Load (ref_name);
result = ref_asm.GetType (type_name);
if (result != null)
break;
} catch (Exception) {
/* Failure to load a referenced assembly is not an error */
}
}
if (result != null) if (result != null)
break; break;
} }