X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fdomain-internals.h;h=482a84f1be5e2b506a257497bee0521f69d25502;hb=282132ce157f6e45275e9a5f9db905a3cbe51d62;hp=1571b2994a0181268dfbd23755939d76aa5a1486;hpb=ba374ea354388006b6770dbe084bca550a35aba9;p=mono.git diff --git a/mono/metadata/domain-internals.h b/mono/metadata/domain-internals.h index 1571b2994a0..482a84f1be5 100644 --- a/mono/metadata/domain-internals.h +++ b/mono/metadata/domain-internals.h @@ -5,6 +5,7 @@ #define __MONO_METADATA_DOMAIN_INTERNALS_H__ #include +#include #include #include #include @@ -12,6 +13,15 @@ #include extern CRITICAL_SECTION mono_delegate_section; +extern CRITICAL_SECTION mono_strtod_mutex; + +/* + * If this is set, the memory belonging to appdomains is not freed when a domain is + * unloaded, and assemblies loaded by the appdomain are not unloaded either. This + * allows us to use typed gc in non-default appdomains too, leading to increased + * performance. + */ +extern gboolean mono_dont_free_domains; /* This is a copy of System.AppDomainSetup */ typedef struct { @@ -54,6 +64,7 @@ struct _MonoJitInfoTableChunk struct _MonoJitInfoTable { + MonoDomain *domain; int num_chunks; MonoJitInfoTableChunk *chunks [MONO_ZERO_LEN_ARRAY]; }; @@ -85,6 +96,7 @@ typedef struct MonoGenericSharingContext *generic_sharing_context; gint32 this_offset; guint8 this_reg; + gboolean has_this:1; gboolean this_in_reg:1; } MonoGenericJitInfo; @@ -96,9 +108,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; @@ -109,15 +122,11 @@ 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 */ }; -typedef struct { - MonoJitInfo *ji; - MonoCodeManager *code_mp; -} MonoJitDynamicMethodInfo; - struct _MonoAppContext { MonoObject obj; gint32 domain_id; @@ -125,15 +134,34 @@ 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; +typedef struct _MonoThunkFreeList { + guint32 size; + int length; /* only valid for the wait list */ + struct _MonoThunkFreeList *next; +} 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; @@ -160,22 +188,27 @@ struct _MonoDomain { MonoGHashTable *type_init_exception_hash; /* maps delegate trampoline addr -> delegate object */ MonoGHashTable *delegate_hash_table; -#define MONO_DOMAIN_LAST_GC_TRACKED delegate_hash_table + /* typeof (void) */ + MonoObject *typeof_void; +#define MONO_DOMAIN_LAST_GC_TRACKED typeof_void guint32 state; /* Needed by Thread:GetDomainID() */ gint32 domain_id; gint32 shadow_serial; + unsigned char inet_family_hint; // used in socket-io.c as a cache GSList *domain_assemblies; MonoAssembly *entry_assembly; char *friendly_name; GHashTable *class_vtable_hash; /* maps remote class key -> MonoRemoteClass */ GHashTable *proxy_vtable_hash; + /* Protected by 'jit_code_hash_lock' */ MonoInternalHashTable jit_code_hash; - /* maps MonoMethod -> MonoJitDynamicMethodInfo */ - GHashTable *dynamic_code_hash; + CRITICAL_SECTION jit_code_hash_lock; + int num_jit_info_tables; MonoJitInfoTable * volatile jit_info_table; + GSList *jit_info_free_queue; /* Used when loading assemblies */ gchar **search_path; gchar *private_bin_path; @@ -185,11 +218,6 @@ struct _MonoDomain { MonoMethod *private_invoke_method; /* Used to store offsets of thread and context static fields */ GHashTable *special_static_fields; - GHashTable *jump_target_hash; - GHashTable *class_init_trampoline_hash; - GHashTable *jump_trampoline_hash; - GHashTable *jit_trampoline_hash; - GHashTable *delegate_trampoline_hash; /* * This must be a GHashTable, since these objects can't be finalized * if the hashtable contains a GC visible reference to them. @@ -198,7 +226,17 @@ struct _MonoDomain { /* Used when accessing 'domain_assemblies' */ CRITICAL_SECTION assemblies_lock; - GHashTable *shared_generics_hash; + GHashTable *method_rgctx_hash; + + GHashTable *generic_virtual_cases; + MonoThunkFreeList **thunk_free_lists; + + /* Information maintained by the JIT engine */ + gpointer runtime_info; + + /*thread pool jobs, used to coordinate shutdown.*/ + int threadpool_jobs; + HANDLE cleanup_semaphore; }; typedef struct { @@ -212,10 +250,30 @@ typedef struct { const AssemblyVersionSet version_sets [2]; } MonoRuntimeInfo; -#define mono_domain_lock(domain) EnterCriticalSection(&(domain)->lock) -#define mono_domain_unlock(domain) LeaveCriticalSection(&(domain)->lock) -#define mono_domain_assemblies_lock(domain) EnterCriticalSection(&(domain)->assemblies_lock) -#define mono_domain_assemblies_unlock(domain) LeaveCriticalSection(&(domain)->assemblies_lock) +#define mono_domain_lock(domain) mono_locks_acquire(&(domain)->lock, DomainLock) +#define mono_domain_unlock(domain) mono_locks_release(&(domain)->lock, DomainLock) +#define mono_domain_assemblies_lock(domain) mono_locks_acquire(&(domain)->assemblies_lock, DomainAssembliesLock) +#define mono_domain_assemblies_unlock(domain) mono_locks_release(&(domain)->assemblies_lock, DomainAssembliesLock) +#define mono_domain_jit_code_hash_lock(domain) mono_locks_acquire(&(domain)->jit_code_hash_lock, DomainJitCodeHashLock) +#define mono_domain_jit_code_hash_unlock(domain) mono_locks_release(&(domain)->jit_code_hash_lock, DomainJitCodeHashLock) + +typedef MonoDomain* (*MonoLoadFunc) (const char *filename, const char *runtime_version); + +void +mono_install_runtime_load (MonoLoadFunc func) MONO_INTERNAL; + +MonoDomain* +mono_runtime_load (const char *filename, const char *runtime_version) MONO_INTERNAL; + +typedef void (*MonoCreateDomainFunc) (MonoDomain *domain); + +void +mono_install_create_domain_hook (MonoCreateDomainFunc func) MONO_INTERNAL; + +typedef void (*MonoFreeDomainFunc) (MonoDomain *domain); + +void +mono_install_free_domain_hook (MonoFreeDomainFunc func) MONO_INTERNAL; void mono_init_com_types (void) MONO_INTERNAL; @@ -223,6 +281,9 @@ mono_init_com_types (void) MONO_INTERNAL; void mono_cleanup (void) MONO_INTERNAL; +void +mono_close_exe_image (void) MONO_INTERNAL; + void mono_jit_info_table_add (MonoDomain *domain, MonoJitInfo *ji) MONO_INTERNAL; @@ -244,9 +305,29 @@ mono_jit_info_set_generic_sharing_context (MonoJitInfo *ji, MonoGenericSharingCo MonoJitInfo* mono_domain_lookup_shared_generic (MonoDomain *domain, MonoMethod *method) MONO_INTERNAL; +char * +mono_make_shadow_copy (const char *filename) MONO_INTERNAL; + +gboolean +mono_is_shadow_copy_enabled (MonoDomain *domain, const gchar *dir_name) MONO_INTERNAL; + +gpointer +mono_domain_alloc (MonoDomain *domain, guint size) MONO_INTERNAL; + +gpointer +mono_domain_alloc0 (MonoDomain *domain, guint size) MONO_INTERNAL; + +void* +mono_domain_code_reserve (MonoDomain *domain, int size) MONO_INTERNAL; + +void* +mono_domain_code_reserve_align (MonoDomain *domain, int size, int alignment) MONO_INTERNAL; + void -mono_domain_register_shared_generic (MonoDomain *domain, MonoMethod *method, MonoJitInfo *jit_info) MONO_INTERNAL; +mono_domain_code_commit (MonoDomain *domain, void *data, int size, int newsize) MONO_INTERNAL; +void +mono_domain_code_foreach (MonoDomain *domain, MonoCodeManagerFunc func, void *user_data) MONO_INTERNAL; /* * Installs a new function which is used to return a MonoJitInfo for a method inside @@ -351,6 +432,12 @@ mono_assembly_load_corlib (const MonoRuntimeInfo *runtime, MonoImageOpenStatus * const MonoRuntimeInfo* mono_get_runtime_info (void) MONO_INTERNAL; +void +mono_runtime_set_no_exec (gboolean val) MONO_INTERNAL; + +gboolean +mono_runtime_get_no_exec (void) MONO_INTERNAL; + gboolean mono_assembly_name_parse (const char *name, MonoAssemblyName *aname) MONO_INTERNAL; @@ -372,4 +459,8 @@ MonoAssembly* mono_assembly_load_full_nosearch (MonoAssemblyName *aname, MonoImageOpenStatus *status, gboolean refonly) MONO_INTERNAL; +void mono_set_private_bin_path_from_config (MonoDomain *domain) MONO_INTERNAL; + +int mono_framework_version (void) MONO_INTERNAL; + #endif /* __MONO_METADATA_DOMAIN_INTERNALS_H__ */