* culture-info.h: Make defines more consistent, add calendar data

[mono.git] / mono / metadata / mono-debug-debugger.c

diff --git a/mono/metadata/mono-debug-debugger.c b/mono/metadata/mono-debug-debugger.c
index 5c32105e5da93733b4fa42d57f4400caf889d518..f8f6a8f433941f20a97fea576498c6f37255c092 100644 (file)
--- a/mono/metadata/mono-debug-debugger.c
+++ b/mono/metadata/mono-debug-debugger.c
@@ -60,8 +60,10 @@ MonoDebuggerIOLayer mono_debugger_io_layer = {
 void
 mono_debugger_lock (void)
 {
-       if (!mono_debugger_initialized)
+       if (!mono_debugger_initialized) {
+               debugger_lock_level++;
                return;
+       }
 
        EnterCriticalSection (&debugger_lock_mutex);
        debugger_lock_level++;
@@ -70,8 +72,12 @@ mono_debugger_lock (void)
 void
 mono_debugger_unlock (void)
 {
-       if (!mono_debugger_initialized)
+       g_assert (debugger_lock_level > 0);
+
+       if (!mono_debugger_initialized) {
+               debugger_lock_level--;
                return;
+       }
 
        if (debugger_lock_level == 1) {
                if (must_reload_symtabs) {
@@ -114,6 +120,7 @@ mono_debugger_initialize (MonoDomain *domain)
        g_assert (!mono_debugger_initialized);
 
        InitializeCriticalSection (&debugger_lock_mutex);
+       mono_debugger_initialized = TRUE;
 
        mono_debugger_lock ();
 
@@ -130,7 +137,6 @@ mono_debugger_initialize (MonoDomain *domain)
        class_info_table = g_hash_table_new (g_direct_hash, g_direct_equal);
 
        mono_debugger_symbol_table = symbol_table;
-       mono_debugger_initialized = TRUE;
 
        mono_debugger_unlock ();
 }
@@ -144,8 +150,10 @@ mono_debugger_add_symbol_file (MonoDebugHandle *handle)
        mono_debugger_lock ();
 
        info = g_hash_table_lookup (images, handle->image);
-       if (info)
+       if (info) {
+               mono_debugger_unlock ();
                return info;
+       }
 
        info = allocate_symbol_file_entry (mono_debugger_symbol_table);
        info->symfile = handle->symfile;
@@ -1188,8 +1196,11 @@ mono_debugger_lookup_type (const gchar *type_name)
                MonoDebuggerSymbolFile *symfile = mono_debugger_symbol_table->symbol_files [i];
                MonoType *type;
                guint32 offset;
+               gchar *name;
 
-               type = mono_reflection_type_from_name (type_name, symfile->image);
+               name = g_strdup (type_name);
+               type = mono_reflection_type_from_name (name, symfile->image);
+               g_free (name);
                if (!type)
                        continue;
 
@@ -1202,3 +1213,34 @@ mono_debugger_lookup_type (const gchar *type_name)
        mono_debugger_unlock ();
        return 0;
 }
+
+gint32
+mono_debugger_lookup_assembly (const gchar *name)
+{
+       MonoAssembly *assembly;
+       MonoImageOpenStatus status;
+       int i;
+
+       mono_debugger_lock ();
+
+ again:
+       for (i = 0; i < mono_debugger_symbol_table->num_symbol_files; i++) {
+               MonoDebuggerSymbolFile *symfile = mono_debugger_symbol_table->symbol_files [i];
+
+               if (!strcmp (symfile->image_file, name)) {
+                       mono_debugger_unlock ();
+                       return i;
+               }
+       }
+
+       assembly = mono_assembly_open (name, &status);
+
+       if (status != MONO_IMAGE_OK) {
+               g_warning (G_STRLOC ": Cannot open image `%s'", name);
+               mono_debugger_unlock ();
+               return -1;
+       }
+
+       must_reload_symtabs = TRUE;
+       goto again;
+}