jdk-sandbox: comparison jdk/src/share/classes/java/util/zip/Deflater.java

equal deleted inserted replaced

-:3e3db347f963
+:36ad2c5fbb51
 /*
-* Copyright 1996-2006 Sun Microsystems, Inc.  All Rights Reserved.
+* Copyright 1996-2009 Sun Microsystems, Inc.  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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Sun designates this
 * @see         Inflater
 * @author      David Connelly
 */
 public
 class Deflater {
-private long strm;
+private final ZStreamRef zsRef;
 private byte[] buf = new byte[0];
 private int off, len;
 private int level, strategy;
 private boolean setParams;
 private boolean finish, finished;
 * @param nowrap if true then use GZIP compatible compression
 */
 public Deflater(int level, boolean nowrap) {
 this.level = level;
 this.strategy = DEFAULT_STRATEGY;
-strm = init(level, DEFAULT_STRATEGY, nowrap);
+this.zsRef = new ZStreamRef(init(level, DEFAULT_STRATEGY, nowrap));
 }
 /**
 * Creates a new compressor using the specified compression level.
 * Compressed data will be generated in ZLIB format.
 * @param b the input data bytes
 * @param off the start offset of the data
 * @param len the length of the data
 * @see Deflater#needsInput
 */
-public synchronized void setInput(byte[] b, int off, int len) {
+public void setInput(byte[] b, int off, int len) {
 if (b== null) {
 throw new NullPointerException();
 }
 if (off < 0 || len < 0 || off > b.length - len) {
 throw new ArrayIndexOutOfBoundsException();
 }
-this.buf = b;
+synchronized (zsRef) {
-this.off = off;
+this.buf = b;
-this.len = len;
+this.off = off;
+this.len = len;
+}
 }
 /**
 * Sets input data for compression. This should be called whenever
 * needsInput() returns true indicating that more input data is required.
 * @param off the start offset of the data
 * @param len the length of the data
 * @see Inflater#inflate
 * @see Inflater#getAdler
 */
-public synchronized void setDictionary(byte[] b, int off, int len) {
+public void setDictionary(byte[] b, int off, int len) {
-if (strm == 0 || b == null) {
+if (b == null) {
 throw new NullPointerException();
 }
 if (off < 0 || len < 0 || off > b.length - len) {
 throw new ArrayIndexOutOfBoundsException();
 }
-setDictionary(strm, b, off, len);
+synchronized (zsRef) {
+ensureOpen();
+setDictionary(zsRef.address(), b, off, len);
+}
 }
 /**
 * Sets preset dictionary for compression. A preset dictionary is used
 * when the history buffer can be predetermined. When the data is later
 * Sets the compression strategy to the specified value.
 * @param strategy the new compression strategy
 * @exception IllegalArgumentException if the compression strategy is
 *                                     invalid
 */
-public synchronized void setStrategy(int strategy) {
+public void setStrategy(int strategy) {
 switch (strategy) {
 case DEFAULT_STRATEGY:
 case FILTERED:
 case HUFFMAN_ONLY:
 break;
 default:
 throw new IllegalArgumentException();
 }
-if (this.strategy != strategy) {
+synchronized (zsRef) {
-this.strategy = strategy;
+if (this.strategy != strategy) {
-setParams = true;
+this.strategy = strategy;
+setParams = true;
+}
 }
 }
 /**
 * Sets the current compression level to the specified value.
 * @param level the new compression level (0-9)
 * @exception IllegalArgumentException if the compression level is invalid
 */
-public synchronized void setLevel(int level) {
+public void setLevel(int level) {
 if ((level < 0 || level > 9) && level != DEFAULT_COMPRESSION) {
 throw new IllegalArgumentException("invalid compression level");
 }
-if (this.level != level) {
+synchronized (zsRef) {
-this.level = level;
+if (this.level != level) {
-setParams = true;
+this.level = level;
+setParams = true;
+}
 }
 }
 /**
 * Returns true if the input data buffer is empty and setInput()
 /**
 * When called, indicates that compression should end with the current
 * contents of the input buffer.
 */
-public synchronized void finish() {
+public void finish() {
-finish = true;
+synchronized (zsRef) {
+finish = true;
+}
 }
 /**
 * Returns true if the end of the compressed data output stream has
 * been reached.
 * @return true if the end of the compressed data output stream has
 * been reached
 */
-public synchronized boolean finished() {
+public boolean finished() {
-return finished;
+synchronized (zsRef) {
+return finished;
+}
 }
 /**
 * Compresses the input data and fills specified buffer with compressed
 * data. Returns actual number of bytes of compressed data. A return value
 *         the output buffer
 *
 * @throws IllegalArgumentException if the flush mode is invalid
 * @since 1.7
 */
-public synchronized int deflate(byte[] b, int off, int len, int flush) {
+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) {
 throw new ArrayIndexOutOfBoundsException();
 }
-if (flush == NO_FLUSH || flush == SYNC_FLUSH ||
+synchronized (zsRef) {
-flush == FULL_FLUSH)
+ensureOpen();
-return deflateBytes(b, off, len, flush);
+if (flush == NO_FLUSH || flush == SYNC_FLUSH ||
-throw new IllegalArgumentException();
+flush == FULL_FLUSH)
+return deflateBytes(zsRef.address(), b, off, len, flush);
+throw new IllegalArgumentException();
+}
 }
 /**
 * Returns the ADLER-32 value of the uncompressed data.
 * @return the ADLER-32 value of the uncompressed data
 */
-public synchronized int getAdler() {
+public int getAdler() {
-ensureOpen();
+synchronized (zsRef) {
-return getAdler(strm);
+ensureOpen();
+return getAdler(zsRef.address());
+}
 }
 /**
 * Returns the total number of uncompressed bytes input so far.
 *
 * Returns the total number of uncompressed bytes input so far.</p>
 *
 * @return the total (non-negative) number of uncompressed bytes input so far
 * @since 1.5
 */
-public synchronized long getBytesRead() {
+public long getBytesRead() {
-ensureOpen();
+synchronized (zsRef) {
-return getBytesRead(strm);
+ensureOpen();
+return getBytesRead(zsRef.address());
+}
 }
 /**
 * Returns the total number of compressed bytes output so far.
 *
 * Returns the total number of compressed bytes output so far.</p>
 *
 * @return the total (non-negative) number of compressed bytes output so far
 * @since 1.5
 */
-public synchronized long getBytesWritten() {
+public long getBytesWritten() {
-ensureOpen();
+synchronized (zsRef) {
-return getBytesWritten(strm);
+ensureOpen();
+return getBytesWritten(zsRef.address());
+}
 }
 /**
 * Resets deflater so that a new set of input data can be processed.
 * Keeps current compression level and strategy settings.
 */
-public synchronized void reset() {
+public void reset() {
-ensureOpen();
+synchronized (zsRef) {
-reset(strm);
+ensureOpen();
-finish = false;
+reset(zsRef.address());
-finished = false;
+finish = false;
-off = len = 0;
+finished = false;
+off = len = 0;
+}
 }
 /**
 * Closes the compressor and discards any unprocessed input.
 * This method should be called when the compressor is no longer
 * being used, but will also be called automatically by the
 * finalize() method. Once this method is called, the behavior
 * of the Deflater object is undefined.
 */
-public synchronized void end() {
+public void end() {
-if (strm != 0) {
+synchronized (zsRef) {
-end(strm);
+long addr = zsRef.address();
-strm = 0;
+zsRef.clear();
-buf = null;
+if (addr != 0) {
+end(addr);
+buf = null;
+}
 }
 }
 /**
 * Closes the compressor when garbage is collected.
 protected void finalize() {
 end();
 }
 private void ensureOpen() {
-if (strm == 0)
+assert Thread.holdsLock(zsRef);
-throw new NullPointerException();
+if (zsRef.address() == 0)
+throw new NullPointerException("Deflater has been closed");
 }
 private static native void initIDs();
 private native static long init(int level, int strategy, boolean nowrap);
-private native static void setDictionary(long strm, byte[] b, int off,
+private native static void setDictionary(long addr, byte[] b, int off, int len);
-int len);
+private native int deflateBytes(long addr, byte[] b, int off, int len,
-private native int deflateBytes(byte[] b, int off, int len, int flush);
+int flush);
-private native static int getAdler(long strm);
+private native static int getAdler(long addr);
-private native static long getBytesRead(long strm);
+private native static long getBytesRead(long addr);
-private native static long getBytesWritten(long strm);
+private native static long getBytesWritten(long addr);
-private native static void reset(long strm);
+private native static void reset(long addr);
-private native static void end(long strm);
+private native static void end(long addr);
 }

changeset 5173	36ad2c5fbb51
parent 4178	61284fdd478f
child 5194	ba7f04720557