Skip to content

Commit

Permalink
8279339: (ch) Input/Output streams returned by Channels factory metho…
Browse files Browse the repository at this point in the history 
…ds don't support concurrent read/write ops

Reviewed-by: lancea, bpb
  • Loading branch information
Alan Bateman committed Jan 6, 2022
1 parent 456bd1e commit 2dbb936
Show file tree
Hide file tree
Showing 8 changed files with 791 additions and 156 deletions.
8 changes: 3 additions & 5 deletions src/java.base/share/classes/java/nio/channels/Channels.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2022, 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
Expand Down Expand Up @@ -40,8 +40,6 @@
import java.nio.channels.spi.AbstractInterruptibleChannel;
import java.util.Objects;
import java.util.concurrent.ExecutionException;
import sun.nio.ch.ChannelInputStream;
import sun.nio.ch.ChannelOutputStream;
import sun.nio.cs.StreamDecoder;
import sun.nio.cs.StreamEncoder;

Expand Down Expand Up @@ -87,7 +85,7 @@ public final class Channels {
*/
public static InputStream newInputStream(ReadableByteChannel ch) {
Objects.requireNonNull(ch, "ch");
return new ChannelInputStream(ch);
return sun.nio.ch.Streams.of(ch);
}

/**
Expand All @@ -106,7 +104,7 @@ public static InputStream newInputStream(ReadableByteChannel ch) {
*/
public static OutputStream newOutputStream(WritableByteChannel ch) {
Objects.requireNonNull(ch, "ch");
return new ChannelOutputStream(ch);
return sun.nio.ch.Streams.of(ch);
}

/**
Expand Down
118 changes: 62 additions & 56 deletions src/java.base/share/classes/sun/nio/ch/ChannelInputStream.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2022, 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
Expand Down Expand Up @@ -40,58 +40,52 @@
import jdk.internal.util.ArraysSupport;

/**
* This class is defined here rather than in java.nio.channels.Channels
* so that code can be shared with SocketAdaptor.
* An InputStream that reads bytes from a channel.
*
* @author Mike McCloskey
* @author Mark Reinhold
* @since 1.4
*/

public class ChannelInputStream
extends InputStream
{
class ChannelInputStream extends InputStream {
private static final int DEFAULT_BUFFER_SIZE = 8192;

public static int read(ReadableByteChannel ch, ByteBuffer bb,
boolean block)
throws IOException
{
private final ReadableByteChannel ch;
private ByteBuffer bb;
private byte[] bs; // Invoker's previous array
private byte[] b1;

/**
* Initialize a ChannelInputStream that reads from the given channel.
*/
ChannelInputStream(ReadableByteChannel ch) {
this.ch = ch;
}

/**
* Reads a sequence of bytes from the channel into the given buffer.
*/
private int read(ByteBuffer bb) throws IOException {
if (ch instanceof SelectableChannel sc) {
synchronized (sc.blockingLock()) {
boolean bm = sc.isBlocking();
if (!bm)
if (!sc.isBlocking())
throw new IllegalBlockingModeException();
if (bm != block)
sc.configureBlocking(block);
int n = ch.read(bb);
if (bm != block)
sc.configureBlocking(bm);
return n;
return ch.read(bb);
}
} else {
return ch.read(bb);
}
}

protected final ReadableByteChannel ch;
private ByteBuffer bb = null;
private byte[] bs = null; // Invoker's previous array
private byte[] b1 = null;

public ChannelInputStream(ReadableByteChannel ch) {
this.ch = ch;
}

@Override
public synchronized int read() throws IOException {
if (b1 == null)
b1 = new byte[1];
int n = this.read(b1);
int n = read(b1);
if (n == 1)
return b1[0] & 0xff;
return -1;
}

@Override
public synchronized int read(byte[] bs, int off, int len)
throws IOException
{
Expand All @@ -109,12 +103,6 @@ public synchronized int read(byte[] bs, int off, int len)
return read(bb);
}

protected int read(ByteBuffer bb)
throws IOException
{
return ChannelInputStream.read(ch, bb, true);
}

@Override
public byte[] readAllBytes() throws IOException {
if (!(ch instanceof SeekableByteChannel sbc))
Expand Down Expand Up @@ -201,6 +189,7 @@ public byte[] readNBytes(int len) throws IOException {
return (capacity == nread) ? buf : Arrays.copyOf(buf, nread);
}

@Override
public int available() throws IOException {
// special case where the channel is to a file
if (ch instanceof SeekableByteChannel sbc) {
Expand All @@ -210,6 +199,7 @@ public int available() throws IOException {
return 0;
}

@Override
public synchronized long skip(long n) throws IOException {
// special case where the channel is to a file
if (ch instanceof SeekableByteChannel sbc) {
Expand All @@ -230,46 +220,62 @@ public synchronized long skip(long n) throws IOException {
return super.skip(n);
}

public void close() throws IOException {
ch.close();
}

@Override
public long transferTo(OutputStream out) throws IOException {
Objects.requireNonNull(out, "out");

if (out instanceof ChannelOutputStream cos
&& ch instanceof FileChannel fc) {
WritableByteChannel wbc = cos.channel();

if (wbc instanceof FileChannel dst) {
return transfer(fc, dst);
}

if (wbc instanceof SelectableChannel sc) {
if (ch instanceof FileChannel fc) {
// FileChannel -> SocketChannel
if (out instanceof SocketOutputStream sos) {
SocketChannelImpl sc = sos.channel();
synchronized (sc.blockingLock()) {
if (!sc.isBlocking())
throw new IllegalBlockingModeException();
return transfer(fc, wbc);
return transfer(fc, sc);
}
}

return transfer(fc, wbc);
// FileChannel -> WritableByteChannel
if (out instanceof ChannelOutputStream cos) {
WritableByteChannel wbc = cos.channel();

if (wbc instanceof SelectableChannel sc) {
synchronized (sc.blockingLock()) {
if (!sc.isBlocking())
throw new IllegalBlockingModeException();
return transfer(fc, wbc);
}
}

return transfer(fc, wbc);
}
}

return super.transferTo(out);
}

private static long transfer(FileChannel src, WritableByteChannel dst) throws IOException {
long initialPos = src.position();
/**
* Transfers all bytes from a channel's file to a target writeable byte channel.
* If the writeable byte channel is a selectable channel then it must be in
* blocking mode.
*/
private static long transfer(FileChannel fc, WritableByteChannel target)
throws IOException
{
long initialPos = fc.position();
long pos = initialPos;
try {
while (pos < src.size()) {
pos += src.transferTo(pos, Long.MAX_VALUE, dst);
while (pos < fc.size()) {
pos += fc.transferTo(pos, Long.MAX_VALUE, target);
}
} finally {
src.position(pos);
fc.position(pos);
}
return pos - initialPos;
}

@Override
public void close() throws IOException {
ch.close();
}
}
89 changes: 36 additions & 53 deletions src/java.base/share/classes/sun/nio/ch/ChannelOutputStream.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2022, 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
Expand All @@ -25,68 +25,30 @@

package sun.nio.ch;

import java.io.*;
import java.nio.*;
import java.nio.channels.*;
import java.nio.channels.spi.*;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.nio.channels.IllegalBlockingModeException;
import java.nio.channels.SelectableChannel;
import java.nio.channels.WritableByteChannel;
import java.util.Objects;

/**
* This class is defined here rather than in java.nio.channels.Channels
* so that it will be accessible from java.nio.channels.Channels and
* sun.nio.ch.ChannelInputStream.
*
* An OutputStream that writes bytes to a channel.
*
* @author Mark Reinhold
* @author Mike McCloskey
* @author JSR-51 Expert Group
* @since 18
*/
public class ChannelOutputStream extends OutputStream {

class ChannelOutputStream extends OutputStream {
private final WritableByteChannel ch;
private ByteBuffer bb;
private byte[] bs; // Invoker's previous array
private byte[] b1;

/**
* Write all remaining bytes in buffer to the given channel.
* If the channel is selectable then it must be configured blocking.
*/
private static void writeFullyImpl(WritableByteChannel ch, ByteBuffer bb)
throws IOException
{
while (bb.remaining() > 0) {
int n = ch.write(bb);
if (n <= 0)
throw new RuntimeException("no bytes written");
}
}

/**
* Write all remaining bytes in buffer to the given channel.
*
* @throws IllegalBlockingModeException
* If the channel is selectable and configured non-blocking.
*/
private static void writeFully(WritableByteChannel ch, ByteBuffer bb)
throws IOException
{
if (ch instanceof SelectableChannel sc) {
synchronized (sc.blockingLock()) {
if (!sc.isBlocking())
throw new IllegalBlockingModeException();
writeFullyImpl(ch, bb);
}
} else {
writeFullyImpl(ch, bb);
}
}

/**
* @param ch The channel wrapped by this stream.
* Initialize a ChannelOutputStream that writes to the given channel.
*/
public ChannelOutputStream(WritableByteChannel ch) {
ChannelOutputStream(WritableByteChannel ch) {
this.ch = ch;
}

Expand All @@ -97,17 +59,30 @@ WritableByteChannel channel() {
return ch;
}

/**
* Write all remaining bytes in buffer to the channel.
* If the channel is selectable then it must be configured blocking.
*/
private void writeFully(ByteBuffer bb) throws IOException {
while (bb.remaining() > 0) {
int n = ch.write(bb);
if (n <= 0)
throw new RuntimeException("no bytes written");
}
}

@Override
public synchronized void write(int b) throws IOException {
if (b1 == null)
b1 = new byte[1];
b1[0] = (byte) b;
this.write(b1);
write(b1);
}

@Override
public synchronized void write(byte[] bs, int off, int len)
throws IOException {
throws IOException
{
Objects.checkFromIndexSize(off, len, bs.length);
if (len == 0) {
return;
Expand All @@ -119,12 +94,20 @@ public synchronized void write(byte[] bs, int off, int len)
bb.position(off);
this.bb = bb;
this.bs = bs;
writeFully(ch, bb);

if (ch instanceof SelectableChannel sc) {
synchronized (sc.blockingLock()) {
if (!sc.isBlocking())
throw new IllegalBlockingModeException();
writeFully(bb);
}
} else {
writeFully(bb);
}
}

@Override
public void close() throws IOException {
ch.close();
}

}
Loading

0 comments on commit 2dbb936

Please sign in to comment.