1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater

Browse Source 
Reviewed-by: alanb
This commit is contained in:
David M Lloyd 2018-04-19 10:33:35 -07:00 committed by Xueming Shen
parent 9303a8a180
commit 883d41fefc
7 changed files with 1378 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

472
src/java.base/share/classes/java/util/zip/Deflater.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 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
@ -26,7 +26,13 @@
package java.util.zip;
import java.lang.ref.Cleaner.Cleanable;
import java.lang.ref.Reference;
import java.nio.ByteBuffer;
import java.nio.ReadOnlyBufferException;
import java.util.Objects;
import jdk.internal.ref.CleanerFactory;
import sun.nio.ch.DirectBuffer;
/**
* This class provides support for general purpose compression using the
@ -35,8 +41,14 @@ import jdk.internal.ref.CleanerFactory;
* protected by patents. It is fully described in the specifications at
* the <a href="package-summary.html#package.description">java.util.zip
* package description</a>.
*
* <p>The following code fragment demonstrates a trivial compression
* <p>
* This class deflates sequences of bytes into ZLIB compressed data format.
* The input byte sequence is provided in either byte array or byte buffer,
* via one of the {@code setInput()} methods. The output byte sequence is
* written to the output byte array or byte buffer passed to the
* {@code deflate()} methods.
* <p>
* The following code fragment demonstrates a trivial compression
* and decompression of a string using {@code Deflater} and
* {@code Inflater}.
*
@ -92,8 +104,9 @@ import jdk.internal.ref.CleanerFactory;
public class Deflater {
private final DeflaterZStreamRef zsRef;
private byte[] buf = new byte[0];
private int off, len;
private ByteBuffer input = ZipUtils.defaultBuf;
private byte[] inputArray;
private int inputPos, inputLim;
private int level, strategy;
private boolean setParams;
private boolean finish, finished;
@ -170,9 +183,14 @@ public class Deflater {
*/
public static final int FULL_FLUSH = 3;
/**
* Flush mode to use at the end of output. Can only be provided by the
* user by way of {@link #finish()}.
*/
private static final int FINISH = 4;
static {
ZipUtils.loadLibrary();
initIDs();
}
/**
@ -208,35 +226,71 @@ public class Deflater {
}
/**
* Sets input data for compression. This should be called whenever
* needsInput() returns true indicating that more input data is required.
* @param b the input data bytes
* Sets input data for compression.
* <p>
* One of the {@code setInput()} methods should be called whenever
* {@code needsInput()} returns true indicating that more input data
* is required.
* <p>
* @param input the input data bytes
* @param off the start offset of the data
* @param len the length of the data
* @see Deflater#needsInput
*/
public void setInput(byte[] b, int off, int len) {
if (b== null) {
throw new NullPointerException();
}
if (off < 0 || len < 0 || off > b.length - len) {
public void setInput(byte[] input, int off, int len) {
if (off < 0 || len < 0 || off > input.length - len) {
throw new ArrayIndexOutOfBoundsException();
}
synchronized (zsRef) {
this.buf = b;
this.off = off;
this.len = len;
this.input = null;
this.inputArray = input;
this.inputPos = off;
this.inputLim = off + len;
}
}
/**
* Sets input data for compression. This should be called whenever
* needsInput() returns true indicating that more input data is required.
* @param b the input data bytes
* Sets input data for compression.
* <p>
* One of the {@code setInput()} methods should be called whenever
* {@code needsInput()} returns true indicating that more input data
* is required.
* <p>
* @param input the input data bytes
* @see Deflater#needsInput
*/
public void setInput(byte[] b) {
setInput(b, 0, b.length);
public void setInput(byte[] input) {
setInput(input, 0, input.length);
}
/**
* Sets input data for compression.
* <p>
* One of the {@code setInput()} methods should be called whenever
* {@code needsInput()} returns true indicating that more input data
* is required.
* <p>
* The given buffer's position will be advanced as deflate
* operations are performed, up to the buffer's limit.
* The input buffer may be modified (refilled) between deflate
* operations; doing so is equivalent to creating a new buffer
* and setting it with this method.
* <p>
* Modifying the input buffer's contents, position, or limit
* concurrently with an deflate operation will result in
* undefined behavior, which may include incorrect operation
* results or operation failure.
*
* @param input the input data bytes
* @see Deflater#needsInput
* @since 11
*/
public void setInput(ByteBuffer input) {
Objects.requireNonNull(input);
synchronized (zsRef) {
this.input = input;
this.inputArray = null;
}
}
/**
@ -245,22 +299,19 @@ public class Deflater {
* uncompressed with Inflater.inflate(), Inflater.getAdler() can be called
* in order to get the Adler-32 value of the dictionary required for
* decompression.
* @param b the dictionary data bytes
* @param dictionary the dictionary data bytes
* @param off the start offset of the data
* @param len the length of the data
* @see Inflater#inflate
* @see Inflater#getAdler
*/
public void setDictionary(byte[] b, int off, int len) {
if (b == null) {
throw new NullPointerException();
}
if (off < 0 || len < 0 || off > b.length - len) {
public void setDictionary(byte[] dictionary, int off, int len) {
if (off < 0 || len < 0 || off > dictionary.length - len) {
throw new ArrayIndexOutOfBoundsException();
}
synchronized (zsRef) {
ensureOpen();
setDictionary(zsRef.address(), b, off, len);
setDictionary(zsRef.address(), dictionary, off, len);
}
}
@ -270,12 +321,47 @@ public class Deflater {
* uncompressed with Inflater.inflate(), Inflater.getAdler() can be called
* in order to get the Adler-32 value of the dictionary required for
* decompression.
* @param b the dictionary data bytes
* @param dictionary the dictionary data bytes
* @see Inflater#inflate
* @see Inflater#getAdler
*/
public void setDictionary(byte[] b) {
setDictionary(b, 0, b.length);
public void setDictionary(byte[] dictionary) {
setDictionary(dictionary, 0, dictionary.length);
}
/**
* Sets preset dictionary for compression. A preset dictionary is used
* when the history buffer can be predetermined. When the data is later
* uncompressed with Inflater.inflate(), Inflater.getAdler() can be called
* in order to get the Adler-32 value of the dictionary required for
* decompression.
* <p>
* The bytes in given byte buffer will be fully consumed by this method. On
* return, its position will equal its limit.
*
* @param dictionary the dictionary data bytes
* @see Inflater#inflate
* @see Inflater#getAdler
*/
public void setDictionary(ByteBuffer dictionary) {
synchronized (zsRef) {
int position = dictionary.position();
int remaining = Math.max(dictionary.limit() - position, 0);
ensureOpen();
if (dictionary.isDirect()) {
long address = ((DirectBuffer) dictionary).address();
try {
setDictionaryBuffer(zsRef.address(), address + position, remaining);
} finally {
Reference.reachabilityFence(dictionary);
}
} else {
byte[] array = ZipUtils.getBufferArray(dictionary);
int offset = ZipUtils.getBufferOffset(dictionary);
setDictionary(zsRef.address(), array, offset + position, remaining);
}
dictionary.position(position + remaining);
}
}
/**
@ -331,14 +417,17 @@ public class Deflater {
}
/**
* Returns true if the input data buffer is empty and setInput()
* should be called in order to provide more input.
* Returns true if no data remains in the input buffer. This can
* be used to determine if one of the {@code setInput()} methods should be
* called in order to provide more input.
*
* @return true if the input data buffer is empty and setInput()
* should be called in order to provide more input
*/
public boolean needsInput() {
synchronized (zsRef) {
return len <= 0;
ByteBuffer input = this.input;
return input == null ? inputLim == inputPos : ! input.hasRemaining();
}
}
@ -375,14 +464,14 @@ public class Deflater {
* yields the same result as the invocation of
* {@code deflater.deflate(b, off, len, Deflater.NO_FLUSH)}.
*
* @param b the buffer for the compressed data
* @param output the buffer for the compressed data
* @param off the start offset of the data
* @param len the maximum number of bytes of compressed data
* @return the actual number of bytes of compressed data written to the
* output buffer
*/
public int deflate(byte[] b, int off, int len) {
return deflate(b, off, len, NO_FLUSH);
public int deflate(byte[] output, int off, int len) {
return deflate(output, off, len, NO_FLUSH);
}
/**
@ -396,12 +485,32 @@ public class Deflater {
* yields the same result as the invocation of
* {@code deflater.deflate(b, 0, b.length, Deflater.NO_FLUSH)}.
*
* @param b the buffer for the compressed data
* @param output the buffer for the compressed data
* @return the actual number of bytes of compressed data written to the
* output buffer
*/
public int deflate(byte[] b) {
return deflate(b, 0, b.length, NO_FLUSH);
public int deflate(byte[] output) {
return deflate(output, 0, output.length, NO_FLUSH);
}
/**
* Compresses the input data and fills specified buffer with compressed
* data. Returns actual number of bytes of compressed data. A return value
* of 0 indicates that {@link #needsInput() needsInput} should be called
* in order to determine if more input data is required.
*
* <p>This method uses {@link #NO_FLUSH} as its compression flush mode.
* An invocation of this method of the form {@code deflater.deflate(output)}
* yields the same result as the invocation of
* {@code deflater.deflate(output, Deflater.NO_FLUSH)}.
*
* @param output the buffer for the compressed data
* @return the actual number of bytes of compressed data written to the
* output buffer
* @since 11
*/
public int deflate(ByteBuffer output) {
return deflate(output, NO_FLUSH);
}
/**
@ -441,7 +550,11 @@ public class Deflater {
* repeatedly output to the output buffer every time this method is
* invoked.
*
* @param b the buffer for the compressed data
* <p>If the {@link #setInput(ByteBuffer)} method was called to provide a buffer
* for input, the input buffer's position will be advanced by the number of bytes
* consumed by this operation.
*
* @param output the buffer for the compressed data
* @param off the start offset of the data
* @param len the maximum number of bytes of compressed data
* @param flush the compression flush mode
@ -451,25 +564,248 @@ public class Deflater {
* @throws IllegalArgumentException if the flush mode is invalid
* @since 1.7
*/
public int deflate(byte[] b, int off, int len, int flush) {
if (b == null) {
throw new NullPointerException();
}
if (off < 0 || len < 0 || off > b.length - len) {
public int deflate(byte[] output, int off, int len, int flush) {
if (off < 0 || len < 0 || off > output.length - len) {
throw new ArrayIndexOutOfBoundsException();
}
if (flush != NO_FLUSH && flush != SYNC_FLUSH && flush != FULL_FLUSH) {
throw new IllegalArgumentException();
}
synchronized (zsRef) {
ensureOpen();
if (flush == NO_FLUSH || flush == SYNC_FLUSH ||
flush == FULL_FLUSH) {
int thisLen = this.len;
int n = deflateBytes(zsRef.address(), b, off, len, flush);
bytesWritten += n;
bytesRead += (thisLen - this.len);
return n;
ByteBuffer input = this.input;
if (finish) {
// disregard given flush mode in this case
flush = FINISH;
}
int params;
if (setParams) {
// bit 0: true to set params
// bit 1-2: strategy (0, 1, or 2)
// bit 3-31: level (0..9 or -1)
params = 1 | strategy << 1 | level << 3;
} else {
params = 0;
}
int inputPos;
long result;
if (input == null) {
inputPos = this.inputPos;
result = deflateBytesBytes(zsRef.address(),
inputArray, inputPos, inputLim - inputPos,
output, off, len,
flush, params);
} else {
inputPos = input.position();
int inputRem = Math.max(input.limit() - inputPos, 0);
if (input.isDirect()) {
try {
long inputAddress = ((DirectBuffer) input).address();
result = deflateBufferBytes(zsRef.address(),
inputAddress + inputPos, inputRem,
output, off, len,
flush, params);
} finally {
Reference.reachabilityFence(input);
}
} else {
byte[] inputArray = ZipUtils.getBufferArray(input);
int inputOffset = ZipUtils.getBufferOffset(input);
result = deflateBytesBytes(zsRef.address(),
inputArray, inputOffset + inputPos, inputRem,
output, off, len,
flush, params);
}
}
int read = (int) (result & 0x7fff_ffffL);
int written = (int) (result >>> 31 & 0x7fff_ffffL);
if ((result >>> 62 & 1) != 0) {
finished = true;
}
if (params != 0 && (result >>> 63 & 1) == 0) {
setParams = false;
}
if (input != null) {
input.position(inputPos + read);
} else {
this.inputPos = inputPos + read;
}
bytesWritten += written;
bytesRead += read;
return written;
}
}
/**
* Compresses the input data and fills the specified buffer with compressed
* data. Returns actual number of bytes of data compressed.
*
* <p>Compression flush mode is one of the following three modes:
*
* <ul>
* <li>{@link #NO_FLUSH}: allows the deflater to decide how much data
* to accumulate, before producing output, in order to achieve the best
* compression (should be used in normal use scenario). A return value
* of 0 in this flush mode indicates that {@link #needsInput()} should
* be called in order to determine if more input data is required.
*
* <li>{@link #SYNC_FLUSH}: all pending output in the deflater is flushed,
* to the specified output buffer, so that an inflater that works on
* compressed data can get all input data available so far (In particular
* the {@link #needsInput()} returns {@code true} after this invocation
* if enough output space is provided). Flushing with {@link #SYNC_FLUSH}
* may degrade compression for some compression algorithms and so it
* should be used only when necessary.
*
* <li>{@link #FULL_FLUSH}: all pending output is flushed out as with
* {@link #SYNC_FLUSH}. The compression state is reset so that the inflater
* that works on the compressed output data can restart from this point
* if previous compressed data has been damaged or if random access is
* desired. Using {@link #FULL_FLUSH} too often can seriously degrade
* compression.
* </ul>
*
* <p>In the case of {@link #FULL_FLUSH} or {@link #SYNC_FLUSH}, if
* the return value is equal to the {@linkplain ByteBuffer#remaining() remaining space}
* of the buffer, this method should be invoked again with the same
* {@code flush} parameter and more output space. Make sure that
* the buffer has at least 6 bytes of remaining space to avoid the
* flush marker (5 bytes) being repeatedly output to the output buffer
* every time this method is invoked.
*
* <p>On success, the position of the given {@code output} byte buffer will be
* advanced by as many bytes as were produced by the operation, which is equal
* to the number returned by this method.
*
* <p>If the {@link #setInput(ByteBuffer)} method was called to provide a buffer
* for input, the input buffer's position will be advanced by the number of bytes
* consumed by this operation.
*
* @param output the buffer for the compressed data
* @param flush the compression flush mode
* @return the actual number of bytes of compressed data written to
* the output buffer
*
* @throws IllegalArgumentException if the flush mode is invalid
* @since 11
*/
public int deflate(ByteBuffer output, int flush) {
if (output.isReadOnly()) {
throw new ReadOnlyBufferException();
}
if (flush != NO_FLUSH && flush != SYNC_FLUSH && flush != FULL_FLUSH) {
throw new IllegalArgumentException();
}
synchronized (zsRef) {
ensureOpen();
ByteBuffer input = this.input;
if (finish) {
// disregard given flush mode in this case
flush = FINISH;
}
int params;
if (setParams) {
// bit 0: true to set params
// bit 1-2: strategy (0, 1, or 2)
// bit 3-31: level (0..9 or -1)
params = 1 | strategy << 1 | level << 3;
} else {
params = 0;
}
int outputPos = output.position();
int outputRem = Math.max(output.limit() - outputPos, 0);
int inputPos;
long result;
if (input == null) {
inputPos = this.inputPos;
if (output.isDirect()) {
long outputAddress = ((DirectBuffer) output).address();
try {
result = deflateBytesBuffer(zsRef.address(),
inputArray, inputPos, inputLim - inputPos,
outputAddress + outputPos, outputRem,
flush, params);
} finally {
Reference.reachabilityFence(output);
}
} else {
byte[] outputArray = ZipUtils.getBufferArray(output);
int outputOffset = ZipUtils.getBufferOffset(output);
result = deflateBytesBytes(zsRef.address(),
inputArray, inputPos, inputLim - inputPos,
outputArray, outputOffset + outputPos, outputRem,
flush, params);
}
} else {
inputPos = input.position();
int inputRem = Math.max(input.limit() - inputPos, 0);
if (input.isDirect()) {
long inputAddress = ((DirectBuffer) input).address();
try {
if (output.isDirect()) {
long outputAddress = outputPos + ((DirectBuffer) output).address();
try {
result = deflateBufferBuffer(zsRef.address(),
inputAddress + inputPos, inputRem,
outputAddress, outputRem,
flush, params);
} finally {
Reference.reachabilityFence(output);
}
} else {
byte[] outputArray = ZipUtils.getBufferArray(output);
int outputOffset = ZipUtils.getBufferOffset(output);
result = deflateBufferBytes(zsRef.address(),
inputAddress + inputPos, inputRem,
outputArray, outputOffset + outputPos, outputRem,
flush, params);
}
} finally {
Reference.reachabilityFence(input);
}
} else {
byte[] inputArray = ZipUtils.getBufferArray(input);
int inputOffset = ZipUtils.getBufferOffset(input);
if (output.isDirect()) {
long outputAddress = ((DirectBuffer) output).address();
try {
result = deflateBytesBuffer(zsRef.address(),
inputArray, inputOffset + inputPos, inputRem,
outputAddress + outputPos, outputRem,
flush, params);
} finally {
Reference.reachabilityFence(output);
}
} else {
byte[] outputArray = ZipUtils.getBufferArray(output);
int outputOffset = ZipUtils.getBufferOffset(output);
result = deflateBytesBytes(zsRef.address(),
inputArray, inputOffset + inputPos, inputRem,
outputArray, outputOffset + outputPos, outputRem,
flush, params);
}
}
}
int read = (int) (result & 0x7fff_ffffL);
int written = (int) (result >>> 31 & 0x7fff_ffffL);
if ((result >>> 62 & 1) != 0) {
finished = true;
}
if (params != 0 && (result >>> 63 & 1) == 0) {
setParams = false;
}
if (input != null) {
input.position(inputPos + read);
} else {
this.inputPos = inputPos + read;
}
output.position(outputPos + written);
bytesWritten += written;
bytesRead += read;
return written;
}
}
/**
@ -545,7 +881,8 @@ public class Deflater {
reset(zsRef.address());
finish = false;
finished = false;
off = len = 0;
input = ZipUtils.defaultBuf;
inputArray = null;
bytesRead = bytesWritten = 0;
}
}
@ -560,7 +897,7 @@ public class Deflater {
public void end() {
synchronized (zsRef) {
zsRef.clean();
buf = null;
input = ZipUtils.defaultBuf;
}
}
@ -585,11 +922,26 @@ public class Deflater {
throw new NullPointerException("Deflater has been closed");
}
private static native void initIDs();
private static native long init(int level, int strategy, boolean nowrap);
private static native void setDictionary(long addr, byte[] b, int off, int len);
private native int deflateBytes(long addr, byte[] b, int off, int len,
int flush);
private static native void setDictionary(long addr, byte[] b, int off,
int len);
private static native void setDictionaryBuffer(long addr, long bufAddress, int len);
private native long deflateBytesBytes(long addr,
byte[] inputArray, int inputOff, int inputLen,
byte[] outputArray, int outputOff, int outputLen,
int flush, int params);
private native long deflateBytesBuffer(long addr,
byte[] inputArray, int inputOff, int inputLen,
long outputAddress, int outputLen,
int flush, int params);
private native long deflateBufferBytes(long addr,
long inputAddress, int inputLen,
byte[] outputArray, int outputOff, int outputLen,
int flush, int params);
private native long deflateBufferBuffer(long addr,
long inputAddress, int inputLen,
long outputAddress, int outputLen,
int flush, int params);
private static native int getAdler(long addr);
private static native void reset(long addr);
private static native void end(long addr);

459
src/java.base/share/classes/java/util/zip/Inflater.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 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
@ -26,7 +26,13 @@
package java.util.zip;
import java.lang.ref.Cleaner.Cleanable;
import java.lang.ref.Reference;
import java.nio.ByteBuffer;
import java.nio.ReadOnlyBufferException;
import java.util.Objects;
import jdk.internal.ref.CleanerFactory;
import sun.nio.ch.DirectBuffer;
/**
* This class provides support for general purpose decompression using the
@ -35,8 +41,13 @@ import jdk.internal.ref.CleanerFactory;
* protected by patents. It is fully described in the specifications at
* the <a href="package-summary.html#package.description">java.util.zip
* package description</a>.
*
* <p>The following code fragment demonstrates a trivial compression
* <p>
* This class inflates sequences of ZLIB compressed bytes. The input byte
* sequence is provided in either byte array or byte buffer, via one of the
* {@code setInput()} methods. The output byte sequence is written to the
* output byte array or byte buffer passed to the {@code deflate()} methods.
* <p>
* The following code fragment demonstrates a trivial compression
* and decompression of a string using {@code Deflater} and
* {@code Inflater}.
*
@ -92,14 +103,20 @@ import jdk.internal.ref.CleanerFactory;
public class Inflater {
private final InflaterZStreamRef zsRef;
private byte[] buf = defaultBuf;
private int off, len;
private ByteBuffer input = ZipUtils.defaultBuf;
private byte[] inputArray;
private int inputPos, inputLim;
private boolean finished;
private boolean needDict;
private long bytesRead;
private long bytesWritten;
private static final byte[] defaultBuf = new byte[0];
/*
* These fields are used as an "out" parameter from JNI when a
* DataFormatException is thrown during the inflate operation.
*/
private int inputConsumed;
private int outputConsumed;
static {
ZipUtils.loadLibrary();
@ -129,37 +146,71 @@ public class Inflater {
}
/**
* Sets input data for decompression. Should be called whenever
* needsInput() returns true indicating that more input data is
* required.
* @param b the input data bytes
* Sets input data for decompression.
* <p>
* One of the {@code setInput()} methods should be called whenever
* {@code needsInput()} returns true indicating that more input data
* is required.
*
* @param input the input data bytes
* @param off the start offset of the input data
* @param len the length of the input data
* @see Inflater#needsInput
*/
public void setInput(byte[] b, int off, int len) {
if (b == null) {
throw new NullPointerException();
}
if (off < 0 || len < 0 || off > b.length - len) {
public void setInput(byte[] input, int off, int len) {
if (off < 0 || len < 0 || off > input.length - len) {
throw new ArrayIndexOutOfBoundsException();
}
synchronized (zsRef) {
this.buf = b;
this.off = off;
this.len = len;
this.input = null;
this.inputArray = input;
this.inputPos = off;
this.inputLim = off + len;
}
}
/**
* Sets input data for decompression. Should be called whenever
* needsInput() returns true indicating that more input data is
* required.
* @param b the input data bytes
* Sets input data for decompression.
* <p>
* One of the {@code setInput()} methods should be called whenever
* {@code needsInput()} returns true indicating that more input data
* is required.
*
* @param input the input data bytes
* @see Inflater#needsInput
*/
public void setInput(byte[] b) {
setInput(b, 0, b.length);
public void setInput(byte[] input) {
setInput(input, 0, input.length);
}
/**
* Sets input data for decompression.
* <p>
* One of the {@code setInput()} methods should be called whenever
* {@code needsInput()} returns true indicating that more input data
* is required.
* <p>
* The given buffer's position will be advanced as inflate
* operations are performed, up to the buffer's limit.
* The input buffer may be modified (refilled) between inflate
* operations; doing so is equivalent to creating a new buffer
* and setting it with this method.
* <p>
* Modifying the input buffer's contents, position, or limit
* concurrently with an inflate operation will result in
* undefined behavior, which may include incorrect operation
* results or operation failure.
*
* @param input the input data bytes
* @see Inflater#needsInput
* @since 11
*/
public void setInput(ByteBuffer input) {
Objects.requireNonNull(input);
synchronized (zsRef) {
this.input = input;
this.inputArray = null;
}
}
/**
@ -167,22 +218,19 @@ public class Inflater {
* called when inflate() returns 0 and needsDictionary() returns true
* indicating that a preset dictionary is required. The method getAdler()
* can be used to get the Adler-32 value of the dictionary needed.
* @param b the dictionary data bytes
* @param dictionary the dictionary data bytes
* @param off the start offset of the data
* @param len the length of the data
* @see Inflater#needsDictionary
* @see Inflater#getAdler
*/
public void setDictionary(byte[] b, int off, int len) {
if (b == null) {
throw new NullPointerException();
}
if (off < 0 || len < 0 || off > b.length - len) {
public void setDictionary(byte[] dictionary, int off, int len) {
if (off < 0 || len < 0 || off > dictionary.length - len) {
throw new ArrayIndexOutOfBoundsException();
}
synchronized (zsRef) {
ensureOpen();
setDictionary(zsRef.address(), b, off, len);
setDictionary(zsRef.address(), dictionary, off, len);
needDict = false;
}
}
@ -192,12 +240,48 @@ public class Inflater {
* called when inflate() returns 0 and needsDictionary() returns true
* indicating that a preset dictionary is required. The method getAdler()
* can be used to get the Adler-32 value of the dictionary needed.
* @param b the dictionary data bytes
* @param dictionary the dictionary data bytes
* @see Inflater#needsDictionary
* @see Inflater#getAdler
*/
public void setDictionary(byte[] b) {
setDictionary(b, 0, b.length);
public void setDictionary(byte[] dictionary) {
setDictionary(dictionary, 0, dictionary.length);
}
/**
* Sets the preset dictionary to the bytes in the given buffer. Should be
* called when inflate() returns 0 and needsDictionary() returns true
* indicating that a preset dictionary is required. The method getAdler()
* can be used to get the Adler-32 value of the dictionary needed.
* <p>
* The bytes in given byte buffer will be fully consumed by this method. On
* return, its position will equal its limit.
*
* @param dictionary the dictionary data bytes
* @see Inflater#needsDictionary
* @see Inflater#getAdler
* @since 11
*/
public void setDictionary(ByteBuffer dictionary) {
synchronized (zsRef) {
int position = dictionary.position();
int remaining = Math.max(dictionary.limit() - position, 0);
ensureOpen();
if (dictionary.isDirect()) {
long address = ((DirectBuffer) dictionary).address();
try {
setDictionaryBuffer(zsRef.address(), address + position, remaining);
} finally {
Reference.reachabilityFence(dictionary);
}
} else {
byte[] array = ZipUtils.getBufferArray(dictionary);
int offset = ZipUtils.getBufferOffset(dictionary);
setDictionary(zsRef.address(), array, offset + position, remaining);
}
dictionary.position(position + remaining);
needDict = false;
}
}
/**
@ -208,19 +292,22 @@ public class Inflater {
*/
public int getRemaining() {
synchronized (zsRef) {
return len;
ByteBuffer input = this.input;
return input == null ? inputLim - inputPos : input.remaining();
}
}
/**
* Returns true if no data remains in the input buffer. This can
* be used to determine if #setInput should be called in order
* to provide more input.
* be used to determine if one of the {@code setInput()} methods should be
* called in order to provide more input.
*
* @return true if no data remains in the input buffer
*/
public boolean needsInput() {
synchronized (zsRef) {
return len <= 0;
ByteBuffer input = this.input;
return input == null ? inputLim == inputPos : ! input.hasRemaining();
}
}
@ -254,30 +341,103 @@ public class Inflater {
* determine if more input data or a preset dictionary is required.
* In the latter case, getAdler() can be used to get the Adler-32
* value of the dictionary required.
* @param b the buffer for the uncompressed data
* <p>
* If the {@link #setInput(ByteBuffer)} method was called to provide a buffer
* for input, the input buffer's position will be advanced by the number of bytes
* consumed by this operation, even in the event that a {@link DataFormatException}
* is thrown.
* <p>
* The {@linkplain #getRemaining() remaining byte count} will be reduced by
* the number of consumed input bytes. If the {@link #setInput(ByteBuffer)}
* method was called to provide a buffer for input, the input buffer's position
* will be advanced the number of consumed bytes.
* <p>
* These byte totals, as well as
* the {@linkplain #getBytesRead() total bytes read}
* and the {@linkplain #getBytesWritten() total bytes written}
* values, will be updated even in the event that a {@link DataFormatException}
* is thrown to reflect the amount of data consumed and produced before the
* exception occurred.
*
* @param output the buffer for the uncompressed data
* @param off the start offset of the data
* @param len the maximum number of uncompressed bytes
* @return the actual number of uncompressed bytes
* @exception DataFormatException if the compressed data format is invalid
* @throws DataFormatException if the compressed data format is invalid
* @see Inflater#needsInput
* @see Inflater#needsDictionary
*/
public int inflate(byte[] b, int off, int len)
public int inflate(byte[] output, int off, int len)
throws DataFormatException
{
if (b == null) {
throw new NullPointerException();
}
if (off < 0 || len < 0 || off > b.length - len) {
if (off < 0 || len < 0 || off > output.length - len) {
throw new ArrayIndexOutOfBoundsException();
}
synchronized (zsRef) {
ensureOpen();
int thisLen = this.len;
int n = inflateBytes(zsRef.address(), b, off, len);
bytesWritten += n;
bytesRead += (thisLen - this.len);
return n;
ByteBuffer input = this.input;
long result;
int inputPos;
try {
if (input == null) {
inputPos = this.inputPos;
try {
result = inflateBytesBytes(zsRef.address(),
inputArray, inputPos, inputLim - inputPos,
output, off, len);
} catch (DataFormatException e) {
this.inputPos = inputPos + inputConsumed;
throw e;
}
} else {
inputPos = input.position();
try {
int inputRem = Math.max(input.limit() - inputPos, 0);
if (input.isDirect()) {
try {
long inputAddress = ((DirectBuffer) input).address();
result = inflateBufferBytes(zsRef.address(),
inputAddress + inputPos, inputRem,
output, off, len);
} finally {
Reference.reachabilityFence(input);
}
} else {
byte[] inputArray = ZipUtils.getBufferArray(input);
int inputOffset = ZipUtils.getBufferOffset(input);
result = inflateBytesBytes(zsRef.address(),
inputArray, inputOffset + inputPos, inputRem,
output, off, len);
}
} catch (DataFormatException e) {
input.position(inputPos + inputConsumed);
throw e;
}
}
} catch (DataFormatException e) {
bytesRead += inputConsumed;
inputConsumed = 0;
int written = outputConsumed;
bytesWritten += written;
outputConsumed = 0;
throw e;
}
int read = (int) (result & 0x7fff_ffffL);
int written = (int) (result >>> 31 & 0x7fff_ffffL);
if ((result >>> 62 & 1) != 0) {
finished = true;
}
if ((result >>> 63 & 1) != 0) {
needDict = true;
}
if (input != null) {
input.position(inputPos + read);
} else {
this.inputPos = inputPos + read;
}
bytesWritten += written;
bytesRead += read;
return written;
}
}
@ -288,14 +448,177 @@ public class Inflater {
* determine if more input data or a preset dictionary is required.
* In the latter case, getAdler() can be used to get the Adler-32
* value of the dictionary required.
* @param b the buffer for the uncompressed data
* <p>
* The {@linkplain #getRemaining() remaining byte count} will be reduced by
* the number of consumed input bytes. If the {@link #setInput(ByteBuffer)}
* method was called to provide a buffer for input, the input buffer's position
* will be advanced the number of consumed bytes.
* <p>
* These byte totals, as well as
* the {@linkplain #getBytesRead() total bytes read}
* and the {@linkplain #getBytesWritten() total bytes written}
* values, will be updated even in the event that a {@link DataFormatException}
* is thrown to reflect the amount of data consumed and produced before the
* exception occurred.
*
* @param output the buffer for the uncompressed data
* @return the actual number of uncompressed bytes
* @exception DataFormatException if the compressed data format is invalid
* @throws DataFormatException if the compressed data format is invalid
* @see Inflater#needsInput
* @see Inflater#needsDictionary
*/
public int inflate(byte[] b) throws DataFormatException {
return inflate(b, 0, b.length);
public int inflate(byte[] output) throws DataFormatException {
return inflate(output, 0, output.length);
}
/**
* Uncompresses bytes into specified buffer. Returns actual number
* of bytes uncompressed. A return value of 0 indicates that
* needsInput() or needsDictionary() should be called in order to
* determine if more input data or a preset dictionary is required.
* In the latter case, getAdler() can be used to get the Adler-32
* value of the dictionary required.
* <p>
* On success, the position of the given {@code output} byte buffer will be
* advanced by as many bytes as were produced by the operation, which is equal
* to the number returned by this method. Note that the position of the
* {@code output} buffer will be advanced even in the event that a
* {@link DataFormatException} is thrown.
* <p>
* The {@linkplain #getRemaining() remaining byte count} will be reduced by
* the number of consumed input bytes. If the {@link #setInput(ByteBuffer)}
* method was called to provide a buffer for input, the input buffer's position
* will be advanced the number of consumed bytes.
* <p>
* These byte totals, as well as
* the {@linkplain #getBytesRead() total bytes read}
* and the {@linkplain #getBytesWritten() total bytes written}
* values, will be updated even in the event that a {@link DataFormatException}
* is thrown to reflect the amount of data consumed and produced before the
* exception occurred.
*
* @param output the buffer for the uncompressed data
* @return the actual number of uncompressed bytes
* @throws DataFormatException if the compressed data format is invalid
* @throws ReadOnlyBufferException if the given output buffer is read-only
* @see Inflater#needsInput
* @see Inflater#needsDictionary
* @since 11
*/
public int inflate(ByteBuffer output) throws DataFormatException {
if (output.isReadOnly()) {
throw new ReadOnlyBufferException();
}
synchronized (zsRef) {
ensureOpen();
ByteBuffer input = this.input;
long result;
int inputPos;
int outputPos = output.position();
int outputRem = Math.max(output.limit() - outputPos, 0);
try {
if (input == null) {
inputPos = this.inputPos;
try {
if (output.isDirect()) {
long outputAddress = ((DirectBuffer) output).address();
try {
result = inflateBytesBuffer(zsRef.address(),
inputArray, inputPos, inputLim - inputPos,
outputAddress + outputPos, outputRem);
} finally {
Reference.reachabilityFence(output);
}
} else {
byte[] outputArray = ZipUtils.getBufferArray(output);
int outputOffset = ZipUtils.getBufferOffset(output);
result = inflateBytesBytes(zsRef.address(),
inputArray, inputPos, inputLim - inputPos,
outputArray, outputOffset + outputPos, outputRem);
}
} catch (DataFormatException e) {
this.inputPos = inputPos + inputConsumed;
throw e;
}
} else {
inputPos = input.position();
int inputRem = Math.max(input.limit() - inputPos, 0);
try {
if (input.isDirect()) {
long inputAddress = ((DirectBuffer) input).address();
try {
if (output.isDirect()) {
long outputAddress = ((DirectBuffer) output).address();
try {
result = inflateBufferBuffer(zsRef.address(),
inputAddress + inputPos, inputRem,
outputAddress + outputPos, outputRem);
} finally {
Reference.reachabilityFence(output);
}
} else {
byte[] outputArray = ZipUtils.getBufferArray(output);
int outputOffset = ZipUtils.getBufferOffset(output);
result = inflateBufferBytes(zsRef.address(),
inputAddress + inputPos, inputRem,
outputArray, outputOffset + outputPos, outputRem);
}
} finally {
Reference.reachabilityFence(input);
}
} else {
byte[] inputArray = ZipUtils.getBufferArray(input);
int inputOffset = ZipUtils.getBufferOffset(input);
if (output.isDirect()) {
long outputAddress = ((DirectBuffer) output).address();
try {
result = inflateBytesBuffer(zsRef.address(),
inputArray, inputOffset + inputPos, inputRem,
outputAddress + outputPos, outputRem);
} finally {
Reference.reachabilityFence(output);
}
} else {
byte[] outputArray = ZipUtils.getBufferArray(output);
int outputOffset = ZipUtils.getBufferOffset(output);
result = inflateBytesBytes(zsRef.address(),
inputArray, inputOffset + inputPos, inputRem,
outputArray, outputOffset + outputPos, outputRem);
}
}
} catch (DataFormatException e) {
input.position(inputPos + inputConsumed);
throw e;
}
}
} catch (DataFormatException e) {
bytesRead += inputConsumed;
inputConsumed = 0;
int written = outputConsumed;
output.position(outputPos + written);
bytesWritten += written;
outputConsumed = 0;
throw e;
}
int read = (int) (result & 0x7fff_ffffL);
int written = (int) (result >>> 31 & 0x7fff_ffffL);
if ((result >>> 62 & 1) != 0) {
finished = true;
}
if ((result >>> 63 & 1) != 0) {
needDict = true;
}
if (input != null) {
input.position(inputPos + read);
} else {
this.inputPos = inputPos + read;
}
// Note: this method call also serves to keep the byteBuffer ref alive
output.position(outputPos + written);
bytesWritten += written;
bytesRead += read;
return written;
}
}
/**
@ -368,10 +691,10 @@ public class Inflater {
synchronized (zsRef) {
ensureOpen();
reset(zsRef.address());
buf = defaultBuf;
input = ZipUtils.defaultBuf;
inputArray = null;
finished = false;
needDict = false;
off = len = 0;
bytesRead = bytesWritten = 0;
}
}
@ -386,7 +709,8 @@ public class Inflater {
public void end() {
synchronized (zsRef) {
zsRef.clean();
buf = null;
input = ZipUtils.defaultBuf;
inputArray = null;
}
}
@ -416,18 +740,23 @@ public class Inflater {
throw new NullPointerException("Inflater has been closed");
}
boolean ended() {
synchronized (zsRef) {
return zsRef.address() == 0;
}
}
private static native void initIDs();
private static native long init(boolean nowrap);
private static native void setDictionary(long addr, byte[] b, int off,
int len);
private native int inflateBytes(long addr, byte[] b, int off, int len)
throws DataFormatException;
private static native void setDictionaryBuffer(long addr, long bufAddress, int len);
private native long inflateBytesBytes(long addr,
byte[] inputArray, int inputOff, int inputLen,
byte[] outputArray, int outputOff, int outputLen) throws DataFormatException;
private native long inflateBytesBuffer(long addr,
byte[] inputArray, int inputOff, int inputLen,
long outputAddress, int outputLen) throws DataFormatException;
private native long inflateBufferBytes(long addr,
long inputAddress, int inputLen,
byte[] outputArray, int outputOff, int outputLen) throws DataFormatException;
private native long inflateBufferBuffer(long addr,
long inputAddress, int inputLen,
long outputAddress, int outputLen) throws DataFormatException;
private static native int getAdler(long addr);
private static native void reset(long addr);
private static native void end(long addr);

23
src/java.base/share/classes/java/util/zip/ZipUtils.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 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
@ -25,6 +25,8 @@
package java.util.zip;
import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.nio.file.attribute.FileTime;
import java.security.AccessController;
import java.security.PrivilegedAction;
@ -37,6 +39,9 @@ import java.util.concurrent.TimeUnit;
import static java.util.zip.ZipConstants.ENDHDR;
import jdk.internal.misc.Unsafe;
import sun.nio.ch.DirectBuffer;
class ZipUtils {
// used to adjust values between Windows and java epoch
@ -45,6 +50,9 @@ class ZipUtils {
// used to indicate the corresponding windows time is not available
public static final long WINDOWS_TIME_NOT_AVAILABLE = Long.MIN_VALUE;
// static final ByteBuffer defaultBuf = ByteBuffer.allocateDirect(0);
static final ByteBuffer defaultBuf = ByteBuffer.allocate(0);
/**
* Converts Windows time (in microseconds, UTC/GMT) time to FileTime.
*/
@ -281,4 +289,17 @@ class ZipUtils {
AccessController.doPrivileged(pa);
}
}
private static final Unsafe unsafe = Unsafe.getUnsafe();
private static final long byteBufferArrayOffset = unsafe.objectFieldOffset(ByteBuffer.class, "hb");
private static final long byteBufferOffsetOffset = unsafe.objectFieldOffset(ByteBuffer.class, "offset");
static byte[] getBufferArray(ByteBuffer byteBuffer) {
return (byte[]) unsafe.getObject(byteBuffer, byteBufferArrayOffset);
}
static int getBufferOffset(ByteBuffer byteBuffer) {
return unsafe.getInt(byteBuffer, byteBufferOffsetOffset);
}
}

253
src/java.base/share/native/libzip/Deflater.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 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
@ -38,34 +38,6 @@
#define DEF_MEM_LEVEL 8
static jfieldID levelID;
static jfieldID strategyID;
static jfieldID setParamsID;
static jfieldID finishID;
static jfieldID finishedID;
static jfieldID bufID, offID, lenID;
JNIEXPORT void JNICALL
Java_java_util_zip_Deflater_initIDs(JNIEnv *env, jclass cls)
{
levelID = (*env)->GetFieldID(env, cls, "level", "I");
CHECK_NULL(levelID);
strategyID = (*env)->GetFieldID(env, cls, "strategy", "I");
CHECK_NULL(strategyID);
setParamsID = (*env)->GetFieldID(env, cls, "setParams", "Z");
CHECK_NULL(setParamsID);
finishID = (*env)->GetFieldID(env, cls, "finish", "Z");
CHECK_NULL(finishID);
finishedID = (*env)->GetFieldID(env, cls, "finished", "Z");
CHECK_NULL(finishedID);
bufID = (*env)->GetFieldID(env, cls, "buf", "[B");
CHECK_NULL(bufID);
offID = (*env)->GetFieldID(env, cls, "off", "I");
CHECK_NULL(offID);
lenID = (*env)->GetFieldID(env, cls, "len", "I");
CHECK_NULL(lenID);
}
JNIEXPORT jlong JNICALL
Java_java_util_zip_Deflater_init(JNIEnv *env, jclass cls, jint level,
jint strategy, jboolean nowrap)
@ -104,17 +76,9 @@ Java_java_util_zip_Deflater_init(JNIEnv *env, jclass cls, jint level,
}
}
JNIEXPORT void JNICALL
Java_java_util_zip_Deflater_setDictionary(JNIEnv *env, jclass cls, jlong addr,
jarray b, jint off, jint len)
static void doSetDictionary(JNIEnv *env, jlong addr, jbyte *buf, jint len)
{
Bytef *buf = (*env)->GetPrimitiveArrayCritical(env, b, 0);
int res;
if (buf == 0) {/* out of memory */
return;
}
res = deflateSetDictionary((z_stream *)jlong_to_ptr(addr), buf + off, len);
(*env)->ReleasePrimitiveArrayCritical(env, b, buf, 0);
int res = deflateSetDictionary(jlong_to_ptr(addr), (Bytef *) buf, len);
switch (res) {
case Z_OK:
break;
@ -127,94 +91,173 @@ Java_java_util_zip_Deflater_setDictionary(JNIEnv *env, jclass cls, jlong addr,
}
}
JNIEXPORT jint JNICALL
Java_java_util_zip_Deflater_deflateBytes(JNIEnv *env, jobject this, jlong addr,
jarray b, jint off, jint len, jint flush)
JNIEXPORT void JNICALL
Java_java_util_zip_Deflater_setDictionary(JNIEnv *env, jclass cls, jlong addr,
jbyteArray b, jint off, jint len)
{
jbyte *buf = (*env)->GetPrimitiveArrayCritical(env, b, 0);
if (buf == NULL) /* out of memory */
return;
doSetDictionary(env, addr, buf + off, len);
(*env)->ReleasePrimitiveArrayCritical(env, b, buf, 0);
}
JNIEXPORT void JNICALL
Java_java_util_zip_Deflater_setDictionaryBuffer(JNIEnv *env, jclass cls, jlong addr,
jlong bufferAddr, jint len)
{
jbyte *buf = jlong_to_ptr(bufferAddr);
doSetDictionary(env, addr, buf, len);
}
static jlong doDeflate(JNIEnv *env, jobject this, jlong addr,
jbyte *input, jint inputLen,
jbyte *output, jint outputLen,
jint flush, jint params)
{
z_stream *strm = jlong_to_ptr(addr);
jint inputUsed = 0, outputUsed = 0;
int finished = 0;
int setParams = params & 1;
jarray this_buf = (*env)->GetObjectField(env, this, bufID);
jint this_off = (*env)->GetIntField(env, this, offID);
jint this_len = (*env)->GetIntField(env, this, lenID);
jbyte *in_buf;
jbyte *out_buf;
int res;
if ((*env)->GetBooleanField(env, this, setParamsID)) {
int level = (*env)->GetIntField(env, this, levelID);
int strategy = (*env)->GetIntField(env, this, strategyID);
in_buf = (*env)->GetPrimitiveArrayCritical(env, this_buf, 0);
if (in_buf == NULL) {
// Throw OOME only when length is not zero
if (this_len != 0 && (*env)->ExceptionOccurred(env) == NULL)
JNU_ThrowOutOfMemoryError(env, 0);
return 0;
}
out_buf = (*env)->GetPrimitiveArrayCritical(env, b, 0);
if (out_buf == NULL) {
(*env)->ReleasePrimitiveArrayCritical(env, this_buf, in_buf, 0);
if (len != 0 && (*env)->ExceptionOccurred(env) == NULL)
JNU_ThrowOutOfMemoryError(env, 0);
return 0;
}
strm->next_in = (Bytef *) input;
strm->next_out = (Bytef *) output;
strm->avail_in = inputLen;
strm->avail_out = outputLen;
strm->next_in = (Bytef *) (in_buf + this_off);
strm->next_out = (Bytef *) (out_buf + off);
strm->avail_in = this_len;
strm->avail_out = len;
res = deflateParams(strm, level, strategy);
(*env)->ReleasePrimitiveArrayCritical(env, b, out_buf, 0);
(*env)->ReleasePrimitiveArrayCritical(env, this_buf, in_buf, 0);
if (setParams) {
int strategy = (params >> 1) & 3;
int level = params >> 3;
int res = deflateParams(strm, level, strategy);
switch (res) {
case Z_OK:
(*env)->SetBooleanField(env, this, setParamsID, JNI_FALSE);
setParams = 0;
/* fall through */
case Z_BUF_ERROR:
this_off += this_len - strm->avail_in;
(*env)->SetIntField(env, this, offID, this_off);
(*env)->SetIntField(env, this, lenID, strm->avail_in);
return (jint) (len - strm->avail_out);
inputUsed = inputLen - strm->avail_in;
outputUsed = outputLen - strm->avail_out;
break;
default:
JNU_ThrowInternalError(env, strm->msg);
return 0;
}
} else {
jboolean finish = (*env)->GetBooleanField(env, this, finishID);
in_buf = (*env)->GetPrimitiveArrayCritical(env, this_buf, 0);
if (in_buf == NULL) {
if (this_len != 0)
JNU_ThrowOutOfMemoryError(env, 0);
return 0;
}
out_buf = (*env)->GetPrimitiveArrayCritical(env, b, 0);
if (out_buf == NULL) {
(*env)->ReleasePrimitiveArrayCritical(env, this_buf, in_buf, 0);
if (len != 0)
JNU_ThrowOutOfMemoryError(env, 0);
return 0;
}
strm->next_in = (Bytef *) (in_buf + this_off);
strm->next_out = (Bytef *) (out_buf + off);
strm->avail_in = this_len;
strm->avail_out = len;
res = deflate(strm, finish ? Z_FINISH : flush);
(*env)->ReleasePrimitiveArrayCritical(env, b, out_buf, 0);
(*env)->ReleasePrimitiveArrayCritical(env, this_buf, in_buf, 0);
int res = deflate(strm, flush);
switch (res) {
case Z_STREAM_END:
(*env)->SetBooleanField(env, this, finishedID, JNI_TRUE);
finished = 1;
/* fall through */
case Z_OK:
case Z_BUF_ERROR:
this_off += this_len - strm->avail_in;
(*env)->SetIntField(env, this, offID, this_off);
(*env)->SetIntField(env, this, lenID, strm->avail_in);
return len - strm->avail_out;
inputUsed = inputLen - strm->avail_in;
outputUsed = outputLen - strm->avail_out;
break;
default:
JNU_ThrowInternalError(env, strm->msg);
return 0;
}
}
return ((jlong)inputUsed) | (((jlong)outputUsed) << 31) | (((jlong)finished) << 62) | (((jlong)setParams) << 63);
}
JNIEXPORT jlong JNICALL
Java_java_util_zip_Deflater_deflateBytesBytes(JNIEnv *env, jobject this, jlong addr,
jbyteArray inputArray, jint inputOff, jint inputLen,
jbyteArray outputArray, jint outputOff, jint outputLen,
jint flush, jint params)
{
jbyte *input = (*env)->GetPrimitiveArrayCritical(env, inputArray, 0);
jbyte *output;
jlong retVal;
if (input == NULL) {
if (inputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
JNU_ThrowOutOfMemoryError(env, 0);
return 0L;
}
output = (*env)->GetPrimitiveArrayCritical(env, outputArray, 0);
if (output == NULL) {
(*env)->ReleasePrimitiveArrayCritical(env, inputArray, input, 0);
if (outputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
JNU_ThrowOutOfMemoryError(env, 0);
return 0L;
}
retVal = doDeflate(env, this, addr,
input + inputOff, inputLen,
output + outputOff, outputLen,
flush, params);
(*env)->ReleasePrimitiveArrayCritical(env, outputArray, output, 0);
(*env)->ReleasePrimitiveArrayCritical(env, inputArray, input, 0);
return retVal;
}
JNIEXPORT jlong JNICALL
Java_java_util_zip_Deflater_deflateBytesBuffer(JNIEnv *env, jobject this, jlong addr,
jbyteArray inputArray, jint inputOff, jint inputLen,
jlong outputBuffer, jint outputLen,
jint flush, jint params)
{
jbyte *input = (*env)->GetPrimitiveArrayCritical(env, inputArray, 0);
jbyte *output;
jlong retVal;
if (input == NULL) {
if (inputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
JNU_ThrowOutOfMemoryError(env, 0);
return 0L;
}
output = jlong_to_ptr(outputBuffer);
retVal = doDeflate(env, this, addr,
input + inputOff, inputLen,
output, outputLen,
flush, params);
(*env)->ReleasePrimitiveArrayCritical(env, inputArray, input, 0);
return retVal;
}
JNIEXPORT jlong JNICALL
Java_java_util_zip_Deflater_deflateBufferBytes(JNIEnv *env, jobject this, jlong addr,
jlong inputBuffer, jint inputLen,
jbyteArray outputArray, jint outputOff, jint outputLen,
jint flush, jint params)
{
jbyte *input = jlong_to_ptr(inputBuffer);
jbyte *output = (*env)->GetPrimitiveArrayCritical(env, outputArray, 0);
jlong retVal;
if (output == NULL) {
if (outputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
JNU_ThrowOutOfMemoryError(env, 0);
return 0L;
}
retVal = doDeflate(env, this, addr,
input, inputLen,
output + outputOff, outputLen,
flush, params);
(*env)->ReleasePrimitiveArrayCritical(env, outputArray, input, 0);
return retVal;
}
JNIEXPORT jlong JNICALL
Java_java_util_zip_Deflater_deflateBufferBuffer(JNIEnv *env, jobject this, jlong addr,
jlong inputBuffer, jint inputLen,
jlong outputBuffer, jint outputLen,
jint flush, jint params)
{
jbyte *input = jlong_to_ptr(inputBuffer);
jbyte *output = jlong_to_ptr(outputBuffer);
return doDeflate(env, this, addr,
input, inputLen,
output, outputLen,
flush, params);
}
JNIEXPORT jint JNICALL

216
src/java.base/share/native/libzip/Inflater.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 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
@ -42,23 +42,16 @@
#define ThrowDataFormatException(env, msg) \
JNU_ThrowByName(env, "java/util/zip/DataFormatException", msg)
static jfieldID needDictID;
static jfieldID finishedID;
static jfieldID bufID, offID, lenID;
static jfieldID inputConsumedID;
static jfieldID outputConsumedID;
JNIEXPORT void JNICALL
Java_java_util_zip_Inflater_initIDs(JNIEnv *env, jclass cls)
{
needDictID = (*env)->GetFieldID(env, cls, "needDict", "Z");
CHECK_NULL(needDictID);
finishedID = (*env)->GetFieldID(env, cls, "finished", "Z");
CHECK_NULL(finishedID);
bufID = (*env)->GetFieldID(env, cls, "buf", "[B");
CHECK_NULL(bufID);
offID = (*env)->GetFieldID(env, cls, "off", "I");
CHECK_NULL(offID);
lenID = (*env)->GetFieldID(env, cls, "len", "I");
CHECK_NULL(lenID);
inputConsumedID = (*env)->GetFieldID(env, cls, "inputConsumed", "I");
outputConsumedID = (*env)->GetFieldID(env, cls, "outputConsumed", "I");
CHECK_NULL(inputConsumedID);
CHECK_NULL(outputConsumedID);
}
JNIEXPORT jlong JNICALL
@ -94,16 +87,9 @@ Java_java_util_zip_Inflater_init(JNIEnv *env, jclass cls, jboolean nowrap)
}
}
JNIEXPORT void JNICALL
Java_java_util_zip_Inflater_setDictionary(JNIEnv *env, jclass cls, jlong addr,
jarray b, jint off, jint len)
static void doSetDictionary(JNIEnv *env, jlong addr, jbyte *buf, jint len)
{
Bytef *buf = (*env)->GetPrimitiveArrayCritical(env, b, 0);
int res;
if (buf == 0) /* out of memory */
return;
res = inflateSetDictionary(jlong_to_ptr(addr), buf + off, len);
(*env)->ReleasePrimitiveArrayCritical(env, b, buf, 0);
int res = inflateSetDictionary(jlong_to_ptr(addr), (Bytef *) buf, len);
switch (res) {
case Z_OK:
break;
@ -117,68 +103,168 @@ Java_java_util_zip_Inflater_setDictionary(JNIEnv *env, jclass cls, jlong addr,
}
}
JNIEXPORT jint JNICALL
Java_java_util_zip_Inflater_inflateBytes(JNIEnv *env, jobject this, jlong addr,
jarray b, jint off, jint len)
JNIEXPORT void JNICALL
Java_java_util_zip_Inflater_setDictionary(JNIEnv *env, jclass cls, jlong addr,
jbyteArray b, jint off, jint len)
{
jbyte *buf = (*env)->GetPrimitiveArrayCritical(env, b, 0);
if (buf == NULL) /* out of memory */
return;
doSetDictionary(env, addr, buf + off, len);
(*env)->ReleasePrimitiveArrayCritical(env, b, buf, 0);
}
JNIEXPORT void JNICALL
Java_java_util_zip_Inflater_setDictionaryBuffer(JNIEnv *env, jclass cls, jlong addr,
jlong bufferAddr, jint len)
{
jbyte *buf = jlong_to_ptr(bufferAddr);
doSetDictionary(env, addr, buf, len);
}
static jlong doInflate(JNIEnv *env, jobject this, jlong addr,
jbyte *input, jint inputLen,
jbyte *output, jint outputLen)
{
z_stream *strm = jlong_to_ptr(addr);
jarray this_buf = (jarray)(*env)->GetObjectField(env, this, bufID);
jint this_off = (*env)->GetIntField(env, this, offID);
jint this_len = (*env)->GetIntField(env, this, lenID);
jbyte *in_buf;
jbyte *out_buf;
jint inputUsed = 0, outputUsed = 0;
int finished = 0;
int needDict = 0;
int ret;
in_buf = (*env)->GetPrimitiveArrayCritical(env, this_buf, 0);
if (in_buf == NULL) {
if (this_len != 0 && (*env)->ExceptionOccurred(env) == NULL)
JNU_ThrowOutOfMemoryError(env, 0);
return 0;
}
out_buf = (*env)->GetPrimitiveArrayCritical(env, b, 0);
if (out_buf == NULL) {
(*env)->ReleasePrimitiveArrayCritical(env, this_buf, in_buf, 0);
if (len != 0 && (*env)->ExceptionOccurred(env) == NULL)
JNU_ThrowOutOfMemoryError(env, 0);
return 0;
}
strm->next_in = (Bytef *) (in_buf + this_off);
strm->next_out = (Bytef *) (out_buf + off);
strm->avail_in = this_len;
strm->avail_out = len;
strm->next_in = (Bytef *) input;
strm->next_out = (Bytef *) output;
strm->avail_in = inputLen;
strm->avail_out = outputLen;
ret = inflate(strm, Z_PARTIAL_FLUSH);
(*env)->ReleasePrimitiveArrayCritical(env, b, out_buf, 0);
(*env)->ReleasePrimitiveArrayCritical(env, this_buf, in_buf, 0);
switch (ret) {
case Z_STREAM_END:
(*env)->SetBooleanField(env, this, finishedID, JNI_TRUE);
finished = 1;
/* fall through */
case Z_OK:
this_off += this_len - strm->avail_in;
(*env)->SetIntField(env, this, offID, this_off);
(*env)->SetIntField(env, this, lenID, strm->avail_in);
return (jint) (len - strm->avail_out);
inputUsed = inputLen - strm->avail_in;
outputUsed = outputLen - strm->avail_out;
break;
case Z_NEED_DICT:
(*env)->SetBooleanField(env, this, needDictID, JNI_TRUE);
needDict = 1;
/* Might have consumed some input here! */
this_off += this_len - strm->avail_in;
(*env)->SetIntField(env, this, offID, this_off);
(*env)->SetIntField(env, this, lenID, strm->avail_in);
return 0;
inputUsed = inputLen - strm->avail_in;
/* zlib is unclear about whether output may be produced */
outputUsed = outputLen - strm->avail_out;
break;
case Z_BUF_ERROR:
return 0;
break;
case Z_DATA_ERROR:
inputUsed = inputLen - strm->avail_in;
(*env)->SetIntField(env, this, inputConsumedID, inputUsed);
outputUsed = outputLen - strm->avail_out;
(*env)->SetIntField(env, this, outputConsumedID, outputUsed);
ThrowDataFormatException(env, strm->msg);
return 0;
break;
case Z_MEM_ERROR:
JNU_ThrowOutOfMemoryError(env, 0);
return 0;
break;
default:
JNU_ThrowInternalError(env, strm->msg);
return 0;
break;
}
return ((jlong)inputUsed) | (((jlong)outputUsed) << 31) | (((jlong)finished) << 62) | (((jlong)needDict) << 63);
}
JNIEXPORT jlong JNICALL
Java_java_util_zip_Inflater_inflateBytesBytes(JNIEnv *env, jobject this, jlong addr,
jbyteArray inputArray, jint inputOff, jint inputLen,
jbyteArray outputArray, jint outputOff, jint outputLen)
{
jbyte *input = (*env)->GetPrimitiveArrayCritical(env, inputArray, 0);
jbyte *output;
jlong retVal;
if (input == NULL) {
if (inputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
JNU_ThrowOutOfMemoryError(env, 0);
return 0L;
}
output = (*env)->GetPrimitiveArrayCritical(env, outputArray, 0);
if (output == NULL) {
(*env)->ReleasePrimitiveArrayCritical(env, inputArray, input, 0);
if (outputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
JNU_ThrowOutOfMemoryError(env, 0);
return 0L;
}
retVal = doInflate(env, this, addr,
input + inputOff, inputLen,
output + outputOff, outputLen);
(*env)->ReleasePrimitiveArrayCritical(env, outputArray, output, 0);
(*env)->ReleasePrimitiveArrayCritical(env, inputArray, input, 0);
return retVal;
}
JNIEXPORT jlong JNICALL
Java_java_util_zip_Inflater_inflateBytesBuffer(JNIEnv *env, jobject this, jlong addr,
jbyteArray inputArray, jint inputOff, jint inputLen,
jlong outputBuffer, jint outputLen)
{
jbyte *input = (*env)->GetPrimitiveArrayCritical(env, inputArray, 0);
jbyte *output;
jlong retVal;
if (input == NULL) {
if (inputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
JNU_ThrowOutOfMemoryError(env, 0);
return 0L;
}
output = jlong_to_ptr(outputBuffer);
retVal = doInflate(env, this, addr,
input + inputOff, inputLen,
output, outputLen);
(*env)->ReleasePrimitiveArrayCritical(env, inputArray, input, 0);
return retVal;
}
JNIEXPORT jlong JNICALL
Java_java_util_zip_Inflater_inflateBufferBytes(JNIEnv *env, jobject this, jlong addr,
jlong inputBuffer, jint inputLen,
jbyteArray outputArray, jint outputOff, jint outputLen)
{
jbyte *input = jlong_to_ptr(inputBuffer);
jbyte *output = (*env)->GetPrimitiveArrayCritical(env, outputArray, 0);
jlong retVal;
if (output == NULL) {
if (outputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
JNU_ThrowOutOfMemoryError(env, 0);
return 0L;
}
retVal = doInflate(env, this, addr,
input, inputLen,
output + outputOff, outputLen);
(*env)->ReleasePrimitiveArrayCritical(env, outputArray, output, 0);
return retVal;
}
JNIEXPORT jlong JNICALL
Java_java_util_zip_Inflater_inflateBufferBuffer(JNIEnv *env, jobject this, jlong addr,
jlong inputBuffer, jint inputLen,
jlong outputBuffer, jint outputLen)
{
jbyte *input = jlong_to_ptr(inputBuffer);
jbyte *output = jlong_to_ptr(outputBuffer);
return doInflate(env, this, addr,
input, inputLen,
output, outputLen);
}
JNIEXPORT jint JNICALL

167
test/jdk/java/util/zip/DeInflate.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 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
@ -23,17 +23,23 @@
/**
* @test
* @bug 7110149 8184306
* @bug 7110149 8184306 6341887
* @summary Test basic deflater & inflater functionality
* @key randomness
*/
import java.io.*;
import java.nio.*;
import java.util.*;
import java.util.zip.*;
import static java.nio.charset.StandardCharsets.UTF_8;
public class DeInflate {
private static Random rnd = new Random();
static void checkStream(Deflater def, byte[] in, int len,
byte[] out1, byte[] out2, boolean nowrap)
throws Throwable
@ -61,6 +67,57 @@ public class DeInflate {
}
}
static void checkByteBuffer(Deflater def, Inflater inf,
ByteBuffer in, ByteBuffer out1, ByteBuffer out2,
byte[] expected, int len, byte[] result,
boolean out1ReadOnlyWhenInflate)
throws Throwable {
def.reset();
inf.reset();
def.setInput(in);
def.finish();
int m = def.deflate(out1);
out1.flip();
if (out1ReadOnlyWhenInflate)
out1 = out1.asReadOnlyBuffer();
inf.setInput(out1);
int n = inf.inflate(out2);
out2.flip();
out2.get(result, 0, n);
if (n != len || out2.position() != len ||
!Arrays.equals(Arrays.copyOf(expected, len), Arrays.copyOf(result, len)) ||
inf.inflate(result) != 0) {
throw new RuntimeException("De/inflater(buffer) failed:" + def);
}
}
static void checkByteBufferReadonly(Deflater def, Inflater inf,
ByteBuffer in, ByteBuffer out1, ByteBuffer out2)
throws Throwable {
def.reset();
inf.reset();
def.setInput(in);
def.finish();
int m = -1;
if (!out2.isReadOnly())
out2 = out2.asReadOnlyBuffer();
try {
m = def.deflate(out2);
throw new RuntimeException("deflater: ReadOnlyBufferException: failed");
} catch (ReadOnlyBufferException robe) {}
m = def.deflate(out1);
out1.flip();
inf.setInput(out1);
try {
inf.inflate(out2);
throw new RuntimeException("inflater: ReadOnlyBufferException: failed");
} catch (ReadOnlyBufferException robe) {}
}
static void check(Deflater def, byte[] in, int len,
byte[] out1, byte[] out2, boolean nowrap)
throws Throwable
@ -83,6 +140,107 @@ public class DeInflate {
m, n, len, Arrays.equals(in, out2));
throw new RuntimeException("De/inflater failed:" + def);
}
// readable
Arrays.fill(out1, (byte)0);
Arrays.fill(out2, (byte)0);
ByteBuffer bbIn = ByteBuffer.wrap(in, 0, len);
ByteBuffer bbOut1 = ByteBuffer.wrap(out1);
ByteBuffer bbOut2 = ByteBuffer.wrap(out2);
checkByteBuffer(def, inf, bbIn, bbOut1, bbOut2, in, len, out2, false);
checkByteBufferReadonly(def, inf, bbIn, bbOut1, bbOut2);
// readonly in
Arrays.fill(out1, (byte)0);
Arrays.fill(out2, (byte)0);
bbIn = ByteBuffer.wrap(in, 0, len).asReadOnlyBuffer();
bbOut1 = ByteBuffer.wrap(out1);
bbOut2 = ByteBuffer.wrap(out2);
checkByteBuffer(def, inf, bbIn, bbOut1, bbOut2, in, len, out2, false);
checkByteBufferReadonly(def, inf, bbIn, bbOut1, bbOut2);
// readonly out1 when inflate
Arrays.fill(out1, (byte)0);
Arrays.fill(out2, (byte)0);
bbIn = ByteBuffer.wrap(in, 0, len);
bbOut1 = ByteBuffer.wrap(out1);
bbOut2 = ByteBuffer.wrap(out2);
checkByteBuffer(def, inf, bbIn, bbOut1, bbOut2, in, len, out2, true);
checkByteBufferReadonly(def, inf, bbIn, bbOut1, bbOut2);
// direct
bbIn = ByteBuffer.allocateDirect(in.length);
bbIn.put(in, 0, n).flip();
bbOut1 = ByteBuffer.allocateDirect(out1.length);
bbOut2 = ByteBuffer.allocateDirect(out2.length);
checkByteBuffer(def, inf, bbIn, bbOut1, bbOut2, in, len, out2, false);
checkByteBufferReadonly(def, inf, bbIn, bbOut1, bbOut2);
}
static void checkDict(Deflater def, Inflater inf, byte[] src,
byte[] dstDef, byte[] dstInf,
ByteBuffer dictDef, ByteBuffer dictInf) throws Throwable {
def.reset();
inf.reset();
def.setDictionary(dictDef);
def.setInput(src);
def.finish();
int n = def.deflate(dstDef);
inf.setInput(dstDef, 0, n);
n = inf.inflate(dstInf);
if (n != 0 || !inf.needsDictionary()) {
throw new RuntimeException("checkDict failed: need dict to continue");
}
inf.setDictionary(dictInf);
n = inf.inflate(dstInf);
// System.out.println("result: " + new String(dstInf, 0, n));
if (n != src.length || !Arrays.equals(Arrays.copyOf(dstInf, n), src)) {
throw new RuntimeException("checkDict failed: inflate result");
}
}
static void checkDict(int level, int strategy) throws Throwable {
Deflater def = newDeflater(level, strategy, false, new byte[0]);
Inflater inf = new Inflater();
byte[] src = "hello world, hello world, hello sherman".getBytes();
byte[] dict = "hello".getBytes();
byte[] dstDef = new byte[1024];
byte[] dstInf = new byte[1024];
def.setDictionary(dict);
def.setInput(src);
def.finish();
int n = def.deflate(dstDef);
inf.setInput(dstDef, 0, n);
n = inf.inflate(dstInf);
if (n != 0 || !inf.needsDictionary()) {
throw new RuntimeException("checkDict failed: need dict to continue");
}
inf.setDictionary(dict);
n = inf.inflate(dstInf);
//System.out.println("result: " + new String(dstInf, 0, n));
if (n != src.length || !Arrays.equals(Arrays.copyOf(dstInf, n), src)) {
throw new RuntimeException("checkDict failed: inflate result");
}
ByteBuffer dictDef = ByteBuffer.wrap(dict);
ByteBuffer dictInf = ByteBuffer.wrap(dict);
checkDict(def, inf, src, dstDef, dstInf, dictDef, dictInf);
dictDef = ByteBuffer.allocateDirect(dict.length);
dictInf = ByteBuffer.allocateDirect(dict.length);
dictDef.put(dict).flip();
dictInf.put(dict).flip();
checkDict(def, inf, src, dstDef, dstInf, dictDef, dictInf);
def.end();
inf.end();
}
private static Deflater newDeflater(int level, int strategy, boolean dowrap, byte[] tmp) {
@ -109,7 +267,7 @@ public class DeInflate {
public static void main(String[] args) throws Throwable {
byte[] dataIn = new byte[1024 * 512];
new Random().nextBytes(dataIn);
rnd.nextBytes(dataIn);
byte[] dataOut1 = new byte[dataIn.length + 1024];
byte[] dataOut2 = new byte[dataIn.length];
@ -130,6 +288,7 @@ public class DeInflate {
// use a new deflater
Deflater def = newDeflater(level, strategy, dowrap, dataOut2);
check(def, dataIn, len, dataOut1, dataOut2, dowrap);
def.end();
// reuse the deflater (with reset) and test on stream, which
// uses a "smaller" buffer (smaller than the overall data)
@ -137,6 +296,8 @@ public class DeInflate {
checkStream(def, dataIn, len, dataOut1, dataOut2, dowrap);
}
}
// test setDictionary()
checkDict(level, strategy);
}
}
}

129
test/jdk/java/util/zip/FlaterTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 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
@ -23,13 +23,12 @@
/**
* @test
* @bug 6348045
* @bug 6348045 6341887
* @summary GZipOutputStream/InputStream goes critical(calls JNI_Get*Critical)
* and causes slowness. This test uses Deflater and Inflater directly.
* @key randomness
*/
import java.io.*;
import java.nio.*;
import java.util.*;
import java.util.zip.*;
@ -41,35 +40,37 @@ import java.util.zip.*;
*/
public class FlaterTest extends Thread {
private static final int DATA_LEN = 1024 * 128;
private static byte[] data;
private static ByteBuffer dataDirect;
private static ByteBuffer dataHeap;
// If true, print extra info.
private static final boolean debug = false;
// Set of Flater threads running.
private static Set flaters =
Collections.synchronizedSet(new HashSet());
private static Set<Flater> flaters =
Collections.synchronizedSet(new HashSet<>());
/** Fill in {@code data} with random values. */
static void createData() {
ByteBuffer bb = ByteBuffer.allocate(8);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
for (int i = 0; i < DATA_LEN; i++) {
bb.putDouble(0, Math.random());
baos.write(bb.array(), 0, 8);
ByteBuffer bb = ByteBuffer.allocateDirect(DATA_LEN * 8);
for (int i = 0; i < DATA_LEN * 8; i += 8) {
bb.putDouble(i, Math.random());
}
data = baos.toByteArray();
if (debug) System.out.println("data length is " + data.length);
dataDirect = bb;
final ByteBuffer hb = ByteBuffer.allocate(bb.capacity());
hb.duplicate().put(bb.duplicate());
dataHeap = hb;
if (debug) System.out.println("data length is " + bb.capacity());
}
/** @return the length of the deflated {@code data}. */
private static int getDeflatedLength() throws Throwable {
int rc = 0;
private static int getDeflatedLength() {
Deflater deflater = new Deflater();
deflater.setInput(data);
deflater.setInput(dataDirect.duplicate());
deflater.finish();
byte[] out = new byte[data.length];
rc = deflater.deflate(out);
byte[] out = new byte[dataDirect.capacity()];
int rc = deflater.deflate(out);
deflater.end();
if (debug) System.out.println("deflatedLength is " + rc);
return rc;
@ -78,70 +79,98 @@ public class FlaterTest extends Thread {
/** Compares given bytes with those in {@code data}.
* @throws Exception if given bytes don't match {@code data}.
*/
private static void validate(byte[] buf, int offset, int len) throws Exception {
private static void validate(ByteBuffer buf, int offset, int len) throws Exception {
for (int i = 0; i < len; i++ ) {
if (buf[i] != data[offset+i]) {
if (buf.get(i) != dataDirect.get(offset+i)) {
throw new Exception("mismatch at " + (offset + i));
}
}
}
public static void realMain(String[] args) throws Throwable {
createData();
public static void realMain(String[] args) {
int numThreads = args.length > 0 ? Integer.parseInt(args[0]) : 5;
new FlaterTest().go(numThreads);
createData();
for (int srcMode = 0; srcMode <= 2; srcMode ++) {
for (int dstMode = 0; dstMode <= 2; dstMode ++) {
new FlaterTest().go(numThreads, srcMode, dstMode);
}
}
}
private synchronized void go(int numThreads) throws Throwable {
private synchronized void go(int numThreads, int srcMode, int dstMode) {
int deflatedLength = getDeflatedLength();
long time = System.currentTimeMillis();
for (int i = 0; i < numThreads; i++) {
Flater f = new Flater(deflatedLength);
Flater f = new Flater(deflatedLength, srcMode, dstMode);
flaters.add(f);
f.start();
}
while (flaters.size() != 0) {
try {
Thread.currentThread().sleep(10);
} catch (InterruptedException ex) {
unexpected(ex);
synchronized (flaters) {
while (flaters.size() != 0) {
try {
flaters.wait();
} catch (InterruptedException ex) {
unexpected(ex);
}
}
}
time = System.currentTimeMillis() - time;
System.out.println("Time needed for " + numThreads
+ " threads to deflate/inflate: " + time + " ms.");
+ " threads to deflate/inflate: " + time + " ms (srcMode="+srcMode+",dstMode="+dstMode+")");
}
/** Deflates and inflates data. */
static class Flater extends Thread {
private final int deflatedLength;
private final int srcMode, dstMode;
private Flater(int length) {
private Flater(int length, int srcMode, int dstMode) {
this.deflatedLength = length;
this.srcMode = srcMode;
this.dstMode = dstMode;
}
/** Deflates and inflates {@code data}. */
public void run() {
if (debug) System.out.println(getName() + " starting run()");
try {
byte[] deflated = DeflateData(deflatedLength);
ByteBuffer deflated = DeflateData(deflatedLength);
InflateData(deflated);
} catch (Throwable t) {
t.printStackTrace();
fail(getName() + " failed");
} finally {
flaters.remove(this);
synchronized (flaters) {
flaters.remove(this);
if (flaters.isEmpty()) {
flaters.notifyAll();
}
}
}
}
/** Returns a copy of {@code data} in deflated form. */
private byte[] DeflateData(int length) throws Throwable {
private ByteBuffer DeflateData(int length) {
Deflater deflater = new Deflater();
deflater.setInput(data);
if (srcMode == 0) {
deflater.setInput(dataHeap.array());
} else if (srcMode == 1) {
deflater.setInput(dataHeap.duplicate());
} else {
assert srcMode == 2;
deflater.setInput(dataDirect.duplicate());
}
deflater.finish();
byte[] out = new byte[length];
deflater.deflate(out);
ByteBuffer out = dstMode == 2 ? ByteBuffer.allocateDirect(length) : ByteBuffer.allocate(length);
int deflated;
if (dstMode == 0) {
deflated = deflater.deflate(out.array(), 0, length);
out.position(deflated);
} else {
deflater.deflate(out);
}
out.flip();
return out;
}
@ -149,14 +178,30 @@ public class FlaterTest extends Thread {
* inflation.
* @throws Exception if inflated bytes don't match {@code data}.
*/
private void InflateData(byte[] bytes) throws Throwable {
private void InflateData(ByteBuffer bytes) throws Throwable {
Inflater inflater = new Inflater();
inflater.setInput(bytes, 0, bytes.length);
if (dstMode == 0) {
inflater.setInput(bytes.array(), 0, bytes.remaining());
} else {
inflater.setInput(bytes);
}
if (inflater.getRemaining() == 0) {
throw new Exception("Nothing to inflate (bytes=" + bytes + ")");
}
int len = 1024 * 8;
int offset = 0;
ByteBuffer buf = srcMode == 2 ? ByteBuffer.allocateDirect(len) : ByteBuffer.allocate(len);
while (inflater.getRemaining() > 0) {
byte[] buf = new byte[len];
int inflated = inflater.inflate(buf, 0, len);
buf.clear();
int inflated;
if (srcMode == 0) {
inflated = inflater.inflate(buf.array(), 0, buf.remaining());
} else {
inflated = inflater.inflate(buf);
}
if (inflated == 0) {
throw new Exception("Nothing inflated (dst=" + buf + ",offset=" + offset + ",rem=" + inflater.getRemaining() + ",srcMode="+srcMode+",dstMode="+dstMode+")");
}
validate(buf, offset, inflated);
offset += inflated;
}