--- /dev/null 2018-11-30 10:10:44.238550338 +0100 +++ new/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp 2018-11-30 10:22:48.271390101 +0100 @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2015, 2018, Red Hat, Inc. All rights reserved. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code 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 General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP +#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP + +#include "gc/shenandoah/shenandoahHeap.inline.hpp" +#include "gc/shenandoah/shenandoahHeapRegion.hpp" +#include "gc/shenandoah/shenandoahPacer.inline.hpp" +#include "runtime/atomic.hpp" + +HeapWord* ShenandoahHeapRegion::allocate(size_t size, ShenandoahAllocRequest::Type type) { + _heap->assert_heaplock_or_safepoint(); + + HeapWord* obj = top(); + if (pointer_delta(end(), obj) >= size) { + make_regular_allocation(); + adjust_alloc_metadata(type, size); + + HeapWord* new_top = obj + size; + set_top(new_top); + assert(is_aligned(obj) && is_aligned(new_top), "checking alignment"); + + return obj; + } else { + return NULL; + } +} + +inline void ShenandoahHeapRegion::adjust_alloc_metadata(ShenandoahAllocRequest::Type type, size_t size) { + bool is_first_alloc = (top() == bottom()); + + switch (type) { + case ShenandoahAllocRequest::_alloc_shared: + case ShenandoahAllocRequest::_alloc_tlab: + _seqnum_last_alloc_mutator = _alloc_seq_num.value++; + if (is_first_alloc) { + assert (_seqnum_first_alloc_mutator == 0, "Region " SIZE_FORMAT " metadata is correct", _region_number); + _seqnum_first_alloc_mutator = _seqnum_last_alloc_mutator; + } + break; + case ShenandoahAllocRequest::_alloc_shared_gc: + case ShenandoahAllocRequest::_alloc_gclab: + _seqnum_last_alloc_gc = _alloc_seq_num.value++; + if (is_first_alloc) { + assert (_seqnum_first_alloc_gc == 0, "Region " SIZE_FORMAT " metadata is correct", _region_number); + _seqnum_first_alloc_gc = _seqnum_last_alloc_gc; + } + break; + default: + ShouldNotReachHere(); + } + + switch (type) { + case ShenandoahAllocRequest::_alloc_shared: + case ShenandoahAllocRequest::_alloc_shared_gc: + _shared_allocs += size; + break; + case ShenandoahAllocRequest::_alloc_tlab: + _tlab_allocs += size; + break; + case ShenandoahAllocRequest::_alloc_gclab: + _gclab_allocs += size; + break; + default: + ShouldNotReachHere(); + } +} + +inline void ShenandoahHeapRegion::increase_live_data_alloc_words(size_t s) { + internal_increase_live_data(s); +} + +inline void ShenandoahHeapRegion::increase_live_data_gc_words(size_t s) { + internal_increase_live_data(s); + if (ShenandoahPacing) { + _pacer->report_mark(s); + } +} + +inline void ShenandoahHeapRegion::internal_increase_live_data(size_t s) { + size_t new_live_data = Atomic::add(s, &_live_data); +#ifdef ASSERT + size_t live_bytes = new_live_data * HeapWordSize; + size_t used_bytes = used(); + assert(live_bytes <= used_bytes, + "can't have more live data than used: " SIZE_FORMAT ", " SIZE_FORMAT, live_bytes, used_bytes); +#endif +} + +#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP