X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fdomain-internals.h;h=dc2ab2eb0f871205a8169c0b54999eefa0ff056c;hb=64e2556130a5220a09a770b85b442d0ff34bcbda;hp=f7dbda77620239475a7899c9e77c76a1d8af4266;hpb=306fdb79f3581a328c469cf600108ba2cadc2b87;p=mono.git

diff --git a/mono/metadata/domain-internals.h b/mono/metadata/domain-internals.h
index f7dbda77620..dc2ab2eb0f8 100644
--- a/mono/metadata/domain-internals.h
+++ b/mono/metadata/domain-internals.h
@@ -107,9 +107,10 @@ struct _MonoJitInfo {
 	MonoMethod *method;
 	struct _MonoJitInfo *next_jit_code_hash;
 	gpointer    code_start;
+	/* This might contain an id for the unwind info instead of a register mask */
 	guint32     used_regs;
 	int         code_size;
-	guint32     num_clauses:16;
+	guint32     num_clauses:15;
 	/* Whenever the code is domain neutral or 'shared' */
 	gboolean    domain_neutral:1;
 	gboolean    cas_inited:1;
@@ -120,6 +121,7 @@ struct _MonoJitInfo {
 	gboolean    cas_method_deny:1;
 	gboolean    cas_method_permitonly:1;
 	gboolean    has_generic_jit_info:1;
+	gboolean    from_aot:1;
 	MonoJitExceptionInfo clauses [MONO_ZERO_LEN_ARRAY];
 	/* There is an optional MonoGenericJitInfo after the clauses */
 };
@@ -131,8 +133,16 @@ struct _MonoAppContext {
 	gpointer *static_data;
 };
 
+/*
+ * We have two unloading states because the domain
+ * must remain fully functional while AppDomain::DomainUnload is
+ * processed.
+ * After that unloading began and all domain facilities are teared down
+ * such as execution of new threadpool jobs.  
+ */
 typedef enum {
 	MONO_APPDOMAIN_CREATED,
+	MONO_APPDOMAIN_UNLOADING_START,
 	MONO_APPDOMAIN_UNLOADING,
 	MONO_APPDOMAIN_UNLOADED
 } MonoAppDomainState;
@@ -146,6 +156,11 @@ typedef struct _MonoThunkFreeList {
 typedef struct _MonoJitCodeHash MonoJitCodeHash;
 
 struct _MonoDomain {
+	/*
+	 * This lock must never be taken before the loader lock,
+	 * i.e. if both are taken by the same thread, the loader lock
+	 * must taken first.
+	 */
 	CRITICAL_SECTION    lock;
 	MonoMemPool        *mp;
 	MonoCodeManager    *code_mp;