/hg/icedtea7-forest/jdk: 12 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Oct 26 07:35:48 UTC 2016
changeset 60dac8f738af in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=60dac8f738af
author: andrew
date: Wed Oct 26 03:51:39 2016 +0100
PR3207, RH1367357: lcms2: Out-of-bounds read in Type_MLU_Read()
changeset faa9945a2113 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=faa9945a2113
author: mikael
date: Wed Oct 26 05:35:48 2016 +0100
8141491, PR3160, G592292: Unaligned memory access in Bits.c
Summary: Introduce alignment-safe Copy::conjoint_swap and j.i.m.Unsafe.copySwapMemory
Reviewed-by: jrose, dholmes, psandoz
changeset 4a5d01407e7d in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=4a5d01407e7d
author: mikael
date: Wed Feb 10 19:55:57 2016 -0800
8149611, PR3160, G592292: Add tests for Unsafe.copySwapMemory
Reviewed-by: dholmes
changeset 72afb440625d in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=72afb440625d
author: coffeys
date: Thu Apr 10 20:01:52 2014 +0100
8038491, PR3162: Improve synchronization in ZipFile.read()
Reviewed-by: alanb, chegar
changeset 9926dce198b1 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=9926dce198b1
author: igerasim
date: Thu Sep 10 23:35:48 2015 +0300
8080115, PR3162: (fs) Crash in libgio when calling Files.probeContentType(path) from parallel threads
Summary: Make GnomeFileTypeDetector.probeGio() synchronized and add a regression test based on the test source included in JDK-8080115.
Reviewed-by: chegar
changeset 6326ae6f53ea in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=6326ae6f53ea
author: igerasim
date: Wed Nov 25 17:18:04 2015 +0300
8133207, PR3162: [TEST_BUG] ParallelProbes.java test fails after changes for JDK-8080115
Summary: Do not run in othervm mode.
Reviewed-by: darcy, rriggs
changeset 9923aa63d2c9 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=9923aa63d2c9
author: igerasim
date: Wed Oct 26 06:47:52 2016 +0100
8132551, PR3162: Initialize local variables before returning them in p11_convert.c
Reviewed-by: wetmore
changeset fa0a555b41ee in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=fa0a555b41ee
author: dbuck
date: Wed Oct 26 07:00:20 2016 +0100
8133666, PR3162: OperatingSystemMXBean reports abnormally high machine CPU consumption on Linux
Reviewed-by: sla, mgronlun
changeset 5079c607c53c in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=5079c607c53c
author: alanb
date: Tue Apr 29 13:23:08 2014 +0100
8034057, PR3162: Files.getFileStore and Files.isWritable do not work with SUBST'ed drives (win)
Reviewed-by: alanb, chegar
Contributed-by: pavel.rappo at oracle.com
changeset 98429720eb18 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=98429720eb18
author: igerasim
date: Wed Oct 26 07:37:34 2016 +0100
8072466, PR3162: Deadlock when initializing MulticastSocket and DatagramSocket
Reviewed-by: chegar
changeset f54613458451 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=f54613458451
author: robm
date: Wed Oct 26 08:24:19 2016 +0100
8129957, PR3162: Deadlock in JNDI LDAP implementation when closing the LDAP context
Reviewed-by: vinnie
changeset 0ad544dbe717 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=0ad544dbe717
author: okutsu
date: Thu Oct 01 15:16:35 2015 +0900
8081794, PR3162: ParsePosition getErrorIndex returns 0 for TimeZone parsing problem
Reviewed-by: peytoia, okutsu
Contributed-by: Naveen Kumar <naveen.ah.kumar at oracle.com>
diffstat:
make/java/java/FILES_c.gmk | 1 -
make/java/java/mapfile-vers | 6 -
make/java/net/mapfile-vers | 5 +-
src/share/classes/com/sun/jndi/ldap/LdapClient.java | 55 +-
src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java | 6 +-
src/share/classes/java/nio/Bits.java | 142 +-
src/share/classes/java/text/SimpleDateFormat.java | 2 +-
src/share/classes/java/util/zip/ZipFile.java | 30 +-
src/share/classes/sun/misc/Unsafe.java | 392 +++++-
src/share/native/java/nio/Bits.c | 278 ---
src/share/native/sun/java2d/cmm/lcms/cmstypes.c | 1 +
src/share/native/sun/security/pkcs11/wrapper/p11_convert.c | 10 +-
src/solaris/classes/java/net/PlainDatagramSocketImpl.java | 4 +-
src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java | 2 +-
src/solaris/native/com/sun/management/LinuxOperatingSystem.c | 27 +-
src/solaris/native/java/net/AbstractPlainDatagramSocketImpl.c | 89 -
src/solaris/native/java/net/PlainDatagramSocketImpl.c | 35 +-
src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java | 31 +-
src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java | 8 +-
src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java | 4 +-
src/windows/classes/sun/nio/fs/WindowsConstants.java | 1 +
src/windows/classes/sun/nio/fs/WindowsFileStore.java | 18 +-
src/windows/classes/sun/nio/fs/WindowsLinkSupport.java | 2 +-
src/windows/native/java/net/AbstractPlainDatagramSocketImpl.c | 111 -
src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c | 50 +-
src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c | 43 +-
test/java/net/MulticastSocket/MultiDead.java | 120 +
test/java/nio/file/Files/probeContentType/ParallelProbes.java | 96 +
test/java/text/Format/DateFormat/Bug8081794.java | 51 +
test/java/util/zip/ZipFile/MultiThreadedReadTest.java | 92 +
test/jdk/internal/misc/Unsafe/CopySwap.java | 723 ++++++++++
31 files changed, 1846 insertions(+), 589 deletions(-)
diffs (truncated from 3004 to 500 lines):
diff -r 0ea38364385e -r 0ad544dbe717 make/java/java/FILES_c.gmk
--- a/make/java/java/FILES_c.gmk Wed Sep 28 07:44:58 2016 +0100
+++ b/make/java/java/FILES_c.gmk Thu Oct 01 15:16:35 2015 +0900
@@ -72,7 +72,6 @@
GC.c \
NativeAccessors.c \
Reflection.c \
- Bits.c \
AtomicLong.c \
Version.c \
VM.c \
diff -r 0ea38364385e -r 0ad544dbe717 make/java/java/mapfile-vers
--- a/make/java/java/mapfile-vers Wed Sep 28 07:44:58 2016 +0100
+++ b/make/java/java/mapfile-vers Thu Oct 01 15:16:35 2015 +0900
@@ -219,12 +219,6 @@
Java_java_lang_UNIXProcess_waitForProcessExit;
Java_java_lang_UNIXProcess_forkAndExec;
Java_java_lang_UNIXProcess_destroyProcess;
- Java_java_nio_Bits_copyFromShortArray;
- Java_java_nio_Bits_copyToShortArray;
- Java_java_nio_Bits_copyFromIntArray;
- Java_java_nio_Bits_copyToIntArray;
- Java_java_nio_Bits_copyFromLongArray;
- Java_java_nio_Bits_copyToLongArray;
Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2;
Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2;
Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2;
diff -r 0ea38364385e -r 0ad544dbe717 make/java/net/mapfile-vers
--- a/make/java/net/mapfile-vers Wed Sep 28 07:44:58 2016 +0100
+++ b/make/java/net/mapfile-vers Thu Oct 01 15:16:35 2015 +0900
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2015, 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,8 +28,7 @@
SUNWprivate_1.1 {
global:
JNI_OnLoad;
- Java_java_net_AbstractPlainDatagramSocketImpl_init;
- Java_java_net_AbstractPlainDatagramSocketImpl_dataAvailable;
+ Java_java_net_PlainDatagramSocketImpl_dataAvailable;
Java_java_net_PlainSocketImpl_socketListen;
Java_java_net_PlainDatagramSocketImpl_getTTL;
Java_java_net_PlainDatagramSocketImpl_init;
diff -r 0ea38364385e -r 0ad544dbe717 src/share/classes/com/sun/jndi/ldap/LdapClient.java
--- a/src/share/classes/com/sun/jndi/ldap/LdapClient.java Wed Sep 28 07:44:58 2016 +0100
+++ b/src/share/classes/com/sun/jndi/ldap/LdapClient.java Thu Oct 01 15:16:35 2015 +0900
@@ -494,16 +494,14 @@
*/
void processConnectionClosure() {
// Notify listeners
- synchronized (unsolicited) {
- if (unsolicited.size() > 0) {
- String msg;
- if (conn != null) {
- msg = conn.host + ":" + conn.port + " connection closed";
- } else {
- msg = "Connection closed";
- }
- notifyUnsolicited(new CommunicationException(msg));
+ if (unsolicited.size() > 0) {
+ String msg;
+ if (conn != null) {
+ msg = conn.host + ":" + conn.port + " connection closed";
+ } else {
+ msg = "Connection closed";
}
+ notifyUnsolicited(new CommunicationException(msg));
}
// Remove from pool
@@ -1484,7 +1482,7 @@
// removeUnsolicited() is invoked to remove an LdapCtx from this client.
//
////////////////////////////////////////////////////////////////////////////
- private Vector unsolicited = new Vector(3);
+ private Vector<LdapCtx> unsolicited = new Vector<LdapCtx>(3);
void addUnsolicited(LdapCtx ctx) {
if (debug > 0) {
System.err.println("LdapClient.addUnsolicited" + ctx);
@@ -1496,13 +1494,8 @@
if (debug > 0) {
System.err.println("LdapClient.removeUnsolicited" + ctx);
}
- synchronized (unsolicited) {
- if (unsolicited.size() == 0) {
- return;
- }
unsolicited.removeElement(ctx);
}
- }
// NOTE: Cannot be synchronized because this is called asynchronously
// by the reader thread in Connection. Instead, sync on 'unsolicited' Vector.
@@ -1510,7 +1503,6 @@
if (debug > 0) {
System.err.println("LdapClient.processUnsolicited");
}
- synchronized (unsolicited) {
try {
// Parse the response
LdapResult res = new LdapResult();
@@ -1529,11 +1521,17 @@
forceClose(pooled);
}
- if (unsolicited.size() > 0) {
+ LdapCtx first = null;
+ UnsolicitedNotification notice = null;
+
+ synchronized (unsolicited) {
+ if (unsolicited.size() > 0) {
+ first = unsolicited.elementAt(0);
+
// Create an UnsolicitedNotification using the parsed data
// Need a 'ctx' object because we want to use the context's
// list of provider control factories.
- UnsolicitedNotification notice = new UnsolicitedResponseImpl(
+ notice = new UnsolicitedResponseImpl(
res.extensionId,
res.extensionValue,
res.referrals,
@@ -1541,9 +1539,12 @@
res.errorMessage,
res.matchedDN,
(res.resControls != null) ?
- ((LdapCtx)unsolicited.elementAt(0)).convertControls(res.resControls) :
+ first.convertControls(res.resControls) :
null);
+ }
+ }
+ if (notice != null) {
// Fire UnsolicitedNotification events to listeners
notifyUnsolicited(notice);
@@ -1555,9 +1556,6 @@
}
}
} catch (IOException e) {
- if (unsolicited.size() == 0)
- return; // no one registered; ignore
-
NamingException ne = new CommunicationException(
"Problem parsing unsolicited notification");
ne.setRootCause(e);
@@ -1567,16 +1565,19 @@
} catch (NamingException e) {
notifyUnsolicited(e);
}
- }
}
private void notifyUnsolicited(Object e) {
- for (int i = 0; i < unsolicited.size(); i++) {
- ((LdapCtx)unsolicited.elementAt(i)).fireUnsolicited(e);
+ Vector<LdapCtx> unsolicitedCopy;
+ synchronized (unsolicited) {
+ unsolicitedCopy = new Vector<>(unsolicited);
+ if (e instanceof NamingException) {
+ unsolicited.setSize(0); // no more listeners after exception
+ }
}
- if (e instanceof NamingException) {
- unsolicited.setSize(0); // no more listeners after exception
+ for (int i = 0; i < unsolicitedCopy.size(); i++) {
+ unsolicitedCopy.elementAt(i).fireUnsolicited(e);
}
}
diff -r 0ea38364385e -r 0ad544dbe717 src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
--- a/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java Wed Sep 28 07:44:58 2016 +0100
+++ b/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java Thu Oct 01 15:16:35 2015 +0900
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2015, 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
@@ -70,7 +70,6 @@
static {
java.security.AccessController.doPrivileged(
new sun.security.action.LoadLibraryAction("net"));
- init();
}
/**
@@ -364,6 +363,5 @@
return connectDisabled;
}
- native int dataAvailable();
- private static native void init();
+ abstract int dataAvailable();
}
diff -r 0ea38364385e -r 0ad544dbe717 src/share/classes/java/nio/Bits.java
--- a/src/share/classes/java/nio/Bits.java Wed Sep 28 07:44:58 2016 +0100
+++ b/src/share/classes/java/nio/Bits.java Thu Oct 01 15:16:35 2015 +0900
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2016, 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
@@ -754,31 +754,131 @@
}
}
- static void copyFromCharArray(Object src, long srcPos, long dstAddr,
- long length)
- {
- copyFromShortArray(src, srcPos, dstAddr, length);
+ /**
+ * Copy and unconditionally byte swap 16 bit elements from a heap array to off-heap memory
+ *
+ * @param src
+ * the source array, must be a 16-bit primitive array type
+ * @param srcPos
+ * byte offset within source array of the first element to read
+ * @param dstAddr
+ * destination address
+ * @param length
+ * number of bytes to copy
+ */
+ static void copyFromCharArray(Object src, long srcPos, long dstAddr, long length) {
+ unsafe.copySwapMemory(src, unsafe.arrayBaseOffset(src.getClass()) + srcPos, null, dstAddr, length, 2);
}
- static void copyToCharArray(long srcAddr, Object dst, long dstPos,
- long length)
- {
- copyToShortArray(srcAddr, dst, dstPos, length);
+ /**
+ * Copy and unconditionally byte swap 16 bit elements from off-heap memory to a heap array
+ *
+ * @param srcAddr
+ * source address
+ * @param dst
+ * destination array, must be a 16-bit primitive array type
+ * @param dstPos
+ * byte offset within the destination array of the first element to write
+ * @param length
+ * number of bytes to copy
+ */
+ static void copyToCharArray(long srcAddr, Object dst, long dstPos, long length) {
+ unsafe.copySwapMemory(null, srcAddr, dst, unsafe.arrayBaseOffset(dst.getClass()) + dstPos, length, 2);
}
- static native void copyFromShortArray(Object src, long srcPos, long dstAddr,
- long length);
- static native void copyToShortArray(long srcAddr, Object dst, long dstPos,
- long length);
+ /**
+ * Copy and unconditionally byte swap 16 bit elements from a heap array to off-heap memory
+ *
+ * @param src
+ * the source array, must be a 16-bit primitive array type
+ * @param srcPos
+ * byte offset within source array of the first element to read
+ * @param dstAddr
+ * destination address
+ * @param length
+ * number of bytes to copy
+ */
+ static void copyFromShortArray(Object src, long srcPos, long dstAddr, long length) {
+ unsafe.copySwapMemory(src, unsafe.arrayBaseOffset(src.getClass()) + srcPos, null, dstAddr, length, 2);
+ }
- static native void copyFromIntArray(Object src, long srcPos, long dstAddr,
- long length);
- static native void copyToIntArray(long srcAddr, Object dst, long dstPos,
- long length);
+ /**
+ * Copy and unconditionally byte swap 16 bit elements from off-heap memory to a heap array
+ *
+ * @param srcAddr
+ * source address
+ * @param dst
+ * destination array, must be a 16-bit primitive array type
+ * @param dstPos
+ * byte offset within the destination array of the first element to write
+ * @param length
+ * number of bytes to copy
+ */
+ static void copyToShortArray(long srcAddr, Object dst, long dstPos, long length) {
+ unsafe.copySwapMemory(null, srcAddr, dst, unsafe.arrayBaseOffset(dst.getClass()) + dstPos, length, 2);
+ }
- static native void copyFromLongArray(Object src, long srcPos, long dstAddr,
- long length);
- static native void copyToLongArray(long srcAddr, Object dst, long dstPos,
- long length);
+ /**
+ * Copy and unconditionally byte swap 32 bit elements from a heap array to off-heap memory
+ *
+ * @param src
+ * the source array, must be a 32-bit primitive array type
+ * @param srcPos
+ * byte offset within source array of the first element to read
+ * @param dstAddr
+ * destination address
+ * @param length
+ * number of bytes to copy
+ */
+ static void copyFromIntArray(Object src, long srcPos, long dstAddr, long length) {
+ unsafe.copySwapMemory(src, unsafe.arrayBaseOffset(src.getClass()) + srcPos, null, dstAddr, length, 4);
+ }
+ /**
+ * Copy and unconditionally byte swap 32 bit elements from off-heap memory to a heap array
+ *
+ * @param srcAddr
+ * source address
+ * @param dst
+ * destination array, must be a 32-bit primitive array type
+ * @param dstPos
+ * byte offset within the destination array of the first element to write
+ * @param length
+ * number of bytes to copy
+ */
+ static void copyToIntArray(long srcAddr, Object dst, long dstPos, long length) {
+ unsafe.copySwapMemory(null, srcAddr, dst, unsafe.arrayBaseOffset(dst.getClass()) + dstPos, length, 4);
+ }
+
+ /**
+ * Copy and unconditionally byte swap 64 bit elements from a heap array to off-heap memory
+ *
+ * @param src
+ * the source array, must be a 64-bit primitive array type
+ * @param srcPos
+ * byte offset within source array of the first element to read
+ * @param dstAddr
+ * destination address
+ * @param length
+ * number of bytes to copy
+ */
+ static void copyFromLongArray(Object src, long srcPos, long dstAddr, long length) {
+ unsafe.copySwapMemory(src, unsafe.arrayBaseOffset(src.getClass()) + srcPos, null, dstAddr, length, 8);
+ }
+
+ /**
+ * Copy and unconditionally byte swap 64 bit elements from off-heap memory to a heap array
+ *
+ * @param srcAddr
+ * source address
+ * @param dst
+ * destination array, must be a 64-bit primitive array type
+ * @param dstPos
+ * byte offset within the destination array of the first element to write
+ * @param length
+ * number of bytes to copy
+ */
+ static void copyToLongArray(long srcAddr, Object dst, long dstPos, long length) {
+ unsafe.copySwapMemory(null, srcAddr, dst, unsafe.arrayBaseOffset(dst.getClass()) + dstPos, length, 8);
+ }
}
diff -r 0ea38364385e -r 0ad544dbe717 src/share/classes/java/text/SimpleDateFormat.java
--- a/src/share/classes/java/text/SimpleDateFormat.java Wed Sep 28 07:44:58 2016 +0100
+++ b/src/share/classes/java/text/SimpleDateFormat.java Thu Oct 01 15:16:35 2015 +0900
@@ -1650,7 +1650,7 @@
}
return (start + zoneNames[nameIndex].length());
}
- return 0;
+ return -start;
}
/**
diff -r 0ea38364385e -r 0ad544dbe717 src/share/classes/java/util/zip/ZipFile.java
--- a/src/share/classes/java/util/zip/ZipFile.java Wed Sep 28 07:44:58 2016 +0100
+++ b/src/share/classes/java/util/zip/ZipFile.java Thu Oct 01 15:16:35 2015 +0900
@@ -664,24 +664,26 @@
}
public int read(byte b[], int off, int len) throws IOException {
- if (rem == 0) {
- return -1;
- }
- if (len <= 0) {
- return 0;
- }
- if (len > rem) {
- len = (int) rem;
- }
synchronized (ZipFile.this) {
+ long rem = this.rem;
+ long pos = this.pos;
+ if (rem == 0) {
+ return -1;
+ }
+ if (len <= 0) {
+ return 0;
+ }
+ if (len > rem) {
+ len = (int) rem;
+ }
+
ensureOpenOrZipException();
-
len = ZipFile.read(ZipFile.this.jzfile, jzentry, pos, b,
off, len);
- }
- if (len > 0) {
- pos += len;
- rem -= len;
+ if (len > 0) {
+ this.pos = (pos + len);
+ this.rem = (rem - len);
+ }
}
if (rem == 0) {
close();
diff -r 0ea38364385e -r 0ad544dbe717 src/share/classes/sun/misc/Unsafe.java
--- a/src/share/classes/sun/misc/Unsafe.java Wed Sep 28 07:44:58 2016 +0100
+++ b/src/share/classes/sun/misc/Unsafe.java Thu Oct 01 15:16:35 2015 +0900
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2016, 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
@@ -560,6 +560,76 @@
copyMemory(null, srcAddress, null, destAddress, bytes);
}
+ private boolean isPrimitiveArray(Class<?> c) {
+ Class<?> componentType = c.getComponentType();
+ return componentType != null && componentType.isPrimitive();
+ }
+
+ private native void copySwapMemory0(Object srcBase, long srcOffset,
+ Object destBase, long destOffset,
+ long bytes, long elemSize);
+
+ /**
+ * Copies all elements from one block of memory to another block,
+ * *unconditionally* byte swapping the elements on the fly.
+ *
+ * <p>This method determines each block's base address by means of two parameters,
+ * and so it provides (in effect) a <em>double-register</em> addressing mode,
+ * as discussed in {@link #getInt(Object,long)}. When the object reference is null,
+ * the offset supplies an absolute base address.
+ */
+ public void copySwapMemory(Object srcBase, long srcOffset,
+ Object destBase, long destOffset,
+ long bytes, long elemSize) {
+ if (bytes < 0) {
+ throw new IllegalArgumentException();
+ }
+ if (elemSize != 2 && elemSize != 4 && elemSize != 8) {
+ throw new IllegalArgumentException();
+ }
+ if (bytes % elemSize != 0) {
+ throw new IllegalArgumentException();
+ }
+ if ((srcBase == null && srcOffset == 0) ||
+ (destBase == null && destOffset == 0)) {
+ throw new NullPointerException();
+ }
+
+ // Must be off-heap, or primitive heap arrays
+ if (srcBase != null && (srcOffset < 0 || !isPrimitiveArray(srcBase.getClass()))) {
+ throw new IllegalArgumentException();
+ }
+ if (destBase != null && (destOffset < 0 || !isPrimitiveArray(destBase.getClass()))) {
+ throw new IllegalArgumentException();
+ }
+
+ // Sanity check size and offsets on 32-bit platforms. Most
+ // significant 32 bits must be zero.
+ if (ADDRESS_SIZE == 4 &&
+ (bytes >>> 32 != 0 || srcOffset >>> 32 != 0 || destOffset >>> 32 != 0)) {
+ throw new IllegalArgumentException();
+ }
+
+ if (bytes == 0) {
+ return;
+ }
+
+ copySwapMemory0(srcBase, srcOffset, destBase, destOffset, bytes, elemSize);
+ }
+
+ /**
+ * Copies all elements from one block of memory to another block, byte swapping the
+ * elements on the fly.
+ *
+ * This provides a <em>single-register</em> addressing mode, as
+ * discussed in {@link #getInt(Object,long)}.
+ *
+ * Equivalent to {@code copySwapMemory(null, srcAddress, null, destAddress, bytes, elemSize)}.
+ */
+ public void copySwapMemory(long srcAddress, long destAddress, long bytes, long elemSize) {
+ copySwapMemory(null, srcAddress, null, destAddress, bytes, elemSize);
More information about the distro-pkg-dev
mailing list