backport

svn path=/branches/mono-1-1-8/mono/; revision=47719

2 files changed, 29 insertions, 29 deletions

diff --git a/mono/metadata/debug-mono-symfile.c b/mono/metadata/debug-mono-symfile.c
index e40b41c1fcd..e44780cee23 100644
--- a/mono/metadata/debug-mono-symfile.c
+++ b/mono/metadata/debug-mono-symfile.c
@@ -102,7 +102,7 @@ mono_debug_open_mono_symbol_file (MonoDebugHandle *handle, gboolean create_symfi
 	MonoSymbolFile *symfile;
 	FILE* f;
 
-	mono_loader_lock ();
+	mono_debugger_lock ();
 	symfile = g_new0 (MonoSymbolFile, 1);
 
 	symfile->filename = g_strdup_printf ("%s.mdb", mono_image_get_filename (handle->image));
@@ -121,15 +121,15 @@ mono_debug_open_mono_symbol_file (MonoDebugHandle *handle, gboolean create_symfi
 	}
 	
 	if (load_symfile (handle, symfile)) {
-		mono_loader_unlock ();
+		mono_debugger_unlock ();
 		return symfile;
 	} else if (!create_symfile) {
 		mono_debug_close_mono_symbol_file (symfile);
-		mono_loader_unlock ();
+		mono_debugger_unlock ();
 		return NULL;
 	}
 
-	mono_loader_unlock ();
+	mono_debugger_unlock ();
 	return symfile;
 }
 
@@ -139,7 +139,7 @@ mono_debug_close_mono_symbol_file (MonoSymbolFile *symfile)
 	if (!symfile)
 		return;
 
-	mono_loader_lock ();
+	mono_debugger_lock ();
 	if (symfile->method_hash)
 		g_hash_table_destroy (symfile->method_hash);
 
@@ -147,7 +147,7 @@ mono_debug_close_mono_symbol_file (MonoSymbolFile *symfile)
 		mono_raw_buffer_free ((gpointer) symfile->raw_contents);
 	
 	g_free (symfile);
-	mono_loader_unlock ();
+	mono_debugger_unlock ();
 }
 
 static int
@@ -187,15 +187,15 @@ mono_debug_find_source_location (MonoSymbolFile *symfile, MonoMethod *method, gu
 	const char *ptr;
 	int i;
 
-	mono_loader_lock ();
+	mono_debugger_lock ();
 	if (!symfile->method_hash) {
-		mono_loader_unlock ();
+		mono_debugger_unlock ();
 		return NULL;
 	}
 
 	minfo = g_hash_table_lookup (symfile->method_hash, method);
 	if (!minfo) {
-		mono_loader_unlock ();
+		mono_debugger_unlock ();
 		return NULL;
 	}
 
@@ -217,7 +217,7 @@ mono_debug_find_source_location (MonoSymbolFile *symfile, MonoMethod *method, gu
 
 		if (line_number) {
 			*line_number = read32(&(lne->_row));
-			mono_loader_unlock ();
+			mono_debugger_unlock ();
 			if (source_file)
 				return source_file;
 			else
@@ -225,16 +225,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_loader_unlock ();
+			mono_debugger_unlock ();
 			return retval;
 		} else {
 			gchar* retval = g_strdup_printf ("%d", read32(&(lne->_row)));
-			mono_loader_unlock ();
+			mono_debugger_unlock ();
 			return retval;
 		}
 	}
 
-	mono_loader_unlock ();
+	mono_debugger_unlock ();
 	return NULL;
 }
 
@@ -279,7 +279,7 @@ mono_debug_find_method (MonoDebugHandle *handle, MonoMethod *method)
 	if (handle->image != mono_class_get_image (mono_method_get_class (method)))
 		return NULL;
 
-	mono_loader_lock ();
+	mono_debugger_lock ();
 	first_ie = (MonoSymbolFileMethodIndexEntry *)
 		(symfile->raw_contents + read32(&(symfile->offset_table->_method_table_offset)));
 
