Make nested type loading lazier.

[mono.git] / mono / metadata / mono-config.c

diff --git a/mono/metadata/mono-config.c b/mono/metadata/mono-config.c
index b0bcfd81a9bc0a94f0dc7d9ca202281f11c9e520..8f3b63303858e5d4d658540638c7731f3e63289b 100644 (file)
--- a/mono/metadata/mono-config.c
+++ b/mono/metadata/mono-config.c
@@ -17,7 +17,7 @@
 #include "mono/metadata/mono-config.h"
 #include "mono/metadata/metadata-internals.h"
 #include "mono/metadata/object-internals.h"
-#include "mono/utils/mono-logger.h"
+#include "mono/utils/mono-logger-internal.h"
 
 #if defined(TARGET_PS3)
 #define CONFIG_OS "CellOS"
@@ -39,6 +39,8 @@
 #define CONFIG_OS "aix"
 #elif defined(__hpux)
 #define CONFIG_OS "hpux"
+#elif defined(__HAIKU__)
+#define CONFIG_OS "haiku"
 #else
 #warning Unknown operating system
 #define CONFIG_OS "unknownOS"
@@ -144,6 +146,12 @@ struct MonoParseHandler {
        void (*finish) (gpointer user_data);
 };
 
+typedef struct {
+       MonoAssemblyBindingInfo *info;
+       void (*info_parsed)(MonoAssemblyBindingInfo *info, void *user_data);
+       void *user_data;
+} ParserUserData;
+
 typedef struct {
        MonoParseHandler *current;
        void *user_data;
@@ -592,17 +600,43 @@ mono_get_machine_config (void)
        return bundled_machine_config;
 }
 
+static void
+assembly_binding_end (gpointer user_data, const char *element_name)
+{
+       ParserUserData *pud = user_data;
+
+       if (!strcmp (element_name, "dependentAssembly")) {
+               if (pud->info_parsed && pud->info) {
+                       pud->info_parsed (pud->info, pud->user_data);
+                       g_free (pud->info->name);
+                       g_free (pud->info->culture);
+               }
+       }
+}
+
 static void
 publisher_policy_start (gpointer user_data,
                const gchar *element_name,
                const gchar **attribute_names,
                const gchar **attribute_values)
 {
+       ParserUserData *pud;
        MonoAssemblyBindingInfo *info;
        int n;
 
-       info = user_data;
-       if (!strcmp (element_name, "assemblyIdentity")) {
+       pud = user_data;
+       info = pud->info;
+       if (!strcmp (element_name, "dependentAssembly")) {
+               info->name = NULL;
+               info->culture = NULL;
+               info->has_old_version_bottom = FALSE;
+               info->has_old_version_top = FALSE;
+               info->has_new_version = FALSE;
+               info->is_valid = FALSE;
+               memset (&info->old_version_bottom, 0, sizeof (info->old_version_bottom));
+               memset (&info->old_version_top, 0, sizeof (info->old_version_top));
+               memset (&info->new_version, 0, sizeof (info->new_version));
+       } if (!strcmp (element_name, "assemblyIdentity")) {
                for (n = 0; attribute_names [n]; n++) {
                        const gchar *attribute_name = attribute_names [n];
                        
@@ -706,9 +740,14 @@ publisher_policy_parser = {
 void
 mono_config_parse_publisher_policy (const gchar *filename, MonoAssemblyBindingInfo *info)
 {
+       ParserUserData user_data = {
+               info,
+               NULL,
+               NULL
+       };
        ParseState state = {
                &publisher_policy_parser, /* MonoParseHandler */
-               info, /* user_data */
+               &user_data, /* user_data */
                NULL, /* MonoImage (we don't need it right now)*/
                TRUE /* We are already inited */
        };
@@ -716,3 +755,35 @@ mono_config_parse_publisher_policy (const gchar *filename, MonoAssemblyBindingIn
        mono_config_parse_file_with_context (&state, filename);
 }
 
+static MonoParseHandler
+config_assemblybinding_parser = {
+       "", /* We don't need to use declare an xml element */
+       NULL,
+       publisher_policy_start,
+       NULL,
+       assembly_binding_end,
+       NULL
+};
+
+void
+mono_config_parse_assembly_bindings (const char *filename, int amajor, int aminor, void *user_data, void (*infocb)(MonoAssemblyBindingInfo *info, void *user_data))
+{
+       MonoAssemblyBindingInfo info;
+       ParserUserData pud;
+       ParseState state;
+
+       info.major = amajor;
+       info.minor = aminor;
+
+       pud.info = &info;
+       pud.info_parsed = infocb;
+       pud.user_data = user_data;
+
+       state.current = &config_assemblybinding_parser;  /* MonoParseHandler */
+       state.user_data = &pud;
+       state.assembly = NULL; /* MonoImage (we don't need it right now)*/
+       state.inited = TRUE; /* We are already inited */
+
+       mono_config_parse_file_with_context (&state, filename);
+}
+