Fri Oct 10 17:01:42 CEST 2008 Paolo Molaro <lupus@ximian.com>

	* assembly.c: in mono_assembly_load_friends() take the assemblies lock
	for the least possible amount of time (extending the fix in r113458).

svn path=/trunk/mono/; revision=115451

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 9005e66e67c52cd2942ce8851546619136dfc437..2382297f85bc8c7bfb960c4ac4927cbef195a84f 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+
+Fri Oct 10 17:01:42 CEST 2008 Paolo Molaro <lupus@ximian.com>
+
+       * assembly.c: in mono_assembly_load_friends() take the assemblies lock
+       for the least possible amount of time (extending the fix in r113458).
+
 2008-10-10  Rodrigo Kumpera  <rkumpera@novell.com>
 
        * class.c (mono_class_create_from_typedef): Retrofit to new type names.
@@ -11,7 +17,7 @@
 Thu Oct 9 17:38:24 CEST 2008 Paolo Molaro <lupus@ximian.com>
 
        * class.c: back out part of a broken optimization committed on
-       March 23th (bug #433908).
+       May 23th (bug #433908).
 
 2008-10-09  Mark Probst  <mark.probst@gmail.com>
 

diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c
index 500d2a38ed81ddb5669d49724e8d756b28081ec1..5c466be5acccceb67a51542fc193dfc3c5a6878a 100644 (file)
--- a/mono/metadata/assembly.c
+++ b/mono/metadata/assembly.c
@@ -1312,8 +1312,14 @@ mono_assembly_open_full (const char *filename, MonoImageOpenStatus *status, gboo
        return ass;
 }
 
+static void
+free_item (gpointer val, gpointer user_data)
+{
+       g_free (val);
+}
+
 /*
- * mono_load_friend_assemblies:
+ * mono_assembly_load_friends:
  * @ass: an assembly
  *
  * Load the list of friend assemblies that are allowed to access
@@ -1331,13 +1337,16 @@ mono_assembly_load_friends (MonoAssembly* ass)
 {
        int i;
        MonoCustomAttrInfo* attrs;
+       GSList *list;
 
        if (ass->friend_assembly_names_inited)
                return;
 
        attrs = mono_custom_attrs_from_assembly (ass);
        if (!attrs) {
+               mono_assemblies_lock ();
                ass->friend_assembly_names_inited = TRUE;
+               mono_assemblies_unlock ();
                return;
        }
 
@@ -1346,10 +1355,12 @@ mono_assembly_load_friends (MonoAssembly* ass)
                mono_assemblies_unlock ();
                return;
        }
+       mono_assemblies_unlock ();
 
+       list = NULL;
        /* 
-        * assemblies_lock () is a low level lock so the code below should not take 
-        * any locks.
+        * We build the list outside the assemblies lock, the worse that can happen
+        * is that we'll need to free the allocated list.
         */
        for (i = 0; i < attrs->num_attrs; ++i) {
                MonoCustomAttrEntry *attr = &attrs->attrs [i];
@@ -1369,13 +1380,22 @@ mono_assembly_load_friends (MonoAssembly* ass)
                aname = g_new0 (MonoAssemblyName, 1);
                /*g_print ("friend ass: %s\n", data);*/
                if (mono_assembly_name_parse_full (data, aname, TRUE, NULL, NULL)) {
-                       ass->friend_assembly_names = g_slist_prepend (ass->friend_assembly_names, aname);
+                       list = g_slist_prepend (list, aname);
                } else {
                        g_free (aname);
                }
        }
        mono_custom_attrs_free (attrs);
 
+       mono_assemblies_lock ();
+       if (ass->friend_assembly_names_inited) {
+               mono_assemblies_unlock ();
+               g_slist_foreach (list, free_item, NULL);
+               g_slist_free (list);
+               return;
+       }
+       ass->friend_assembly_names = list;
+
        /* Because of the double checked locking pattern above */
        mono_memory_barrier ();
        ass->friend_assembly_names_inited = TRUE;