equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. |
7 * published by the Free Software Foundation. |
129 HeapRegion* r = _hrm.addr_to_region((HeapWord*) obj); |
129 HeapRegion* r = _hrm.addr_to_region((HeapWord*) obj); |
130 return r != NULL && r->in_collection_set(); |
130 return r != NULL && r->in_collection_set(); |
131 } |
131 } |
132 |
132 |
133 inline HeapWord* G1CollectedHeap::attempt_allocation(size_t word_size, |
133 inline HeapWord* G1CollectedHeap::attempt_allocation(size_t word_size, |
134 unsigned int* gc_count_before_ret, |
134 uint* gc_count_before_ret, |
135 int* gclocker_retry_count_ret) { |
135 uint* gclocker_retry_count_ret) { |
136 assert_heap_not_locked_and_not_at_safepoint(); |
136 assert_heap_not_locked_and_not_at_safepoint(); |
137 assert(!is_humongous(word_size), "attempt_allocation() should not " |
137 assert(!is_humongous(word_size), "attempt_allocation() should not " |
138 "be called for humongous allocation requests"); |
138 "be called for humongous allocation requests"); |
139 |
139 |
140 AllocationContext_t context = AllocationContext::current(); |
140 AllocationContext_t context = AllocationContext::current(); |