From 98a91a724e8f0377624353dcc4dc7e5d2875dc96 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Thu, 19 Jun 2003 16:42:25 +0000 Subject: [PATCH] 2003-06-19 Michael Koch * gnu/java/nio/DatagramChannelImpl.java (fd): Removed. (blocking): New member variable. (socket): Likewise. (DatagramChannelImpl): Throws IOException, initialize socket. (socket):Implemented. (implCloseSelectableChannel): Throws IOException, implemented. (implConfigureBlocking): Likewise. (connect): Likewise. (disconnect): Likewise. (isConnected): Likewise. (write): Likewise. (read): Likewise. (receive): Throws IOException. (send): Likewise. * gnu/java/nio/SocketChannelImpl.java (read): Implemented. (write): Implemented. From-SVN: r68208 --- libjava/ChangeLog | 21 +++ libjava/gnu/java/nio/DatagramChannelImpl.java | 154 +++++++++++------- libjava/gnu/java/nio/SocketChannelImpl.java | 45 +++-- 3 files changed, 140 insertions(+), 80 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 28446b35ed5..1705d758b5a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,24 @@ +2003-06-19 Michael Koch + + * gnu/java/nio/DatagramChannelImpl.java + (fd): Removed. + (blocking): New member variable. + (socket): Likewise. + (DatagramChannelImpl): Throws IOException, initialize socket. + (socket):Implemented. + (implCloseSelectableChannel): Throws IOException, implemented. + (implConfigureBlocking): Likewise. + (connect): Likewise. + (disconnect): Likewise. + (isConnected): Likewise. + (write): Likewise. + (read): Likewise. + (receive): Throws IOException. + (send): Likewise. + * gnu/java/nio/SocketChannelImpl.java + (read): Implemented. + (write): Implemented. + 2003-06-19 Michael Koch * javax/swing/JComponent.java, diff --git a/libjava/gnu/java/nio/DatagramChannelImpl.java b/libjava/gnu/java/nio/DatagramChannelImpl.java index a1e0be15912..dce7dabcdac 100644 --- a/libjava/gnu/java/nio/DatagramChannelImpl.java +++ b/libjava/gnu/java/nio/DatagramChannelImpl.java @@ -35,78 +35,120 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package gnu.java.nio; +import java.io.IOException; import java.net.DatagramSocket; import java.net.SocketAddress; import java.nio.ByteBuffer; import java.nio.channels.DatagramChannel; +import java.nio.channels.NotYetConnectedException; import java.nio.channels.spi.SelectorProvider; public class DatagramChannelImpl extends DatagramChannel { - int fd; - + boolean blocking = false; + DatagramSocket socket; + protected DatagramChannelImpl (SelectorProvider provider) + throws IOException { super (provider); - } - - protected void implCloseSelectableChannel () - { - } - - protected void implConfigureBlocking (boolean block) - { - } - - public int write (ByteBuffer src) - { - return 0; - } - - public long write (ByteBuffer[] srcs, int offset, int length) - { - return 0; - } - - public int read (ByteBuffer dst) - { - return 0; - } - - public DatagramChannel connect (SocketAddress remote) - { - return null; - } - - public DatagramChannel disconnect () - { - return null; - } - - public boolean isConnected () - { - return false; - } - - public long read (ByteBuffer[] dsts, int offset, int length) - { - return 0; - } - - public SocketAddress receive (ByteBuffer dst) - { - return null; - } - - public int send (ByteBuffer src, SocketAddress target) - { - return 0; + socket = new DatagramSocket (); } public DatagramSocket socket () { - return null; + return socket; + } + + protected void implCloseSelectableChannel () + throws IOException + { + socket.close (); + } + + protected void implConfigureBlocking (boolean blocking) + throws IOException + { + this.blocking = blocking; // FIXME + } + + public DatagramChannel connect (SocketAddress remote) + throws IOException + { + socket.connect (remote); + return this; + } + + public DatagramChannel disconnect () + throws IOException + { + socket.disconnect (); + return this; + } + + public boolean isConnected () + { + return socket.isConnected (); + } + + public int write (ByteBuffer src) + throws IOException + { + if (!isConnected ()) + throw new NotYetConnectedException (); + + throw new Error ("Not implemented"); + } + + public long write (ByteBuffer[] srcs, int offset, int length) + throws IOException + { + // FIXME: Should we throw an exception if offset and/or length + // have wrong values ? + + long result = 0; + + for (int i = offset; i < offset + length; i++) + result += write (srcs [i]); + + return result; + } + + public int read (ByteBuffer dst) + throws IOException + { + if (!isConnected ()) + throw new NotYetConnectedException (); + + throw new Error ("Not implemented"); + } + + public long read (ByteBuffer[] dsts, int offset, int length) + throws IOException + { + // FIXME: Should we throw an exception if offset and/or length + // have wrong values ? + + long result = 0; + + for (int i = offset; i < offset + length; i++) + result += read (dsts [i]); + + return result; + } + + public SocketAddress receive (ByteBuffer dst) + throws IOException + { + throw new Error ("Not implemented"); + } + + public int send (ByteBuffer src, SocketAddress target) + throws IOException + { + throw new Error ("Not implemented"); } } diff --git a/libjava/gnu/java/nio/SocketChannelImpl.java b/libjava/gnu/java/nio/SocketChannelImpl.java index 94913fb8ac7..b721c6d7d51 100644 --- a/libjava/gnu/java/nio/SocketChannelImpl.java +++ b/libjava/gnu/java/nio/SocketChannelImpl.java @@ -118,22 +118,21 @@ public class SocketChannelImpl extends SocketChannel public int read (ByteBuffer dst) throws IOException { + byte[] data; int bytes = 0; - int len = 1024; - byte[]b = new byte[len]; + int len = dst.remaining (); - /* - bytes = SocketRead(fd, b, 0, len); - dst.put(b, 0, bytes); - - if (bytes == 0) + if (!dst.hasArray ()) { - // we've hit eof ? - return -1; + data = new byte [len]; + dst.get (data, 0, len); } - */ - - return bytes; + else + { + data = dst.array (); + } + + return socket.getInputStream().read (data, 0, len); } public long read (ByteBuffer[] dsts, int offset, int length) @@ -152,24 +151,22 @@ public class SocketChannelImpl extends SocketChannel public int write (ByteBuffer src) throws IOException { + byte[] data; int bytes = 0; - int len = src.position(); - - /* - if (src.hasArray ()) + int len = src.remaining (); + + if (!src.hasArray ()) { - byte[] b = src.array (); - bytes = SocketWrite (fd, b, 0, len); + data = new byte [len]; + src.get (data, 0, len); } else { - byte[] b = new byte [len]; - src.get (b, 0, len); - bytes = SocketWrite (fd, b, 0, len); + data = src.array (); } - */ - - return bytes; + + socket.getOutputStream().write (data, 0, len); + return len; } public long write (ByteBuffer[] srcs, int offset, int length)