changeset in /hg/icedtea: Update to b36.
Andrew John Hughes
gnu_andrew at member.fsf.org
Fri Sep 26 15:12:47 PDT 2008
changeset d8f5772482ea in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d8f5772482ea
description:
Update to b36.
2008-09-26 Andrew John Hughes <gnu_andrew at member.fsf.org>
* patches/icedtea-override.patch:
Removed. @Override problems fixed globally.
* Makefile.am:
Updated to b36 and added the @Override
find/perl fix discussed on list with
Chris Jester-Young.
* generated/java/nio/ByteBuffer.java,
* generated/java/nio/CharBuffer.java,
* generated/java/nio/DirectByteBuffer.java,
* generated/java/nio/DirectByteBufferR.java,
* generated/java/nio/DirectCharBufferRS.java,
* generated/java/nio/DirectCharBufferRU.java,
* generated/java/nio/DirectCharBufferS.java,
* generated/java/nio/DirectCharBufferU.java,
* generated/java/nio/DirectDoubleBufferRS.java,
* generated/java/nio/DirectDoubleBufferRU.java,
* generated/java/nio/DirectDoubleBufferS.java,
* generated/java/nio/DirectDoubleBufferU.java,
* generated/java/nio/DirectFloatBufferRS.java,
* generated/java/nio/DirectFloatBufferRU.java,
* generated/java/nio/DirectFloatBufferS.java,
* generated/java/nio/DirectFloatBufferU.java,
* generated/java/nio/DirectIntBufferRS.java,
* generated/java/nio/DirectIntBufferRU.java,
* generated/java/nio/DirectIntBufferS.java,
* generated/java/nio/DirectIntBufferU.java,
* generated/java/nio/DirectLongBufferRS.java,
* generated/java/nio/DirectLongBufferRU.java,
* generated/java/nio/DirectLongBufferS.java,
* generated/java/nio/DirectLongBufferU.java,
* generated/java/nio/DirectShortBufferRS.java,
* generated/java/nio/DirectShortBufferRU.java,
* generated/java/nio/DirectShortBufferS.java,
* generated/java/nio/DirectShortBufferU.java,
* generated/java/nio/DoubleBuffer.java,
* generated/java/nio/FloatBuffer.java,
* generated/java/nio/IntBuffer.java,
* generated/java/nio/LongBuffer.java,
* generated/java/nio/ShortBuffer.java,
* generated/java/nio/charset/CharsetEncoder.java:
Regenerated.
* generated/sun/nio/ch/SocketOptionRegistry.java:
Generated as a result of S4654044.
* patches/icedtea-ant.patch,
* patches/icedtea-override-redirect-metacity.patch:
Updated against b36; a chunk in each no longer applies.
diffstat:
40 files changed, 550 insertions(+), 266 deletions(-)
ChangeLog | 49 +++++++++
Makefile.am | 36 +++---
generated/java/nio/ByteBuffer.java | 2
generated/java/nio/CharBuffer.java | 2
generated/java/nio/DirectByteBuffer.java | 53 ++++++----
generated/java/nio/DirectByteBufferR.java | 11 ++
generated/java/nio/DirectCharBufferRS.java | 11 ++
generated/java/nio/DirectCharBufferRU.java | 11 ++
generated/java/nio/DirectCharBufferS.java | 21 +++-
generated/java/nio/DirectCharBufferU.java | 21 +++-
generated/java/nio/DirectDoubleBufferRS.java | 11 ++
generated/java/nio/DirectDoubleBufferRU.java | 11 ++
generated/java/nio/DirectDoubleBufferS.java | 21 +++-
generated/java/nio/DirectDoubleBufferU.java | 21 +++-
generated/java/nio/DirectFloatBufferRS.java | 11 ++
generated/java/nio/DirectFloatBufferRU.java | 11 ++
generated/java/nio/DirectFloatBufferS.java | 21 +++-
generated/java/nio/DirectFloatBufferU.java | 21 +++-
generated/java/nio/DirectIntBufferRS.java | 11 ++
generated/java/nio/DirectIntBufferRU.java | 11 ++
generated/java/nio/DirectIntBufferS.java | 21 +++-
generated/java/nio/DirectIntBufferU.java | 21 +++-
generated/java/nio/DirectLongBufferRS.java | 11 ++
generated/java/nio/DirectLongBufferRU.java | 11 ++
generated/java/nio/DirectLongBufferS.java | 21 +++-
generated/java/nio/DirectLongBufferU.java | 21 +++-
generated/java/nio/DirectShortBufferRS.java | 11 ++
generated/java/nio/DirectShortBufferRU.java | 11 ++
generated/java/nio/DirectShortBufferS.java | 21 +++-
generated/java/nio/DirectShortBufferU.java | 21 +++-
generated/java/nio/DoubleBuffer.java | 2
generated/java/nio/FloatBuffer.java | 2
generated/java/nio/IntBuffer.java | 2
generated/java/nio/LongBuffer.java | 2
generated/java/nio/ShortBuffer.java | 2
generated/java/nio/charset/CharsetEncoder.java | 8 -
generated/sun/nio/ch/SocketOptionRegistry.java | 83 +++++++++++++++
patches/icedtea-ant.patch | 46 +++-----
patches/icedtea-override-redirect-metacity.patch | 17 ---
patches/icedtea-override.patch | 115 ----------------------
diffs (truncated from 1853 to 500 lines):
diff -r 031b41c24fc4 -r d8f5772482ea ChangeLog
--- a/ChangeLog Sat Sep 13 03:54:24 2008 +0100
+++ b/ChangeLog Fri Sep 26 23:12:33 2008 +0100
@@ -1,3 +1,52 @@ 2008-09-13 Andrew John Hughes <gnu_and
+2008-09-26 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * patches/icedtea-override.patch:
+ Removed. @Override problems fixed globally.
+ * Makefile.am:
+ Updated to b36 and added the @Override
+ find/perl fix discussed on list with
+ Chris Jester-Young.
+ * generated/java/nio/ByteBuffer.java,
+ * generated/java/nio/CharBuffer.java,
+ * generated/java/nio/DirectByteBuffer.java,
+ * generated/java/nio/DirectByteBufferR.java,
+ * generated/java/nio/DirectCharBufferRS.java,
+ * generated/java/nio/DirectCharBufferRU.java,
+ * generated/java/nio/DirectCharBufferS.java,
+ * generated/java/nio/DirectCharBufferU.java,
+ * generated/java/nio/DirectDoubleBufferRS.java,
+ * generated/java/nio/DirectDoubleBufferRU.java,
+ * generated/java/nio/DirectDoubleBufferS.java,
+ * generated/java/nio/DirectDoubleBufferU.java,
+ * generated/java/nio/DirectFloatBufferRS.java,
+ * generated/java/nio/DirectFloatBufferRU.java,
+ * generated/java/nio/DirectFloatBufferS.java,
+ * generated/java/nio/DirectFloatBufferU.java,
+ * generated/java/nio/DirectIntBufferRS.java,
+ * generated/java/nio/DirectIntBufferRU.java,
+ * generated/java/nio/DirectIntBufferS.java,
+ * generated/java/nio/DirectIntBufferU.java,
+ * generated/java/nio/DirectLongBufferRS.java,
+ * generated/java/nio/DirectLongBufferRU.java,
+ * generated/java/nio/DirectLongBufferS.java,
+ * generated/java/nio/DirectLongBufferU.java,
+ * generated/java/nio/DirectShortBufferRS.java,
+ * generated/java/nio/DirectShortBufferRU.java,
+ * generated/java/nio/DirectShortBufferS.java,
+ * generated/java/nio/DirectShortBufferU.java,
+ * generated/java/nio/DoubleBuffer.java,
+ * generated/java/nio/FloatBuffer.java,
+ * generated/java/nio/IntBuffer.java,
+ * generated/java/nio/LongBuffer.java,
+ * generated/java/nio/ShortBuffer.java,
+ * generated/java/nio/charset/CharsetEncoder.java:
+ Regenerated.
+ * generated/sun/nio/ch/SocketOptionRegistry.java:
+ Generated as a result of S4654044.
+ * patches/icedtea-ant.patch,
+ * patches/icedtea-override-redirect-metacity.patch:
+ Updated against b36; a chunk in each no longer applies.
+
2008-09-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am: Add the project name
diff -r 031b41c24fc4 -r d8f5772482ea Makefile.am
--- a/Makefile.am Sat Sep 13 03:54:24 2008 +0100
+++ b/Makefile.am Fri Sep 26 23:12:33 2008 +0100
@@ -1,6 +1,6 @@ OPENJDK_DATE = 11_sep_2008
-OPENJDK_DATE = 11_sep_2008
-OPENJDK_MD5SUM = 324ee7ead3c2e548a129730685815da4
-OPENJDK_VERSION = b35
+OPENJDK_DATE = 25_sep_2008
+OPENJDK_MD5SUM = 6432f04891bc0e61142a73bb8500314c
+OPENJDK_VERSION = b36
CACAO_VERSION = 0.99.3
CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8
@@ -549,7 +549,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-shark-build.patch \
patches/icedtea-toolkit.patch \
patches/icedtea-security-updates.patch \
- patches/icedtea-override.patch \
patches/icedtea-constructor-properties.patch \
patches/icedtea-jsoundhs.patch \
patches/icedtea-jdk-docs-target.patch \
@@ -678,20 +677,7 @@ stamps/patch.stamp: stamps/patch-fsg.sta
echo ERROR patch $${all_patches_ok} FAILED! ; \
echo WARNING make clean-patch before retrying a fix ; \
false; \
- fi ; \
- if [ -e $(abs_top_srcdir)/.hg ]; then \
- revision="-r`(cd $(srcdir); $(HG) tip|grep changeset|cut -d':' -f2|sed -r 's#\W+##')`" ; \
- fi ; \
- icedtea_version="$(PACKAGE_VERSION)$${revision}" ; \
- if test x"$(PROJECT_NAME)" != "xjdk7"; then \
- proj_suffix="-$(PROJECT_NAME)"; \
- fi ; \
- if test x"$(VERSION_SUFFIX)" != "x"; then \
- ver_suffix="-$(VERSION_SUFFIX)"; \
- fi ; \
- sed -i "s#IcedTea#IcedTea $${icedtea_version}#" openjdk/jdk/make/common/shared/Defs.gmk ; \
- sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${proj_suffix}$${ver_suffix}#" \
- openjdk/jdk/make/common/shared/Defs.gmk
+ fi ;
clean-patch:
rm -f stamps/patch.stamp
@@ -774,6 +760,20 @@ clean-patch-fsg:
fi
stamps/overlay.stamp: stamps/patch.stamp
+ if [ -e $(abs_top_srcdir)/.hg ]; then \
+ revision="-r`(cd $(srcdir); $(HG) tip|grep changeset|cut -d':' -f2|sed -r 's#\W+##')`" ; \
+ fi ; \
+ icedtea_version="$(PACKAGE_VERSION)$${revision}" ; \
+ if test x"$(PROJECT_NAME)" != "xjdk7"; then \
+ proj_suffix="-$(PROJECT_NAME)"; \
+ fi ; \
+ if test x"$(VERSION_SUFFIX)" != "x"; then \
+ ver_suffix="-$(VERSION_SUFFIX)"; \
+ fi ; \
+ sed -i "s#IcedTea#IcedTea $${icedtea_version}#" openjdk/jdk/make/common/shared/Defs.gmk ; \
+ sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${proj_suffix}$${ver_suffix}#" \
+ openjdk/jdk/make/common/shared/Defs.gmk; \
+ find openjdk -name '*.java' -exec sed -i 's/^[[:space:]]*@Override//' {} + ; \
cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/ \
&& touch stamps/overlay.stamp
diff -r 031b41c24fc4 -r d8f5772482ea generated/java/nio/ByteBuffer.java
--- a/generated/java/nio/ByteBuffer.java Sat Sep 13 03:54:24 2008 +0100
+++ b/generated/java/nio/ByteBuffer.java Fri Sep 26 23:12:33 2008 +0100
@@ -1061,7 +1061,7 @@ public abstract class ByteBuffer
-
+
/**
* Returns the current hash code of this buffer.
diff -r 031b41c24fc4 -r d8f5772482ea generated/java/nio/CharBuffer.java
--- a/generated/java/nio/CharBuffer.java Sat Sep 13 03:54:24 2008 +0100
+++ b/generated/java/nio/CharBuffer.java Fri Sep 26 23:12:33 2008 +0100
@@ -1061,7 +1061,7 @@ public abstract class CharBuffer
-
+
/**
* Returns the current hash code of this buffer.
diff -r 031b41c24fc4 -r d8f5772482ea generated/java/nio/DirectByteBuffer.java
--- a/generated/java/nio/DirectByteBuffer.java Sat Sep 13 03:54:24 2008 +0100
+++ b/generated/java/nio/DirectByteBuffer.java Fri Sep 26 23:12:33 2008 +0100
@@ -47,6 +47,9 @@ class DirectByteBuffer
// Cached unsafe-access object
protected static final Unsafe unsafe = Bits.unsafe();
+ // Cached array base offset
+ private static final long arrayBaseOffset = (long)unsafe.arrayBaseOffset(byte[].class);
+
// Cached unaligned-access capability
protected static final boolean unaligned = Bits.unaligned();
@@ -71,11 +74,13 @@ class DirectByteBuffer
private static Unsafe unsafe = Unsafe.getUnsafe();
private long address;
+ private long size;
private int capacity;
- private Deallocator(long address, int capacity) {
+ private Deallocator(long address, long size, int capacity) {
assert (address != 0);
this.address = address;
+ this.size = size;
this.capacity = capacity;
}
@@ -86,7 +91,7 @@ class DirectByteBuffer
}
unsafe.freeMemory(address);
address = 0;
- Bits.unreserveMemory(capacity);
+ Bits.unreserveMemory(size, capacity);
}
}
@@ -110,23 +115,25 @@ class DirectByteBuffer
DirectByteBuffer(int cap) { // package-private
super(-1, 0, cap, cap, false);
- Bits.reserveMemory(cap);
int ps = Bits.pageSize();
+ int size = cap + ps;
+ Bits.reserveMemory(size, cap);
+
long base = 0;
try {
- base = unsafe.allocateMemory(cap + ps);
+ base = unsafe.allocateMemory(size);
} catch (OutOfMemoryError x) {
- Bits.unreserveMemory(cap);
+ Bits.unreserveMemory(size, cap);
throw x;
}
- unsafe.setMemory(base, cap + ps, (byte) 0);
+ unsafe.setMemory(base, size, (byte) 0);
if (base % ps != 0) {
// Round up to page boundary
address = base + ps - (base & (ps - 1));
} else {
address = base;
}
- cleaner = Cleaner.create(this, new Deallocator(base, cap));
+ cleaner = Cleaner.create(this, new Deallocator(base, size, cap));
@@ -238,14 +245,16 @@ class DirectByteBuffer
if (length > rem)
throw new BufferUnderflowException();
- if (order() != ByteOrder.nativeOrder())
- Bits.copyToByteArray(ix(pos), dst,
- offset << 0,
- length << 0);
- else
- Bits.copyToByteArray(ix(pos), dst,
- offset << 0,
- length << 0);
+
+
+
+
+
+
+
+ Bits.copyToArray(ix(pos), dst, arrayBaseOffset,
+ offset << 0,
+ length << 0);
position(pos + length);
} else {
super.get(dst, offset, length);
@@ -328,12 +337,14 @@ class DirectByteBuffer
if (length > rem)
throw new BufferOverflowException();
- if (order() != ByteOrder.nativeOrder())
- Bits.copyFromByteArray(src, offset << 0,
- ix(pos), length << 0);
- else
- Bits.copyFromByteArray(src, offset << 0,
- ix(pos), length << 0);
+
+
+
+
+
+
+ Bits.copyFromArray(src, arrayBaseOffset, offset << 0,
+ ix(pos), length << 0);
position(pos + length);
} else {
super.put(src, offset, length);
diff -r 031b41c24fc4 -r d8f5772482ea generated/java/nio/DirectByteBufferR.java
--- a/generated/java/nio/DirectByteBufferR.java Sat Sep 13 03:54:24 2008 +0100
+++ b/generated/java/nio/DirectByteBufferR.java Fri Sep 26 23:12:33 2008 +0100
@@ -105,9 +105,16 @@ class DirectByteBufferR
+
+
+
+
+
// Primary constructor
//
DirectByteBufferR(int cap) { // package-private
+
+
@@ -258,6 +265,8 @@ class DirectByteBufferR
+
+
public ByteBuffer put(byte x) {
@@ -318,6 +327,8 @@ class DirectByteBufferR
}
public ByteBuffer put(byte[] src, int offset, int length) {
+
+
diff -r 031b41c24fc4 -r d8f5772482ea generated/java/nio/DirectCharBufferRS.java
--- a/generated/java/nio/DirectCharBufferRS.java Sat Sep 13 03:54:24 2008 +0100
+++ b/generated/java/nio/DirectCharBufferRS.java Fri Sep 26 23:12:33 2008 +0100
@@ -159,6 +159,13 @@ class DirectCharBufferRS
+
+
+
+
+
+
+
// For duplicates and slices
//
DirectCharBufferRS(DirectBuffer db, // package-private
@@ -258,6 +265,8 @@ class DirectCharBufferRS
+
+
public CharBuffer put(char x) {
@@ -318,6 +327,8 @@ class DirectCharBufferRS
}
public CharBuffer put(char[] src, int offset, int length) {
+
+
diff -r 031b41c24fc4 -r d8f5772482ea generated/java/nio/DirectCharBufferRU.java
--- a/generated/java/nio/DirectCharBufferRU.java Sat Sep 13 03:54:24 2008 +0100
+++ b/generated/java/nio/DirectCharBufferRU.java Fri Sep 26 23:12:33 2008 +0100
@@ -159,6 +159,13 @@ class DirectCharBufferRU
+
+
+
+
+
+
+
// For duplicates and slices
//
DirectCharBufferRU(DirectBuffer db, // package-private
@@ -258,6 +265,8 @@ class DirectCharBufferRU
+
+
public CharBuffer put(char x) {
@@ -318,6 +327,8 @@ class DirectCharBufferRU
}
public CharBuffer put(char[] src, int offset, int length) {
+
+
diff -r 031b41c24fc4 -r d8f5772482ea generated/java/nio/DirectCharBufferS.java
--- a/generated/java/nio/DirectCharBufferS.java Sat Sep 13 03:54:24 2008 +0100
+++ b/generated/java/nio/DirectCharBufferS.java Fri Sep 26 23:12:33 2008 +0100
@@ -47,6 +47,9 @@ class DirectCharBufferS
// Cached unsafe-access object
protected static final Unsafe unsafe = Bits.unsafe();
+ // Cached array base offset
+ private static final long arrayBaseOffset = (long)unsafe.arrayBaseOffset(char[].class);
+
// Cached unaligned-access capability
protected static final boolean unaligned = Bits.unaligned();
@@ -97,7 +100,11 @@ class DirectCharBufferS
+
+
public Cleaner cleaner() { return null; }
+
+
@@ -238,14 +245,16 @@ class DirectCharBufferS
if (length > rem)
throw new BufferUnderflowException();
+
if (order() != ByteOrder.nativeOrder())
Bits.copyToCharArray(ix(pos), dst,
offset << 1,
length << 1);
else
- Bits.copyToByteArray(ix(pos), dst,
- offset << 1,
- length << 1);
+
+ Bits.copyToArray(ix(pos), dst, arrayBaseOffset,
+ offset << 1,
+ length << 1);
position(pos + length);
} else {
super.get(dst, offset, length);
@@ -328,12 +337,14 @@ class DirectCharBufferS
if (length > rem)
throw new BufferOverflowException();
+
if (order() != ByteOrder.nativeOrder())
Bits.copyFromCharArray(src, offset << 1,
ix(pos), length << 1);
else
- Bits.copyFromByteArray(src, offset << 1,
- ix(pos), length << 1);
+
+ Bits.copyFromArray(src, arrayBaseOffset, offset << 1,
+ ix(pos), length << 1);
position(pos + length);
} else {
super.put(src, offset, length);
diff -r 031b41c24fc4 -r d8f5772482ea generated/java/nio/DirectCharBufferU.java
--- a/generated/java/nio/DirectCharBufferU.java Sat Sep 13 03:54:24 2008 +0100
+++ b/generated/java/nio/DirectCharBufferU.java Fri Sep 26 23:12:33 2008 +0100
@@ -47,6 +47,9 @@ class DirectCharBufferU
// Cached unsafe-access object
protected static final Unsafe unsafe = Bits.unsafe();
+ // Cached array base offset
+ private static final long arrayBaseOffset = (long)unsafe.arrayBaseOffset(char[].class);
+
// Cached unaligned-access capability
protected static final boolean unaligned = Bits.unaligned();
@@ -97,7 +100,11 @@ class DirectCharBufferU
+
+
public Cleaner cleaner() { return null; }
+
+
@@ -238,14 +245,16 @@ class DirectCharBufferU
if (length > rem)
throw new BufferUnderflowException();
+
if (order() != ByteOrder.nativeOrder())
Bits.copyToCharArray(ix(pos), dst,
offset << 1,
length << 1);
else
- Bits.copyToByteArray(ix(pos), dst,
- offset << 1,
- length << 1);
+
+ Bits.copyToArray(ix(pos), dst, arrayBaseOffset,
+ offset << 1,
+ length << 1);
position(pos + length);
} else {
super.get(dst, offset, length);
@@ -328,12 +337,14 @@ class DirectCharBufferU
if (length > rem)
throw new BufferOverflowException();
+
if (order() != ByteOrder.nativeOrder())
Bits.copyFromCharArray(src, offset << 1,
ix(pos), length << 1);
else
- Bits.copyFromByteArray(src, offset << 1,
- ix(pos), length << 1);
+
+ Bits.copyFromArray(src, arrayBaseOffset, offset << 1,
+ ix(pos), length << 1);
position(pos + length);
} else {
super.put(src, offset, length);
diff -r 031b41c24fc4 -r d8f5772482ea generated/java/nio/DirectDoubleBufferRS.java
--- a/generated/java/nio/DirectDoubleBufferRS.java Sat Sep 13 03:54:24 2008 +0100
+++ b/generated/java/nio/DirectDoubleBufferRS.java Fri Sep 26 23:12:33 2008 +0100
@@ -159,6 +159,13 @@ class DirectDoubleBufferRS
+
+
+
More information about the distro-pkg-dev
mailing list