summaryrefslogtreecommitdiffstats
path: root/libjava/gnu/java/nio/SocketChannelImpl.java
Commit message (Collapse)AuthorAgeFilesLines
* 2004-01-07 Michael Koch <konqueror@gmx.de>mkoch2004-01-071-3/+2
| | | | | | | | | | | | | | | | | | | | | | | * 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/SocketChannelImpl.javamembar2003-12-111-2/+0
| | | | | | | | | | | | | | | | | | | (write): Removed diagnostic trace. * gnu/java/nio/natSelectorImplPosix.cc: Added includes for java.lang.Thread and java.io.InterruptedIOException. (helper_put_filedescriptors): Don't put invalid file descriptors in select set. (helper_get_filedescriptors): Clear invalid file descriptors from select set. (helper_reset): New method for clearing our file descriptor array. (implSelect): Correctly calculate timeout if specified and legal. Intercept and deal with any java.io.InterruptedIOException thrown by _Jv_select(). git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74537 138bc75d-0d04-0410-961f-82ee72b054a4
* 2003-12-02 Michael Koch <konqueror@gmx.de>mkoch2003-12-021-1/+1
| | | | | | | | | | | | | | | | | | * 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
* 2003-11-22 Michael Koch <konqueror@gmx.de>mkoch2003-11-221-3/+3
| | | | | | | | | | | | | | | | | * gnu/java/nio/DatagramChannelImpl.java (getNativeFD): Use getPlainDatagramSocketImpl(). * gnu/java/nio/NIODatagramSocket.java (getPlainDatagramSocketImpl): Renamed from getImpl(). * gnu/java/nio/NIOSocket.java (getPlainSocketImpl): Renamed from getImpl(). (setChannel): Use getPlainSocketImpl(). * gnu/java/nio/SocketChannelImpl.java (SocketChannelImpl): Use getPlainSocketImpl(). (getPlainSocketImpl): Renamed from getImpl(). (getNativeFD): Use getPlainSocketImpl(). git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73840 138bc75d-0d04-0410-961f-82ee72b054a4
* 2003-10-11 Michael Koch <konqueror@gmx.de>mkoch2003-10-111-27/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* 2003-10-08 Michael Koch <konqueror@gmx.de>mkoch2003-10-081-1/+1
| | | | | | | | * gnu/java/nio/SocketChannelImpl.java (read): Write only read data to buffer. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72232 138bc75d-0d04-0410-961f-82ee72b054a4
* 2003-09-25 Michael Koch <konqueror@gmx.de>mkoch2003-09-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | * gnu/java/nio/DatagramChannelImpl.java (getNativeFD): New method. * gnu/java/nio/SelectionKeyImpl.java (SelectionKeyImpl): Class made abstract. (fd): Removed. (SelectionKeyImpl): Remove fd argument. (getNativeFD): New method. * gnu/java/nio/SocketChannelImpl.java (getNativeFD): New method. gnu/java/nio/DatagramChannelSelectionKey.java, * gnu/java/nio/SocketChannelSelectionKey.java: New files. * Makefile.am (ordinary_java_source_files): Added new files gnu/java/nio/DatagramChannelSelectionKey.java and gnu/java/nio/SocketChannelSelectionKey.java. * Makefile.in: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71797 138bc75d-0d04-0410-961f-82ee72b054a4
* 2003-09-25 Michael Koch <konqueror@gmx.de>mkoch2003-09-251-40/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/java/nio/DatagramChannelImpl.java (DatagramChannelImpl): Made class final. (blocking): Made private. (socket): Made it a NIODatagramSocket and private. (DatagramChannelImpl): create NIODatagramSocket instead of DatagramSocket. (implConfigureBlocking): Set socket timeout. (connect): Check that channel is not closed. (write): Implemented. (write): Rewritten. (read): Implemented. (read): Rewritten. (receive): Implemented. (send): Implemented. * gnu/java/nio/SelectionKeyImpl.java (readyOps): Made private. (interestOps): Made private. (impl): Made private. (ch): Made private. (readyOps): Check if selection key is valid. (interestOps): Likewise. * gnu/java/nio/SelectorImpl.java (closed): Removed. (keys): Made private. (selected): Made private. (finalize): New method. (implCloseSelector): Rewritten. (keys): Return unmodifiable Set. (deregisterCancelledKeys): Fixed typo in method name. * gnu/java/nio/SocketChannelImpl.java (SocketChannelImpl): Made class final. (socket): Made it a NIOSocket and private. (blocking): Made private. (connected): Made private. (connectionPending): New member variable. (SocketChannelImpl): New implementation. (finalizer): Use isConnected(). (connect): Rewritten. (finishConnect): Throws IOException, implemented. (isConnectionPending): Return connectionPending. (read): Rewritten. (write): Rewritten. * gnu/java/nio/NIOConstants.java: New file. * Makefile.am (ordinary_java_source_files): Added gnu/java/nio/NIOConstants.java. * Makefile.in: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71769 138bc75d-0d04-0410-961f-82ee72b054a4
* 2003-06-19 Michael Koch <konqueror@gmx.de>mkoch2003-06-191-24/+21
| | | | | | | | | | | | | | | | | | | | | | | | * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68208 138bc75d-0d04-0410-961f-82ee72b054a4
* 2003-06-18 Michael Koch <konqueror@gmx.de>mkoch2003-06-181-48/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* 2003-06-14 Michael Koch <konqueror@gmx.de>mkoch2003-06-141-8/+6
| | | | | | | | | | | | | | | | | | * 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
* 2003-05-20 Michael Koch <konqueror@gmx.de>mkoch2003-05-201-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/java/nio/ByteBufferImpl.java, gnu/java/nio/CharBufferImpl.java, gnu/java/nio/CharViewBufferImpl.java, gnu/java/nio/DirectByteBufferImpl.java, gnu/java/nio/DoubleBufferImpl.java, gnu/java/nio/DoubleViewBufferImpl.java, gnu/java/nio/FloatBufferImpl.java, gnu/java/nio/FloatViewBufferImpl.java, gnu/java/nio/IntBufferImpl.java, gnu/java/nio/IntViewBufferImpl.java, gnu/java/nio/LongBufferImpl.java, gnu/java/nio/LongViewBufferImpl.java, gnu/java/nio/natDirectByteBufferImpl.cc, gnu/java/nio/ShortBufferImpl.java, gnu/java/nio/ShortViewBufferImpl.java: Moved files to java/nio. * gnu/java/nio/SocketChannelImpl.java * java/nio/ByteBuffer.java, java/nio/CharBuffer.java, java/nio/DoubleBuffer.java, java/nio/FloatBuffer.java, java/nio/IntBuffer.java, java/nio/LongBuffer.java, java/nio/ShortBuffer.java: Dont import anything. * java/nio/ByteBufferImpl.java, java/nio/CharBufferImpl.java, java/nio/CharViewBufferImpl.java, java/nio/DirectByteBufferImpl.java, java/nio/DoubleBufferImpl.java, java/nio/DoubleViewBufferImpl.java, java/nio/FloatBufferImpl.java, java/nio/FloatViewBufferImpl.java, java/nio/IntBufferImpl.java, java/nio/IntViewBufferImpl.java, java/nio/LongBufferImpl.java, java/nio/LongViewBufferImpl.java, java/nio/natDirectByteBufferImpl.cc, java/nio/ShortBufferImpl.java, java/nio/ShortViewBufferImpl.java: Moved from gnu/java/nio. * Makefile.am (ordinary_java_source_files): Moved files from gnu/java/nio to java/nio. (nat_source_files): Moved natDirectByteBufferImpl.cc from gnu/java/nio to java/nio. * Makefile.in: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@66990 138bc75d-0d04-0410-961f-82ee72b054a4
* 2003-05-14 Michael Koch <konqueror@gmx.de>mkoch2003-05-141-29/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* 2002-11-29 Michael Koch <konqueror@gmx.de>mkoch2002-11-291-14/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* 2002-11-18 Michael Koch <konqueror@gmx.de>mkoch2002-11-181-0/+234
* 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
OpenPOWER on IntegriCloud