mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.1

Browse Source 
Former-commit-id: 6d37e02debfe41dd5c13ba6f6a2428c8b1ff5e28
This commit is contained in:
Jo Shields
2015-04-26 19:10:23 +01:00
parent 3c1f479b9d
commit 7272927785
252 changed files with 16715 additions and 1176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mono/metadata/image.c
View File

@@ -1618,6 +1618,9 @@ mono_image_close_except_pools (MonoImage *image)
}
free_hash (image->native_wrapper_cache);
free_hash (image->native_wrapper_aot_cache);
free_hash (image->native_wrapper_check_cache);
free_hash (image->native_wrapper_aot_check_cache);
free_hash (image->native_func_wrapper_cache);
free_hash (image->managed_wrapper_cache);
free_hash (image->delegate_begin_invoke_cache);

2
mono/metadata/marshal.c.REMOVED.git-id
View File

@@ -1 +1 @@
eb5e507434af26801525bafdcd2e5775a3ce090b
0b3265de9b69f018f6bbdbc74247de6151f934c1

2
mono/metadata/metadata-internals.h
View File

@@ -275,6 +275,8 @@ struct _MonoImage {
GHashTable *managed_wrapper_cache;
GHashTable *native_wrapper_cache;
GHashTable *native_wrapper_aot_cache;
GHashTable *native_wrapper_check_cache;
GHashTable *native_wrapper_aot_check_cache;
GHashTable *native_func_wrapper_aot_cache;
GHashTable *remoting_invoke_cache;
GHashTable *synchronized_cache;

2
mono/mini/version.h
View File

@@ -1 +1 @@
#define FULL_VERSION "(detached/21d849b"
#define FULL_VERSION "mono-4.0.0-branch/7975f50"

12
mono/utils/mono-codeman.c
View File

@@ -529,15 +529,21 @@ new_codechunk (CodeChunk *last, int dynamic, int size)
}
}
#ifdef BIND_ROOM
bsize = chunk_size / BIND_ROOM;
if (dynamic)
/* Reserve more space since there are no other chunks we might use if this one gets full */
bsize = (chunk_size * 2) / BIND_ROOM;
else
bsize = chunk_size / BIND_ROOM;
if (bsize < MIN_BSIZE)
bsize = MIN_BSIZE;
bsize += MIN_ALIGN -1;
bsize &= ~ (MIN_ALIGN - 1);
if (chunk_size - size < bsize) {
chunk_size = size + bsize;
chunk_size += pagesize - 1;
chunk_size &= ~ (pagesize - 1);
if (!dynamic) {
chunk_size += pagesize - 1;
chunk_size &= ~ (pagesize - 1);
}
}
#endif