2003-08-27 Zoltan Varga <vargaz@freemail.hu>

	* interp.c: Get rid of metadata_section.

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

diff --git a/mono/interpreter/ChangeLog b/mono/interpreter/ChangeLog
index 2382f69076d140a3450c23cedd8debf8b32024e7..fa88c1f0e4298b1c830c63692fe63ceefbab22ef 100644 (file)
--- a/mono/interpreter/ChangeLog
+++ b/mono/interpreter/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-27  Zoltan Varga  <vargaz@freemail.hu>
+
+       * interp.c: Get rid of metadata_section.
+
 2003-08-22  Zoltan Varga  <vargaz@freemail.hu>
 
        * interp.c (main): Call g_thread_init () to make glib thread-safe. 

diff --git a/mono/interpreter/interp.c b/mono/interpreter/interp.c
index 47aa1cb4ea3b9e6fd8fe4ba6cd1bd1c5cf82af0f..bbbbb3347e6a1e3f92409a8faca3c492797fd6d5 100644 (file)
--- a/mono/interpreter/interp.c
+++ b/mono/interpreter/interp.c
@@ -892,8 +892,6 @@ calc_offsets (MonoImage *image, MonoMethod *method)
        }
        offsets [1] = offset;
 
-       /* FIXME: This might cause a deadlock with domain->lock */
-       EnterCriticalSection (metadata_section);
        /* intern the strings in the method. */
        ip = header->code;
        end = ip + header->code_size;
@@ -991,7 +989,6 @@ calc_offsets (MonoImage *image, MonoMethod *method)
                if (strcmp (method->name, "GetElementType") == 0)
                        method->addr = GUINT_TO_POINTER (INLINE_TYPE_ELEMENT_TYPE);
        }
-       LeaveCriticalSection (metadata_section);
        mono_profiler_method_end_jit (method, MONO_PROFILE_OK);
 }
 
@@ -4635,8 +4632,6 @@ main (int argc, char *argv [])
        mono_install_stack_walk (interp_walk_stack);
        mono_runtime_install_cleanup (quit_function);
 
-       metadata_section = &ms;
-       InitializeCriticalSection (metadata_section);
        domain = mono_init (file);
        mono_runtime_init (domain, NULL, NULL);