archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8199462: Use Reference.reachabilityFence in direct ByteBuffer methods

Browse source 
Reviewed-by: psandoz, vlivanov, plevart
This commit is contained in:
Ben Walsh 2018-03-12 16:09:18 -07:00 • committed by Paul Sandoz
parent f439f2166b
commit de3604ea0c
6 changed files with 113 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

112
src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -28,6 +28,7 @@
package java.nio;
import java.io.FileDescriptor;
import java.lang.ref.Reference;
import jdk.internal.misc.VM;
import jdk.internal.ref.Cleaner;
import sun.nio.ch.DirectBuffer;
@ -257,16 +258,28 @@ class Direct$Type$Buffer$RW$$BO$
}
public $type$ get() {
return $fromBits$($swap$(UNSAFE.get$Swaptype$(ix(nextGetIndex()))));
try {
return $fromBits$($swap$(UNSAFE.get$Swaptype$(ix(nextGetIndex()))));
} finally {
Reference.reachabilityFence(this);
}
}
public $type$ get(int i) {
return $fromBits$($swap$(UNSAFE.get$Swaptype$(ix(checkIndex(i)))));
try {
return $fromBits$($swap$(UNSAFE.get$Swaptype$(ix(checkIndex(i)))));
} finally {
Reference.reachabilityFence(this);
}
}
#if[streamableType]
$type$ getUnchecked(int i) {
return $fromBits$($swap$(UNSAFE.get$Swaptype$(ix(i))));
try {
return $fromBits$($swap$(UNSAFE.get$Swaptype$(ix(i))));
} finally {
Reference.reachabilityFence(this);
}
}
#end[streamableType]
@ -282,21 +295,25 @@ class Direct$Type$Buffer$RW$$BO$
throw new BufferUnderflowException();
long dstOffset = ARRAY_BASE_OFFSET + ((long)offset << $LG_BYTES_PER_VALUE$);
try {
#if[!byte]
if (order() != ByteOrder.nativeOrder())
UNSAFE.copySwapMemory(null,
if (order() != ByteOrder.nativeOrder())
UNSAFE.copySwapMemory(null,
ix(pos),
dst,
dstOffset,
(long)length << $LG_BYTES_PER_VALUE$,
(long)1 << $LG_BYTES_PER_VALUE$);
else
#end[!byte]
UNSAFE.copyMemory(null,
ix(pos),
dst,
dstOffset,
(long)length << $LG_BYTES_PER_VALUE$,
(long)1 << $LG_BYTES_PER_VALUE$);
else
#end[!byte]
UNSAFE.copyMemory(null,
ix(pos),
dst,
dstOffset,
(long)length << $LG_BYTES_PER_VALUE$);
(long)length << $LG_BYTES_PER_VALUE$);
} finally {
Reference.reachabilityFence(this);
}
position(pos + length);
} else {
super.get(dst, offset, length);
@ -311,7 +328,11 @@ class Direct$Type$Buffer$RW$$BO$
public $Type$Buffer put($type$ x) {
#if[rw]
UNSAFE.put$Swaptype$(ix(nextPutIndex()), $swap$($toBits$(x)));
try {
UNSAFE.put$Swaptype$(ix(nextPutIndex()), $swap$($toBits$(x)));
} finally {
Reference.reachabilityFence(this);
}
return this;
#else[rw]
throw new ReadOnlyBufferException();
@ -320,7 +341,11 @@ class Direct$Type$Buffer$RW$$BO$
public $Type$Buffer put(int i, $type$ x) {
#if[rw]
UNSAFE.put$Swaptype$(ix(checkIndex(i)), $swap$($toBits$(x)));
try {
UNSAFE.put$Swaptype$(ix(checkIndex(i)), $swap$($toBits$(x)));
} finally {
Reference.reachabilityFence(this);
}
return this;
#else[rw]
throw new ReadOnlyBufferException();
@ -346,7 +371,12 @@ class Direct$Type$Buffer$RW$$BO$
if (srem > rem)
throw new BufferOverflowException();
UNSAFE.copyMemory(sb.ix(spos), ix(pos), (long)srem << $LG_BYTES_PER_VALUE$);
try {
UNSAFE.copyMemory(sb.ix(spos), ix(pos), (long)srem << $LG_BYTES_PER_VALUE$);
} finally {
Reference.reachabilityFence(sb);
Reference.reachabilityFence(this);
}
sb.position(spos + srem);
position(pos + srem);
} else if (src.hb != null) {
@ -380,21 +410,25 @@ class Direct$Type$Buffer$RW$$BO$
throw new BufferOverflowException();
long srcOffset = ARRAY_BASE_OFFSET + ((long)offset << $LG_BYTES_PER_VALUE$);
try {
#if[!byte]
if (order() != ByteOrder.nativeOrder())
UNSAFE.copySwapMemory(src,
if (order() != ByteOrder.nativeOrder())
UNSAFE.copySwapMemory(src,
srcOffset,
null,
ix(pos),
(long)length << $LG_BYTES_PER_VALUE$,
(long)1 << $LG_BYTES_PER_VALUE$);
else
#end[!byte]
UNSAFE.copyMemory(src,
srcOffset,
null,
ix(pos),
(long)length << $LG_BYTES_PER_VALUE$,
(long)1 << $LG_BYTES_PER_VALUE$);
else
#end[!byte]
UNSAFE.copyMemory(src,
srcOffset,
null,
ix(pos),
(long)length << $LG_BYTES_PER_VALUE$);
(long)length << $LG_BYTES_PER_VALUE$);
} finally {
Reference.reachabilityFence(this);
}
position(pos + length);
} else {
super.put(src, offset, length);
@ -411,8 +445,11 @@ class Direct$Type$Buffer$RW$$BO$
int lim = limit();
assert (pos <= lim);
int rem = (pos <= lim ? lim - pos : 0);
UNSAFE.copyMemory(ix(pos), ix(0), (long)rem << $LG_BYTES_PER_VALUE$);
try {
UNSAFE.copyMemory(ix(pos), ix(0), (long)rem << $LG_BYTES_PER_VALUE$);
} finally {
Reference.reachabilityFence(this);
}
position(rem);
limit(capacity());
discardMark();
@ -497,19 +534,6 @@ class Direct$Type$Buffer$RW$$BO$
#if[byte]
byte _get(int i) { // package-private
return UNSAFE.getByte(address + i);
}
void _put(int i, byte b) { // package-private
#if[rw]
UNSAFE.putByte(address + i, b);
#else[rw]
throw new ReadOnlyBufferException();
#end[rw]
}
// #BIN
//
// Binary-data access methods for short, char, int, long, float,