summaryrefslogtreecommitdiffstats
path: root/libjava/gnu/java/nio/SelectorImpl.java
Commit message (Collapse)AuthorAgeFilesLines
* Major merge with Classpath.tromey2005-07-161-394/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Removed many duplicate files. * HACKING: Updated.x * classpath: Imported new directory. * standard.omit: New file. * Makefile.in, aclocal.m4, configure: Rebuilt. * sources.am: New file. * configure.ac: Run Classpath configure script. Moved code around to support. Disable xlib AWT peers (temporarily). * Makefile.am (SUBDIRS): Added 'classpath' (JAVAC): Removed. (AM_CPPFLAGS): Added more -I options. (BOOTCLASSPATH): Simplified. Completely redid how sources are built. Include sources.am. * include/Makefile.am (tool_include__HEADERS): Removed jni.h. * include/jni.h: Removed (in Classpath). * scripts/classes.pl: Updated to look at built classes. * scripts/makemake.tcl: New file. * testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Added -I options. (gcj_jni_invocation_compile_c_to_binary): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@102082 138bc75d-0d04-0410-961f-82ee72b054a4
* Update FSF addresskcook2005-06-301-2/+2
| | | | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@101453 138bc75d-0d04-0410-961f-82ee72b054a4
* 2005-02-19 Michael Koch <konqueror@gmx.de>mkoch2005-02-191-18/+6
| | | | | | | | | | | | | | | * gnu/java/nio/SelectorImpl.java: Reworked import statements. (register): Removed unused code. * java/nio/channels/Channels.java: Reformatted. * java/nio/charset/Charset.java: Likewise. * java/rmi/server/RemoteObject.java (serialVersionUID): Made private. * java/rmi/server/UID.java (serialVersionUID): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95273 138bc75d-0d04-0410-961f-82ee72b054a4
* 2004-09-24 Michael Koch <konqueror@gmx.de>mkoch2004-09-241-14/+1
| | | | | | | | | | | | | | | | | | | | | | * gnu/java/nio/PipeImpl.java: Use VMPipe for native stuff. * gnu/java/nio/SelectorImpl.java: Use VMSelector for native stuff. * gnu/java/nio/VMPipe.java, gnu/java/nio/VMSelector.java: New files. * gnu/java/nio/natPipeImplEcos.cc, gnu/java/nio/natPipeImplPosix.cc, gnu/java/nio/natPipeImplWin32.cc: Ported to VMPipe. * gnu/java/nio/natSelectorImplEcos.cc, gnu/java/nio/natSelectorImplPosix.cc, gnu/java/nio/natSelectorImplWin32.cc: Ported to VMSelector. * Makefile.am: Added new files gnu/java/nio/VMPipe.java and gnu/java/nio/VMSelector.java. * Makefile.in: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88014 138bc75d-0d04-0410-961f-82ee72b054a4
* 2004-07-09 Mark Wielaard <mark@klomp.org>mkoch2004-07-091-1/+1
| | | | | | | | * gnu/java/nio/SelectorImpl.java (select): Call static Thread interrupted() method to clear interupt flag of our Thread. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@84367 138bc75d-0d04-0410-961f-82ee72b054a4
* * gnu/java/nio/SelectorImpl.javamembar2003-12-201-79/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (selectThreadMutex): New field. (selectThread): New field. (unhandledWakeup): New field. (implCloseSelector): Added skeleton code which synchronizes as per Sun JRE JavaDoc. (keys): Throw ClosedSelectorException if selector is closed. (selectNow): Added comment that we're faking out an immediate select with a one-microsecond-timeout one. (select): Use 0 instead of -1 for infinite timeout. (implSelect): Changed comment in declaration. (select): Added synchronized to method declaration. Added synchronization and wakeup support as per Sun JRE JavaDoc. (selectedKeys): Throw ClosedSelectorException if selector is closed. (wakeup): Implemented. (deregisterCancelledKeys): Synchronize on cancelled key set before deregistering. (register): Synchronize on key set before registering. * java/nio/channels/spi/AbstractSelector.java Added import for java.nio.channels.ClosedSelectorException. (close): Added synchronized to method declaration. (cancelledKeys): Throw ClosedSelectorException if selector is closed. (cancelKey): Synchronize on cancelled key set before key. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74879 138bc75d-0d04-0410-961f-82ee72b054a4
* 2003-12-09 Michael Koch <konqueror@gmx.de>mkoch2003-12-091-1/+3
| | | | | | | | | * gnu/java/nio/SelectorImpl.java (implSelect): Throws IOException. (select): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74468 138bc75d-0d04-0410-961f-82ee72b054a4
* 2003-12-02 Michael Koch <konqueror@gmx.de>mkoch2003-12-021-0/+10
| | | | | | | | | | | | | | | | | | * 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-10-09 Michael Koch <konqueror@gmx.de>mkoch2003-10-091-3/+3
| | | | | | | | | | | | | | | | | | | | | * 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
* Fix build failure.jsturm2003-09-261-6/+6
| | | | | | | | | * gnu/java/nio/SelectorImpl.java (getFDsAsArray): Use getNativeFD(). (select): Likewise. (register): Use DatagramChannelSelectionKey, SocketChannelSelectionKey. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71812 138bc75d-0d04-0410-961f-82ee72b054a4
* 2003-09-25 Michael Koch <konqueror@gmx.de>mkoch2003-09-251-8/+8
| | | | | | | | | | | | * gnu/java/nio/SelectorImpl.java (implSelect): Renamed from java_do_select. (select): Call native implSelect() and add support for Thread interruption. * gnu/java/nio/natSelectorImpl.cc (implSelect): Renamed from java_do_select. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71781 138bc75d-0d04-0410-961f-82ee72b054a4
* 2003-09-25 Michael Koch <konqueror@gmx.de>mkoch2003-09-251-20/+12
| | | | | | | | | | | | | | | | | | | | * gnu/java/nio/SelectorImpl.java (selectNow): Made final, throws IOException. (select): Likewise. (getFDsAsArray): Made final. (selectedKeys): Likewise. (wakeup): Likewise. (deregisterCancelledKeys): Likewise. (register): Likewise. (ass): Removed. (add_selected): Removed. * gnu/java/nio/natSelectorImpl.cc: No need to include bstring.h or gcj/cni.h. (helper_put_filedescriptors): Rewritten. (helper_get_filedescriptors): Rewritten. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71779 138bc75d-0d04-0410-961f-82ee72b054a4
* 2003-09-25 Michael Koch <konqueror@gmx.de>mkoch2003-09-251-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-18 Michael Koch <konqueror@gmx.de>mkoch2003-06-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-29/+10
| | | | | | | | | | | | | | | | | | * 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-14 Michael Koch <konqueror@gmx.de>mkoch2003-05-141-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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-37/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/+204
* 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