@@ -288,7 +288,7 @@ mono_debug_find_method (MonoDebugHandle *handle, MonoMethod *method)
 				   sizeof (MonoSymbolFileMethodIndexEntry), compare_method);
 
 	if (!ie) {
-		mono_loader_unlock ();
+		mono_debugger_unlock ();
 		return NULL;
 	}
 
@@ -308,6 +308,6 @@ mono_debug_find_method (MonoDebugHandle *handle, MonoMethod *method)
 
 	g_hash_table_insert (symfile->method_hash, method, minfo);
 
-	mono_loader_unlock ();
+	mono_debugger_unlock ();
 	return minfo;
 }
diff --git a/mono/metadata/mono-debug.c b/mono/metadata/mono-debug.c
index f36fde9f59e..22d8f9b4cda 100644
--- a/mono/metadata/mono-debug.c
+++ b/mono/metadata/mono-debug.c
@@ -771,10 +771,10 @@ mono_debug_source_location_from_address (MonoMethod *method, guint32 address, gu
 	char *res = NULL;
 	gint32 offset;
 
-	mono_loader_lock ();
+	mono_debugger_lock ();
 	minfo = _mono_debug_lookup_method (method);
 	if (!minfo || !minfo->handle || !minfo->handle->symfile || !minfo->handle->symfile->offset_table) {
-		mono_loader_unlock ();
+		mono_debugger_unlock ();
 		return NULL;
 	}
 
@@ -783,7 +783,7 @@ 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_loader_unlock ();
+	mono_debugger_unlock ();
 	return res;
 }
 
@@ -808,15 +808,15 @@ mono_debug_source_location_from_il_offset (MonoMethod *method, guint32 offset, g
 	char *res;
 	MonoDebugMethodInfo *minfo;
 
-	mono_loader_lock ();
+	mono_debugger_lock ();
 	minfo = _mono_debug_lookup_method (method);
 	if (!minfo || !minfo->handle || !minfo->handle->symfile) {
-		mono_loader_unlock ();
+		mono_debugger_unlock ();
 		return NULL;
 	}
 
 	res = mono_debug_find_source_location (minfo->handle->symfile, method, offset, line_number);
-	mono_loader_unlock ();
+	mono_debugger_unlock ();
 	return res;
 }
 
@@ -838,16 +838,16 @@ mono_debug_il_offset_from_address (MonoMethod *method, gint32 address, MonoDomai
 	if (address < 0)
 		return -1;
 
-	mono_loader_lock ();
+	mono_debugger_lock ();
 	minfo = _mono_debug_lookup_method (method);
 	if (!minfo || !minfo->il_offsets || !minfo->handle || !minfo->handle->symfile ||
 	    !minfo->handle->symfile->offset_table) {
-		mono_loader_unlock ();
+		mono_debugger_unlock ();
 		return -1;
 	}
 
 	res = il_offset_from_address (minfo, domain, address);
-	mono_loader_unlock ();
+	mono_debugger_unlock ();
 	return res;
 }
 
@@ -870,21 +870,21 @@ mono_debug_address_from_il_offset (MonoMethod *method, gint32 il_offset, MonoDom
 	if (il_offset < 0)
 		return -1;
 
-	mono_loader_lock ();
+	mono_debugger_lock ();
 	minfo = _mono_debug_lookup_method (method);
 	if (!minfo || !minfo->il_offsets || !minfo->handle || !minfo->handle->symfile ||
 	    !minfo->handle->symfile->offset_table) {
-		mono_loader_unlock ();
+		mono_debugger_unlock ();
 		return -1;
 	}
 
 	jit = find_method (minfo, domain);
 	if (!jit) {
-		mono_loader_unlock ();
+		mono_debugger_unlock ();
 		return -1;
 	}
 
 	res = _mono_debug_address_from_il_offset (jit, il_offset);
-	mono_loader_unlock ();
+	mono_debugger_unlock ();
 	return res;
 }