jdk-sandbox: comparison src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java

equal deleted inserted replaced

-:fd40b0b3d849
+:ffbb784a8873
 /*
-* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 * questions.
 */
 package sun.nio.ch;
-import java.io.*;
+import java.io.FileDescriptor;
+import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.nio.channels.*;
+import java.nio.channels.ClosedChannelException;
-import java.nio.channels.spi.*;
+import java.nio.channels.Pipe;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.spi.SelectorProvider;
+import java.util.concurrent.locks.ReentrantLock;
 class SourceChannelImpl
 extends Pipe.SourceChannel
 implements SelChImpl
 // Used to make native read and write calls
 private static final NativeDispatcher nd = new FileDispatcherImpl();
 // The file descriptor associated with this channel
-FileDescriptor fd;
+private final FileDescriptor fd;
 // fd value needed for dev/poll. This value will remain valid
 // even after the value in the file descriptor object has been set to -1
-int fdVal;
+private final int fdVal;
 // ID of native thread doing read, for signalling
 private volatile long thread;
 // Lock held by current reading thread
-private final Object lock = new Object();
+private final ReentrantLock readLock = new ReentrantLock();
 // Lock held by any thread that modifies the state fields declared below
 // DO NOT invoke a blocking I/O operation while holding this lock!
 private final Object stateLock = new Object();
 if (!isOpen())
 throw new ClosedChannelException();
 }
 public int read(ByteBuffer dst) throws IOException {
-ensureOpen();
-synchronized (lock) {
+readLock.lock();
+try {
+ensureOpen();
 int n = 0;
 try {
 begin();
 if (!isOpen())
 return 0;
 } finally {
 thread = 0;
 end((n > 0) || (n == IOStatus.UNAVAILABLE));
 assert IOStatus.check(n);
 }
+} finally {
+readLock.unlock();
 }
 }
 public long read(ByteBuffer[] dsts, int offset, int length)
 throws IOException
 }
 public long read(ByteBuffer[] dsts) throws IOException {
 if (dsts == null)
 throw new NullPointerException();
-ensureOpen();
-synchronized (lock) {
+readLock.lock();
+try {
+ensureOpen();
 long n = 0;
 try {
 begin();
 if (!isOpen())
 return 0;
 } finally {
 thread = 0;
 end((n > 0) || (n == IOStatus.UNAVAILABLE));
 assert IOStatus.check(n);
 }
+} finally {
+readLock.unlock();
 }
 }
 }

changeset 48750	ffbb784a8873
parent 47216	71c04702a3d5
child 49001	ce06058197a4