X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fdomain-internals.h;h=5355fe060ebe67c055e91bcc27efe4b299c79292;hb=d5fa8f0cdd8a42c7c5e0fd7a66a0ab0afcb5f9f6;hp=9554636c4fb225d829f9bda5261b50db352453c3;hpb=034ec167d9cadd06fb08d200d26d9a9685e889fa;p=mono.git

diff --git a/mono/metadata/domain-internals.h b/mono/metadata/domain-internals.h
index 9554636c4fb..5355fe060eb 100644
--- a/mono/metadata/domain-internals.h
+++ b/mono/metadata/domain-internals.h
@@ -8,6 +8,7 @@
 #include <mono/utils/mono-codeman.h>
 #include <mono/utils/mono-hash.h>
 #include <mono/utils/mono-compiler.h>
+#include <mono/utils/mono-internal-hash.h>
 #include <mono/io-layer/io-layer.h>
 
 extern CRITICAL_SECTION mono_delegate_section;
@@ -30,9 +31,34 @@ typedef struct {
 	int loader_optimization;
 	MonoBoolean disallow_binding_redirects;
 	MonoBoolean disallow_code_downloads;
+	MonoObject *activation_arguments; /* it is System.Object in 1.x, ActivationArguments in 2.0 */
+	MonoObject *domain_initializer;
+	MonoArray *domain_initializer_args;
+	MonoObject *application_trust; /* it is System.Object in 1.x, ApplicationTrust in 2.0 */
+	MonoBoolean disallow_appbase_probe;
+	MonoArray *configuration_bytes;
 } MonoAppDomainSetup;
 
-typedef GArray MonoJitInfoTable;
+typedef struct _MonoJitInfoTable MonoJitInfoTable;
+typedef struct _MonoJitInfoTableChunk MonoJitInfoTableChunk;
+
+#define MONO_JIT_INFO_TABLE_CHUNK_SIZE		64
+
+struct _MonoJitInfoTableChunk
+{
+	int		       refcount;
+	volatile int           num_elements;
+	volatile gint8        *last_code_end;
+	MonoJitInfo * volatile data [MONO_JIT_INFO_TABLE_CHUNK_SIZE];
+};
+
+struct _MonoJitInfoTable
+{
+	int			num_chunks;
+	MonoJitInfoTableChunk  *chunks [MONO_ZERO_LEN_ARRAY];
+};
+
+typedef GArray MonoAotModuleInfoTable;
 
 typedef struct {
 	guint32  flags;
@@ -47,7 +73,12 @@ typedef struct {
 } MonoJitExceptionInfo;
 
 struct _MonoJitInfo {
+	/* NOTE: These first two elements (method and
+	   next_jit_code_hash) must be in the same order and at the
+	   same offset as in RuntimeMethod, because of the jit_code_hash
+	   internal hash table in MonoDomain. */
 	MonoMethod *method;
+	struct _MonoJitInfo *next_jit_code_hash;
 	gpointer    code_start;
 	guint32     used_regs;
 	int         code_size;
@@ -82,6 +113,8 @@ typedef enum {
 	MONO_APPDOMAIN_UNLOADED
 } MonoAppDomainState;
 
+typedef struct _MonoJitCodeHash MonoJitCodeHash;
+
 struct _MonoDomain {
 	CRITICAL_SECTION    lock;
 	MonoMemPool        *mp;
@@ -113,16 +146,18 @@ struct _MonoDomain {
 	guint32            state;
 	/* Needed by Thread:GetDomainID() */
 	gint32             domain_id;
+	gint32             shadow_serial;
 	GSList             *domain_assemblies;
 	MonoAssembly       *entry_assembly;
 	char               *friendly_name;
 	GHashTable         *class_vtable_hash;
 	/* maps remote class key -> MonoRemoteClass */
 	GHashTable         *proxy_vtable_hash;
-	GHashTable         *jit_code_hash;
+	MonoInternalHashTable jit_code_hash;
 	/* maps MonoMethod -> MonoJitDynamicMethodInfo */
 	GHashTable         *dynamic_code_hash;
-	MonoJitInfoTable   *jit_info_table;
+	MonoJitInfoTable * 
+	  volatile          jit_info_table;
 	/* Used when loading assemblies */
 	gchar **search_path;
 	/* Used by remoting proxies */
@@ -184,6 +219,9 @@ mono_jit_info_add_aot_module (MonoImage *image, gpointer start, gpointer end) MO
 typedef MonoJitInfo *(*MonoJitInfoFindInAot)         (MonoDomain *domain, MonoImage *image, gpointer addr);
 void          mono_install_jit_info_find_in_aot (MonoJitInfoFindInAot func) MONO_INTERNAL;
 
+void
+mono_jit_code_hash_init (MonoInternalHashTable *jit_code_hash) MONO_INTERNAL;
+
 MonoAppDomain *
 ves_icall_System_AppDomain_getCurDomain            (void) MONO_INTERNAL;