1.1 --- a/src/share/vm/gc_interface/collectedHeap.hpp Wed Jun 15 10:18:04 2011 -0700
1.2 +++ b/src/share/vm/gc_interface/collectedHeap.hpp Thu Jun 16 15:51:57 2011 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -93,7 +93,7 @@
1.11 // pure virtual.
1.12 void pre_initialize();
1.13
1.14 - // Create a new tlab
1.15 + // Create a new tlab. All TLAB allocations must go through this.
1.16 virtual HeapWord* allocate_new_tlab(size_t size);
1.17
1.18 // Accumulate statistics on all tlabs.
1.19 @@ -109,11 +109,11 @@
1.20
1.21 // Allocate an uninitialized block of the given size, or returns NULL if
1.22 // this is impossible.
1.23 - inline static HeapWord* common_mem_allocate_noinit(size_t size, bool is_noref, TRAPS);
1.24 + inline static HeapWord* common_mem_allocate_noinit(size_t size, TRAPS);
1.25
1.26 // Like allocate_init, but the block returned by a successful allocation
1.27 // is guaranteed initialized to zeros.
1.28 - inline static HeapWord* common_mem_allocate_init(size_t size, bool is_noref, TRAPS);
1.29 + inline static HeapWord* common_mem_allocate_init(size_t size, TRAPS);
1.30
1.31 // Same as common_mem version, except memory is allocated in the permanent area
1.32 // If there is no permanent area, revert to common_mem_allocate_noinit
1.33 @@ -322,7 +322,6 @@
1.34 // General obj/array allocation facilities.
1.35 inline static oop obj_allocate(KlassHandle klass, int size, TRAPS);
1.36 inline static oop array_allocate(KlassHandle klass, int size, int length, TRAPS);
1.37 - inline static oop large_typearray_allocate(KlassHandle klass, int size, int length, TRAPS);
1.38
1.39 // Special obj/array allocation facilities.
1.40 // Some heaps may want to manage "permanent" data uniquely. These default
1.41 @@ -345,16 +344,12 @@
1.42 // Raw memory allocation facilities
1.43 // The obj and array allocate methods are covers for these methods.
1.44 // The permanent allocation method should default to mem_allocate if
1.45 - // permanent memory isn't supported.
1.46 + // permanent memory isn't supported. mem_allocate() should never be
1.47 + // called to allocate TLABs, only individual objects.
1.48 virtual HeapWord* mem_allocate(size_t size,
1.49 - bool is_noref,
1.50 - bool is_tlab,
1.51 bool* gc_overhead_limit_was_exceeded) = 0;
1.52 virtual HeapWord* permanent_mem_allocate(size_t size) = 0;
1.53
1.54 - // The boundary between a "large" and "small" array of primitives, in words.
1.55 - virtual size_t large_typearray_limit() = 0;
1.56 -
1.57 // Utilities for turning raw memory into filler objects.
1.58 //
1.59 // min_fill_size() is the smallest region that can be filled.
