| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@101453 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
|
|
|
|
|
|
|
| |
* gnu/java/nio/NIODatagramSocket.java,
gnu/java/nio/ServerSocketChannelImpl.java:
Reorganized import statements.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89154 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
(inChannelOperation): New field.
(isInChannelOperation): New accessor.
(setInChannelOperation): New modifier.
* gnu/java/nio/ServerSocketChannelImpl.java
(accept): Set and reset our server socket's PlainSocketImpl's
"in channel operation" indicator before and after delegating
the accept to our server socket.
* gnu/java/nio/SocketChannelImpl.java
(connect): Set and reset our socket's PlainSocketImpl's "in channel
operation" indicator before and after delegating the operation to
our socket.
(read): Likewise.
(write): Likewise.
* java/net/ServerSocket.java (implAccept): Don't throw an
IllegalBlockingModeException if we have a non-blocking
channel which initiated this accept operation.
* java/net/Socket.java (connect): Don't throw an
IllegalBlockingModeException if we have a non-blocking
channel which initiated this connect operation.
* java/nio/channels/spi/AbstractSelectableChannel.java
(configureBlocking): Only call implConfigureBlocking() if
the desired blocking mode is different from our current one.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@76956 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* gnu/java/nio/DatagramChannelImpl.java
(blocking): Removed.
(DatagramChannelImpl): Call configureBlocking().
(implConfigureBlocking): Dont initialize blocking.
* gnu/java/nio/ServerSocketChannelImpl.java
(blocking): Removed.
(ServerSocketChannelImpl): Call configureBlocking().
(implConfigureBlocking): Dont initialize blocking.
* gnu/java/nio/SocketChannelImpl.java
(blocking): Removed.
(SocketChannelImpl): Call configureBlocking().
(implConfigureBlocking): Dont initialize blocking.
(connect): Use isBlocking().
* java/nio/channels/spi/AbstractSelectableChannel.java
(configureBlocking): Use blockingLock() instead of LOCK.
Set blocking after successfully called implConfigureBlocking().
(register): Use blockingLock() instead of LOCK.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@75507 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* gnu/java/nio/DatagramChannelImpl.java
(blocking): Initialize with true by default.
* gnu/java/nio/ServerSocketChannelImpl.java
(serverSocket): Made private.
(blocking): Likewise.
(connected): Likewise.
* gnu/java/nio/SocketChannelImpl.java
(connectionPending): Made private.
* gnu/java/nio/FileLockImpl.java
(static): Load native library (needed for classpath).
* gnu/java/nio/SelectorImpl.java
(static): Load native library (needed for classpath).
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74181 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* gnu/java/nio/NIOSocket.java (setChannel): Initialize impl.
* gnu/java/nio/ServerSocketChannelImpl.java
(serverSocket): Made it a NIOServerSocket.
(impl): Removed.
(ServerSocketChannelImpl): Initialize only serverSocket.
(initServerSocket): Removed.
(getNativeFD): Rewritten.
(implConfigureBlocking): Set socket timeout and removed comment.
(accept): Rewritten.
* gnu/java/nio/SocketChannelImpl.java
(impl): New variable.
(connected): Removed.
(SocketChannelImpl): Initialize impl too.
(getImpl): New method.
(isConnected): Rewritten.
(read): Rewritten, set position in buffer correctly.
(write): Set position in buffer correctly.
* java/net/ServerSocket.java (getImpl): New method.
* gnu/java/nio/NIOServerSocket.java,
gnu/java/nio/natNIOServerSocket.cc: New files.
* gnu/java/nio/natServerSocketChannelImpl.cc: Removed.
* Makefile.am
(ordinary_java_source_files):
Added gnu/java/nio/NIOServerSocket.java.
(nat_source_files):
Removed gnu/java/nio/natServerSocketChannelImpl.cc
and added gnu/java/nio/natNIOServerSocket.cc.
* Makefile.in: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72345 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* gnu/java/nio/SelectorImpl.java (register):
Use ServerSocketChannelSelectionKey for server socket channels,
removed unneeded comments.
* gnu/java/nio/ServerSocketChannelImpl.java
(ServerSocketChannelImpl): Made class public final.
(impl): New member variable.
(ServerSocketChannelImpl): Initialize member variables correctly.
(initServerSocket): New method.
(getNativeFD): Likewise.
* gnu/java/nio/ServerSocketChannelSelectionKey.java,
gnu/java/nio/natServerSocketChannelImpl.cc: New files.
* Makefile.am (ordinary_java_source_files):
Added gnu/java/nio/ServerSocketChannelSelectionKey.java.
(nat_source_files): Added gnu/java/nio/natServerSocketChannelImpl.cc.
* Makefile.in: Regenrated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72277 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* gnu/java/nio/SelectorImpl.java
(register): Use fd with value 0 for now, will be fixed later.
* gnu/java/nio/ServerSocketChannelImpl.java
(fd): Removed.
(local_port): Removed.
(InetSocketAddress): Removed.
(ServerSocketChannelImpl): Just initialize internal socket object.
(implCloseSelectableChannel): Close internal socket object.
(implConfigureBlocking): Added comment.
(accept): Use jaba.net stuff to accept socket.
* gnu/java/nio/SocketChannelImpl.java
(fd): Removed.
(local_port): Removed.
(InetSocketAddress): Removed.
(SocketCreate): Removed.
(SocketConnect): Removed.
(SocketBind): Removed.
(SocketListen): Removed.
(SocketAvailable): Removed.
(SocketClose): Removed.
(SocketRead): Removed.
(SocketWrite): Removed.
(SocketChannelImpl): Just initialize internal socket object.
(implCloseSelectableChannel): Close internal socket object.
(implConfigureBlocking): Fixed implementation, added comment.
(connect): Use internal socket object to connect.
(socket): No need for sanity checks.
(read): Comment out some stuff, this will be reimplemented in the next
commit.
(write): Likewise.
* gnu/java/nio/natFileChannelImpl.cc
(nio_mmap_file): Line wrapped.
* gnu/java/nio/natSocketChannelImpl.cc: Removed.
* Makefile.am
(nat_source_files): Removeded gnu/java/nio/natSocketChannelImpl.cc.
* Makefile.in: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68145 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* gnu/java/nio/FileChannelImpl.java
(map_address): Removed incorrect comment.
* gnu/java/nio/SelectorImpl.java
(register): Remove code duplication and code for file channel handling.
* gnu/java/nio/ServerSocketChannelImpl.java
(serverSocket): Renamed from sock_object.
(ServerSocketChannel): Initialize serverSocket.
(socket): Return serverSocket.
* gnu/java/nio/SocketChannelImpl.java
(socket): Renamed from sock_object.
(isConnectionPenging): Simplified.
(socket): Return socket.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@67940 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* gnu/java/nio/FileLockImpl.java
(released): New member variable.
(FileLockImpl): Initialize released.
(releaseImpl): New native method.
(release): Implemented.
* gnu/java/nio/SelectorImpl.java: Reformatted.
* gnu/java/nio/SelectionKeyImpl.java: Reformatted.
* gnu/java/nio/ServerSocketChannelImpl.java: Reformatted.
(accept): Throws IOException.
* gnu/java/nio/SocketChannelImpl.java: Reformatted.
(implConfigureBlocking): Throws IOException.
(connect): Likewise.
(read): Likewise.
(write): Likewise.
* gnu/java/nio/natFileLockImpl.cc: New file.
* java/nio/channels/FileLock.java: Reformatted.
* Makefile.am:
(ordinary_java_source_files): Added gnu/java/nio/FileLockImpl.java.
(nat_source_files): Added gnu/java/nio/natFileLockImpl.cc.
* Makefile.in: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@66799 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
|
|
|
|
|
|
|
|
| |
* gnu/java/nio/natServerSocketChannelImpl.cc: Removed.
* gnu/java/nio/ServerSocketChannelImpl.java
(SocketAccept): Removed.
(accept): Commented out use of SocketAccept.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@62898 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* gnu/java/nio/natCharBufferImpl.cc
(nio_cast): Removed.
(nio_put_*): Removed.
(nio_get_*): Removed.
* gnu/java/nio/natDoubleBufferImpl.cc
(nio_cast): Removed.
(nio_put_*): Removed.
(nio_get_*): Removed.
* gnu/java/nio/natFloatBufferImpl.cc
(nio_cast): Removed.
(nio_put_*): Removed.
(nio_get_*): Removed.
* gnu/java/nio/natIntBufferImpl.cc
(nio_cast): Removed.
(nio_put_*): Removed.
(nio_get_*): Removed.
* gnu/java/nio/natLongBufferImpl.cc
(nio_cast): Removed.
(nio_put_*): Removed.
(nio_get_*): Removed.
* gnu/java/nio/natShortBufferImpl.cc
(nio_cast): Removed.
(nio_put_*): Removed.
(nio_get_*): Removed.
* gnu/java/nio/SelectorProviderImpl.java
(openDatagramChannel): Throws IOException.
(openPipe): Throws IOException.
(openSelector): Throws IOException.
(openServerSocketChannel): Throws IOException.
(openSocketChannel): Throws IOException.
* gnu/java/nio/ServerSocketChannelImpl.java
(ServerSocketChannelImpl): Throws IOException.
(implCloseSelectableChannel): Throws IOException.
(implConfigureBlocking): Throws IOException.
* java/nio/ByteBuffer.java
(readOnly): Removed.
(hasArray): Use isReadOnly() instead of readOnly.
(array): Use isReadOnly() instead of readOnly.
(arrayOffset): Use isReadOnly() instead of readOnly.
* java/nio/CharBuffer.java
(CharBuffer): Implements Cloneable and CharSequence.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@62688 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* gnu/java/nio/DatagramChannelImpl:
(fd): New member variable to store file descriptor of socket.
* gnu/java/nio/SelectionKeyImpl.java:
(ops): Removed.
(readyOps): New member variable.
(interestOps): New member variable.
(readyOps): Implemented.
(readyOps): New method to set member variable readyOps.
(interestOps): Replaced ops by interestOps.
* gnu/java/nio/SelectorImpl.java:
(SelectorImpl): Initialize key sets.
(select): Call select with -1 instead of Long.MAX_VALUE).
(java_do_select): Make it a native method.
(getFDsAsArray): New helper method.
(select): Remove canceled keys, give only interested file discriptors
to java_do_select, set ready ops.
(add): No need to initialize keys set here.
(add_selected): No need to initialize selected set here.
(deregisterCanceledKeys): New helper method.
(register): Set interest ops, set attachments, added handling of datagram
channels.
* gnu/java/nio/ServerSocketChannelImpl:
(SocketAccept): Renamed from NioSocketAccept.
(implConfigureBlocking): Implemented.
(accept): Use SocketAccept instead of NioSocketAccept.
* gnu/java/nio/SocketChannelImpl:
Reactivate native methods.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@59632 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
* gnu/java/nio/ByteBufferImpl.java,
gnu/java/nio/CharBufferImpl.java,
gnu/java/nio/DatagramChannelImpl.java,
gnu/java/nio/DoubleBufferImpl.java,
gnu/java/nio/FileChannelImpl.java,
gnu/java/nio/FloatBufferImpl.java,
gnu/java/nio/IntBufferImpl.java,
gnu/java/nio/LongBufferImpl.java,
gnu/java/nio/PipeImpl.java,
gnu/java/nio/SelectionKeyImpl.java,
gnu/java/nio/SelectorImpl.java,
gnu/java/nio/SelectorProviderImpl.java,
gnu/java/nio/ServerSocketChannelImpl.java,
gnu/java/nio/ShortBufferImpl.java,
gnu/java/nio/SocketChannelImpl.java,
java/nio/DoubleBuffer.java,
java/nio/FloatBuffer.java,
java/nio/IntBuffer.java,
java/nio/LongBuffer.java,
java/nio/ShortBuffer.java,
java/nio/channels/FileChannel.java: New files.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@59216 138bc75d-0d04-0410-961f-82ee72b054a4
|