2004-09-01 Martin Baulig <martin@ximian.com>

	* mono-debug.c, debug-mono-symfile.c: Use mono_loader_lock()
	instead of mono_debugger_lock() because the latter one is a no-op
	unless running in the debugger.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index e0aae7858e648e13e34b6116cb11ffc4bc7b025b..4bfe205d5a2618f4166d82eb71fe4f5efe1658b5 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-01  Martin Baulig  <martin@ximian.com>
+
+       * mono-debug.c, debug-mono-symfile.c: Use mono_loader_lock()
+       instead of mono_debugger_lock() because the latter one is a no-op
+       unless running in the debugger.
+
 2004-09-01  Zoltan Varga  <vargaz@freemail.hu>
 
        * class.c (class_compute_field_layout): Classes with auto-layout or

diff --git a/mono/metadata/debug-mono-symfile.c b/mono/metadata/debug-mono-symfile.c
index e6c3e826459448e17f3df431fa33e234fb40d8e7..2ec7ddc06c97628fd62833124984bcb0d82cf760 100644 (file)
--- a/mono/metadata/debug-mono-symfile.c
+++ b/mono/metadata/debug-mono-symfile.c
@@ -97,7 +97,7 @@ mono_debug_open_mono_symbol_file (MonoDebugHandle *handle, gboolean create_symfi
 {
        MonoSymbolFile *symfile;
 
-       mono_debugger_lock ();
+       mono_loader_lock ();
        symfile = g_new0 (MonoSymbolFile, 1);
 
        symfile->filename = g_strdup_printf ("%s.mdb", mono_image_get_filename (handle->image));
@@ -107,15 +107,15 @@ mono_debug_open_mono_symbol_file (MonoDebugHandle *handle, gboolean create_symfi
                symfile->raw_contents = NULL;
 
        if (load_symfile (handle, symfile)) {
-               mono_debugger_unlock ();
+               mono_loader_unlock ();
                return symfile;
        } else if (!create_symfile) {
                mono_debug_close_mono_symbol_file (symfile);
-               mono_debugger_unlock ();
+               mono_loader_unlock ();
                return NULL;
        }
 
-       mono_debugger_unlock ();
+       mono_loader_unlock ();
        return symfile;
 }
 
@@ -125,12 +125,12 @@ mono_debug_close_mono_symbol_file (MonoSymbolFile *symfile)
        if (!symfile)
                return;
 
-       mono_debugger_lock ();
+       mono_loader_lock ();
        if (symfile->method_hash)
                g_hash_table_destroy (symfile->method_hash);
 
        g_free (symfile);
-       mono_debugger_unlock ();
+       mono_loader_unlock ();
 }
 
 static int
@@ -170,15 +170,15 @@ mono_debug_find_source_location (MonoSymbolFile *symfile, MonoMethod *method, gu
        const char *ptr;
        int i;
 
-       mono_debugger_lock ();
+       mono_loader_lock ();
        if (!symfile->method_hash) {
-               mono_debugger_unlock ();
+               mono_loader_unlock ();
                return NULL;
        }
 
        minfo = g_hash_table_lookup (symfile->method_hash, method);
        if (!minfo) {
-               mono_debugger_unlock ();
+               mono_loader_unlock ();
                return NULL;
        }
 
@@ -200,7 +200,7 @@ mono_debug_find_source_location (MonoSymbolFile *symfile, MonoMethod *method, gu
 
                if (line_number) {
                        *line_number = read32(&(lne->_row));
-                       mono_debugger_unlock ();
+                       mono_loader_unlock ();
                        if (source_file)
                                return source_file;
                        else
@@ -208,16 +208,16 @@ mono_debug_find_source_location (MonoSymbolFile *symfile, MonoMethod *method, gu
                } else if (source_file) {
                        gchar *retval = g_strdup_printf ("%s:%d", source_file, read32(&(lne->_row)));
                        g_free (source_file);
-                       mono_debugger_unlock ();
+                       mono_loader_unlock ();
                        return retval;
                } else {
                        gchar* retval = g_strdup_printf ("%d", read32(&(lne->_row)));
-                       mono_debugger_unlock ();
+                       mono_loader_unlock ();
                        return retval;
                }
        }
 
-       mono_debugger_unlock ();
+       mono_loader_unlock ();
        return NULL;
 }
 
@@ -263,7 +263,7 @@ mono_debug_find_method (MonoDebugHandle *handle, MonoMethod *method)
        if (handle->image != mono_class_get_image (mono_method_get_class (method)))
                return NULL;
 
-       mono_debugger_lock ();
+       mono_loader_lock ();
        first_ie = (MonoSymbolFileMethodIndexEntry *)
                (symfile->raw_contents + read32(&(symfile->offset_table->_method_table_offset)));
 
@@ -272,7 +272,7 @@ mono_debug_find_method (MonoDebugHandle *handle, MonoMethod *method)
                                   sizeof (MonoSymbolFileMethodIndexEntry), compare_method);
 
        if (!ie) {
-               mono_debugger_unlock ();
+               mono_loader_unlock ();
                return NULL;
        }
 
@@ -289,6 +289,6 @@ mono_debug_find_method (MonoDebugHandle *handle, MonoMethod *method)
 
        g_hash_table_insert (symfile->method_hash, method, minfo);
 
-       mono_debugger_unlock ();
+       mono_loader_unlock ();
        return minfo;
 }

