X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fsgen%2Fsgen-los.c;h=791eaa25abc15fc3868559945a0da42c43f5f7c4;hb=91ae1664061e8ac2d370da57c57d450bb00d64de;hp=a89ec99fe353517580f0695f6d45e68859a18101;hpb=a341404ecdd3b5ca2ed0ab1e9a5bcb9b5ccd2566;p=mono.git diff --git a/mono/sgen/sgen-los.c b/mono/sgen/sgen-los.c index a89ec99fe35..791eaa25abc 100644 --- a/mono/sgen/sgen-los.c +++ b/mono/sgen/sgen-los.c @@ -1,5 +1,6 @@ -/* - * sgen-los.c: Large objects space. +/** + * \file + * Large objects space. * * Author: * Paolo Molaro (lupus@ximian.com) @@ -15,18 +16,7 @@ * Copyright 2003-2010 Novell, Inc. * Copyright (C) 2012 Xamarin Inc * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License 2.0 as published by the Free Software Foundation; - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License 2.0 along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Licensed under the MIT license. See LICENSE file in the project root for full license information. */ #include "config.h" @@ -73,8 +63,12 @@ struct _LOSSection { unsigned char *free_chunk_map; }; +/* We allow read only access on the list while sweep is not running */ LOSObject *los_object_list = NULL; +/* Memory used by LOS objects */ mword los_memory_usage = 0; +/* Total memory used by the LOS allocator */ +mword los_memory_usage_total = 0; static LOSSection *los_sections = NULL; static LOSFreeChunks *los_fast_free_lists [LOS_NUM_FAST_SIZES]; /* 0 is for larger sizes */ @@ -258,7 +252,7 @@ get_los_section_memory (size_t size) if (!sgen_memgov_try_alloc_space (LOS_SECTION_SIZE, SPACE_LOS)) return NULL; - section = (LOSSection *)sgen_alloc_os_memory_aligned (LOS_SECTION_SIZE, LOS_SECTION_SIZE, (SgenAllocFlags)(SGEN_ALLOC_HEAP | SGEN_ALLOC_ACTIVATE), NULL); + section = (LOSSection *)sgen_alloc_os_memory_aligned (LOS_SECTION_SIZE, LOS_SECTION_SIZE, (SgenAllocFlags)(SGEN_ALLOC_HEAP | SGEN_ALLOC_ACTIVATE), NULL, MONO_MEM_ACCOUNT_SGEN_LOS); if (!section) return NULL; @@ -278,6 +272,7 @@ get_los_section_memory (size_t size) section->next = los_sections; los_sections = section; + los_memory_usage_total += LOS_SECTION_SIZE; ++los_num_sections; goto retry; @@ -317,7 +312,8 @@ free_los_section_memory (LOSObject *obj, size_t size) void sgen_los_free_object (LOSObject *obj) { - SGEN_ASSERT (0, !obj->cardtable_mod_union, "We should never free a LOS object with a mod-union table."); + if (obj->cardtable_mod_union) + sgen_card_table_free_mod_union (obj->cardtable_mod_union, (char*)obj->data, sgen_los_object_size (obj)); #ifndef LOS_DUMMY mword size = sgen_los_object_size (obj); @@ -328,13 +324,14 @@ sgen_los_free_object (LOSObject *obj) los_num_objects--; #ifdef USE_MALLOC - free (obj); + g_free (obj); #else if (size > LOS_SECTION_OBJECT_LIMIT) { int pagesize = mono_pagesize (); size += sizeof (LOSObject); size = SGEN_ALIGN_UP_TO (size, pagesize); - sgen_free_os_memory ((gpointer)SGEN_ALIGN_DOWN_TO ((mword)obj, pagesize), size, SGEN_ALLOC_HEAP); + sgen_free_os_memory ((gpointer)SGEN_ALIGN_DOWN_TO ((mword)obj, pagesize), size, SGEN_ALLOC_HEAP, MONO_MEM_ACCOUNT_SGEN_LOS); + los_memory_usage_total -= size; sgen_memgov_release_space (size, SPACE_LOS); } else { free_los_section_memory (obj, size + sizeof (LOSObject)); @@ -383,7 +380,7 @@ sgen_los_alloc_large_inner (GCVTable vtable, size_t size) sgen_ensure_free_space (size, GENERATION_OLD); #ifdef USE_MALLOC - obj = malloc (size + sizeof (LOSObject)); + obj = g_malloc (size + sizeof (LOSObject)); memset (obj, 0, size + sizeof (LOSObject)); #else if (size > LOS_SECTION_OBJECT_LIMIT) { @@ -391,9 +388,11 @@ sgen_los_alloc_large_inner (GCVTable vtable, size_t size) int pagesize = mono_pagesize (); size_t alloc_size = SGEN_ALIGN_UP_TO (obj_size, pagesize); if (sgen_memgov_try_alloc_space (alloc_size, SPACE_LOS)) { - obj = (LOSObject *)sgen_alloc_os_memory (alloc_size, (SgenAllocFlags)(SGEN_ALLOC_HEAP | SGEN_ALLOC_ACTIVATE), NULL); - if (obj) + obj = (LOSObject *)sgen_alloc_os_memory (alloc_size, (SgenAllocFlags)(SGEN_ALLOC_HEAP | SGEN_ALLOC_ACTIVATE), NULL, MONO_MEM_ACCOUNT_SGEN_LOS); + if (obj) { + los_memory_usage_total += alloc_size; obj = randomize_los_object_start (obj, obj_size, alloc_size, pagesize); + } } } else { obj = get_los_section_memory (size + sizeof (LOSObject)); @@ -410,6 +409,11 @@ sgen_los_alloc_large_inner (GCVTable vtable, size_t size) *vtslot = vtable; sgen_update_heap_boundaries ((mword)obj->data, (mword)obj->data + size); obj->next = los_object_list; + /* + * We need a memory barrier so we don't expose as head of the los object list + * a LOSObject that doesn't have its fields initialized. + */ + mono_memory_write_barrier (); los_object_list = obj; los_memory_usage += size; los_num_objects++; @@ -438,12 +442,13 @@ sgen_los_sweep (void) for (bigobj = los_object_list; bigobj;) { SGEN_ASSERT (0, !SGEN_OBJECT_IS_PINNED (bigobj->data), "Who pinned a LOS object?"); - if (bigobj->cardtable_mod_union) { - sgen_card_table_free_mod_union (bigobj->cardtable_mod_union, (char*)bigobj->data, sgen_los_object_size (bigobj)); - bigobj->cardtable_mod_union = NULL; - } - if (sgen_los_object_is_pinned (bigobj->data)) { + if (bigobj->cardtable_mod_union) { + mword obj_size = sgen_los_object_size (bigobj); + mword num_cards = sgen_card_table_number_of_cards_in_range ((mword) bigobj->data, obj_size); + memset (bigobj->cardtable_mod_union, 0, num_cards); + } + sgen_los_unpin_object (bigobj->data); sgen_update_heap_boundaries ((mword)bigobj->data, (mword)bigobj->data + sgen_los_object_size (bigobj)); } else { @@ -475,10 +480,11 @@ sgen_los_sweep (void) prev->next = next; else los_sections = next; - sgen_free_os_memory (section, LOS_SECTION_SIZE, SGEN_ALLOC_HEAP); + sgen_free_os_memory (section, LOS_SECTION_SIZE, SGEN_ALLOC_HEAP, MONO_MEM_ACCOUNT_SGEN_LOS); sgen_memgov_release_space (LOS_SECTION_SIZE, SPACE_LOS); section = next; --los_num_sections; + los_memory_usage_total -= LOS_SECTION_SIZE; continue; } @@ -521,12 +527,14 @@ sgen_ptr_is_in_los (char *ptr, char **start) { LOSObject *obj; - *start = NULL; + if (start) + *start = NULL; for (obj = los_object_list; obj; obj = obj->next) { char *end = (char*)obj->data + sgen_los_object_size (obj); if (ptr >= (char*)obj->data && ptr < end) { - *start = (char*)obj->data; + if (start) + *start = (char*)obj->data; return TRUE; } } @@ -617,30 +625,51 @@ get_cardtable_mod_union_for_object (LOSObject *obj) } void -sgen_los_scan_card_table (gboolean mod_union, ScanCopyContext ctx) +sgen_los_scan_card_table (CardTableScanType scan_type, ScanCopyContext ctx, int job_index, int job_split_count) { LOSObject *obj; + int i = 0; - binary_protocol_los_card_table_scan_start (sgen_timestamp (), mod_union); - for (obj = los_object_list; obj; obj = obj->next) { + binary_protocol_los_card_table_scan_start (sgen_timestamp (), scan_type & CARDTABLE_SCAN_MOD_UNION); + for (obj = los_object_list; obj; obj = obj->next, i++) { + mword num_cards = 0; guint8 *cards; + if (i % job_split_count != job_index) + continue; + if (!SGEN_OBJECT_HAS_REFERENCES (obj->data)) continue; - if (mod_union) { + if (scan_type & CARDTABLE_SCAN_MOD_UNION) { if (!sgen_los_object_is_pinned (obj->data)) continue; + if (!obj->cardtable_mod_union) + continue; + cards = get_cardtable_mod_union_for_object (obj); g_assert (cards); + if (scan_type == CARDTABLE_SCAN_MOD_UNION_PRECLEAN) { + guint8 *cards_preclean; + mword obj_size = sgen_los_object_size (obj); + num_cards = sgen_card_table_number_of_cards_in_range ((mword) obj->data, obj_size); + cards_preclean = (guint8 *)sgen_alloc_internal_dynamic (num_cards, INTERNAL_MEM_CARDTABLE_MOD_UNION, TRUE); + + sgen_card_table_preclean_mod_union (cards, cards_preclean, num_cards); + + cards = cards_preclean; + } } else { cards = NULL; } - sgen_cardtable_scan_object (obj->data, sgen_los_object_size (obj), cards, mod_union, ctx); + sgen_cardtable_scan_object (obj->data, sgen_los_object_size (obj), cards, ctx); + + if (scan_type == CARDTABLE_SCAN_MOD_UNION_PRECLEAN) + sgen_free_internal_dynamic (cards, num_cards, INTERNAL_MEM_CARDTABLE_MOD_UNION); } - binary_protocol_los_card_table_scan_end (sgen_timestamp (), mod_union); + binary_protocol_los_card_table_scan_end (sgen_timestamp (), scan_type & CARDTABLE_SCAN_MOD_UNION); } void @@ -701,6 +730,24 @@ sgen_los_pin_object (GCObject *data) binary_protocol_pin (data, (gpointer)SGEN_LOAD_VTABLE (data), sgen_safe_object_get_size (data)); } +gboolean +sgen_los_pin_object_par (GCObject *data) +{ + LOSObject *obj = sgen_los_header_for_object (data); + mword old_size = obj->size; + if (old_size & 1) + return FALSE; +#if SIZEOF_VOID_P == 4 + old_size = InterlockedCompareExchange ((volatile gint32*)&obj->size, old_size | 1, old_size); +#else + old_size = InterlockedCompareExchange64 ((volatile gint64*)&obj->size, old_size | 1, old_size); +#endif + if (old_size & 1) + return FALSE; + binary_protocol_pin (data, (gpointer)SGEN_LOAD_VTABLE (data), sgen_safe_object_get_size (data)); + return TRUE; +} + static void sgen_los_unpin_object (GCObject *data) {