diff --git a/mono/metadata/mono-debug.c b/mono/metadata/mono-debug.c
index 5e24015f28853a7778fc53012134b35ffbe87456..32ab9992e319f673ede73b72024678fc315db2cc 100644 (file)
--- a/mono/metadata/mono-debug.c
+++ b/mono/metadata/mono-debug.c
@@ -67,7 +67,6 @@ mono_debug_init (MonoDebugFormat format)
        mono_debugger_start_class_init_func = mono_debug_start_add_type;
        mono_debugger_class_init_func = mono_debug_add_type;
        mono_install_assembly_load_hook (mono_debug_add_assembly, NULL);
-       mono_debugger_unlock ();
 }
 
 void
@@ -355,17 +354,17 @@ mono_debug_source_location_from_address (MonoMethod *method, guint32 address, gu
        MonoDebugMethodInfo *minfo;
        MonoDebugDomainData *domain_data;
 
-       mono_debugger_lock ();
+       mono_loader_lock ();
        minfo = _mono_debug_lookup_method (method);
        if (!minfo || !minfo->handle || !minfo->handle->symfile ||
            !minfo->handle->symfile->offset_table) {
-               mono_debugger_unlock ();
+               mono_loader_unlock ();
                return NULL;
        }
 
        domain_data = mono_debug_get_domain_data (minfo->handle, domain);
        if (!domain_data->jit [minfo->index]) {
-               mono_debugger_unlock ();
+               mono_loader_unlock ();
                return NULL;
        }
 
@@ -375,11 +374,11 @@ mono_debug_source_location_from_address (MonoMethod *method, guint32 address, gu
                
                if (offset >= 0)
                        res = mono_debug_find_source_location (minfo->handle->symfile, method, offset, line_number);
-               mono_debugger_unlock ();
+               mono_loader_unlock ();
                return res;
        }
 
-       mono_debugger_unlock ();
+       mono_loader_unlock ();
        return NULL;
 }
 
@@ -399,15 +398,15 @@ mono_debug_source_location_from_il_offset (MonoMethod *method, guint32 offset, g
        char *res;
        MonoDebugMethodInfo *minfo;
 
-       mono_debugger_lock ();
+       mono_loader_lock ();
        minfo = _mono_debug_lookup_method (method);
        if (!minfo || !minfo->handle || !minfo->handle->symfile) {
-               mono_debugger_unlock ();
+               mono_loader_unlock ();
                return NULL;
        }
 
        res = mono_debug_find_source_location (minfo->handle->symfile, method, offset, line_number);
-       mono_debugger_unlock ();
+       mono_loader_unlock ();
        return res;
 }
 
@@ -425,18 +424,18 @@ mono_debug_il_offset_from_address (MonoMethod *method, gint32 address, MonoDomai
        if (address < 0)
                return -1;
 
-       mono_debugger_lock ();
+       mono_loader_lock ();
        minfo = _mono_debug_lookup_method (method);
        if (!minfo || !minfo->il_offsets || !minfo->handle || !minfo->handle->symfile ||
            !minfo->handle->symfile->offset_table) {
-               mono_debugger_unlock ();
+               mono_loader_unlock ();
                return -1;
        }
 
        domain_data = mono_debug_get_domain_data (minfo->handle, domain);
 
        res = il_offset_from_address (domain_data->jit [minfo->index], address);
-       mono_debugger_unlock ();
+       mono_loader_unlock ();
        return res;
 }
 
@@ -454,18 +453,18 @@ mono_debug_address_from_il_offset (MonoMethod *method, gint32 il_offset, MonoDom
        if (il_offset < 0)
                return -1;
 
-       mono_debugger_lock ();
+       mono_loader_lock ();
        minfo = _mono_debug_lookup_method (method);
        if (!minfo || !minfo->il_offsets || !minfo->handle || !minfo->handle->symfile ||
            !minfo->handle->symfile->offset_table) {
-               mono_debugger_unlock ();
+               mono_loader_unlock ();
                return -1;
        }
 
        domain_data = mono_debug_get_domain_data (minfo->handle, domain);
 
        res = _mono_debug_address_from_il_offset (domain_data->jit [minfo->index], il_offset);
-       mono_debugger_unlock ();
+       mono_loader_unlock ();
        return res;
 }