mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-28 14:00:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

2002-11-29 Michael Koch <konqueror@gmx.de>

Browse Source 
* 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.

From-SVN: r59632
This commit is contained in:
Michael Koch 2002-11-29 09:57:05 +00:00 committed by Michael Koch
parent 45596747ca
commit a4536c7a94
6 changed files with 186 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libjava/ChangeLog
View File

@ -1,3 +1,33 @@
2002-11-29 Michael Koch <konqueror@gmx.de>
* 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.
2002-11-29 Michael Koch <konqueror@gmx.de>
* gnu/java/nio/natByteBufferImpl.cc,

2
libjava/gnu/java/nio/DatagramChannelImpl.java
View File

@ -45,6 +45,8 @@ import java.nio.channels.spi.SelectorProvider;
public class DatagramChannelImpl extends DatagramChannel
{
int fd;
protected DatagramChannelImpl (SelectorProvider provider)
{
super (provider);

16
libjava/gnu/java/nio/SelectionKeyImpl.java
View File

@ -44,7 +44,9 @@ import java.nio.channels.spi.AbstractSelectionKey;
public class SelectionKeyImpl extends AbstractSelectionKey
{
int fd, ops;
int fd;
int readyOps;
int interestOps;
SelectorImpl impl;
SelectableChannel ch;
@ -62,17 +64,23 @@ public class SelectionKeyImpl extends AbstractSelectionKey
public int readyOps ()
{
return 0;
return readyOps;
}
public SelectionKey readyOps (int ops)
{
readyOps = ops;
return this;
}
public int interestOps ()
{
return ops;
return interestOps;
}
public SelectionKey interestOps (int ops)
{
this.ops = ops;
interestOps = ops;
return this;
}

175
libjava/gnu/java/nio/SelectorImpl.java
View File

@ -56,6 +56,10 @@ public class SelectorImpl extends AbstractSelector
public SelectorImpl (SelectorProvider provider)
{
super (provider);
keys = new HashSet ();
selected = new HashSet ();
canceled = new HashSet ();
}
public Set keys ()
@ -70,16 +74,48 @@ public class SelectorImpl extends AbstractSelector
public int select ()
{
return select (Long.MAX_VALUE);
return select (-1);
}
// private static native int java_do_select(int[] read, int[] write,
// int[] except, long timeout);
// A timeout value of -1 means block forever.
private static native int java_do_select (int[] read, int[] write,
int[] except, long timeout);
private static int java_do_select(int[] read, int[] write,
int[] except, long timeout)
private int[] getFDsAsArray (int ops)
{
return 0;
int[] result;
int counter = 0;
Iterator it = keys.iterator ();
// Count the number of file descriptors needed
while (it.hasNext ())
{
SelectionKeyImpl key = (SelectionKeyImpl) it.next ();
if ((key.interestOps () & ops) != 0)
{
counter++;
}
}
result = new int[counter];
counter = 0;
it = keys.iterator ();
// Fill the array with the file descriptors
while (it.hasNext ())
{
SelectionKeyImpl key = (SelectionKeyImpl) it.next ();
if ((key.interestOps () & ops) != 0)
{
result[counter] = key.fd;
counter++;
}
}
return result;
}
public int select (long timeout)
@ -94,40 +130,79 @@ public class SelectorImpl extends AbstractSelector
return 0;
}
int[] read = new int[keys.size ()];
int[] write = new int[keys.size ()];
int[] except = new int[keys.size ()];
int i = 0;
int ret = 0;
deregisterCanceledKeys ();
// Set only keys with the needed interest ops into the arrays.
int[] read = getFDsAsArray (SelectionKey.OP_READ | SelectionKey.OP_ACCEPT);
int[] write = getFDsAsArray (SelectionKey.OP_WRITE | SelectionKey.OP_CONNECT);
int[] except = new int [0]; // FIXME: We dont need to check this yet
// Call the native select () on all file descriptors.
int anzahl = read.length + write.length + except.length;
ret = java_do_select (read, write, except, timeout);
Iterator it = keys.iterator ();
while (it.hasNext ())
{
SelectionKeyImpl k = (SelectionKeyImpl) it.next ();
read[i] = k.fd;
write[i] = k.fd;
except[i] = k.fd;
i++;
}
{
int ops = 0;
SelectionKeyImpl key = (SelectionKeyImpl) it.next ();
int ret = java_do_select (read, write, except, timeout);
i = 0;
it = keys.iterator ();
while (it.hasNext ())
{
SelectionKeyImpl k = (SelectionKeyImpl) it.next ();
if (read[i] != -1 ||
write[i] != -1 ||
except[i] != -1)
// If key is already selected retrieve old ready ops.
if (selected.contains (key))
{
add_selected (k);
ops = key.readyOps ();
}
i++;
}
// Set new ready read/accept ops
for (int i = 0; i < read.length; i++)
{
if (key.fd == read[i])
{
if (key.channel () instanceof ServerSocketChannelImpl)
{
ops = ops | SelectionKey.OP_ACCEPT;
}
else
{
ops = ops | SelectionKey.OP_READ;
}
}
}
// Set new ready write ops
for (int i = 0; i < write.length; i++)
{
if (key.fd == write[i])
{
ops = ops | SelectionKey.OP_WRITE;
// if (key.channel ().isConnected ())
// {
// ops = ops | SelectionKey.OP_WRITE;
// }
// else
// {
// ops = ops | SelectionKey.OP_CONNECT;
// }
}
}
// FIXME: We dont handle exceptional file descriptors yet.
// If key is not yet selected add it.
if (!selected.contains (key))
{
add_selected (key);
}
// Set new ready ops
key.readyOps (key.interestOps () & ops);
}
deregisterCanceledKeys ();
return ret;
}
@ -143,25 +218,30 @@ public class SelectorImpl extends AbstractSelector
public void add (SelectionKeyImpl k)
{
if (keys == null)
keys = new HashSet ();
keys.add (k);
}
void add_selected (SelectionKeyImpl k)
{
if (selected == null)
selected = new HashSet ();
selected.add(k);
selected.add (k);
}
protected void implCloseSelector ()
{
closed = true;
}
private void deregisterCanceledKeys ()
{
Iterator it = canceled.iterator ();
while (it.hasNext ())
{
keys.remove ((SelectionKeyImpl) it.next ());
it.remove ();
}
}
protected SelectionKey register (SelectableChannel ch, int ops, Object att)
{
return register ((AbstractSelectableChannel) ch, ops, att);
@ -176,6 +256,8 @@ public class SelectorImpl extends AbstractSelector
// FileChannelImpl fc = (FileChannelImpl) ch;
// SelectionKeyImpl impl = new SelectionKeyImpl (ch, this, fc.fd);
// keys.add (impl);
// impl.interestOps (ops);
// impl.attach (att);
// return impl;
// }
// else
@ -185,13 +267,26 @@ public class SelectorImpl extends AbstractSelector
SocketChannelImpl sc = (SocketChannelImpl) ch;
SelectionKeyImpl impl = new SelectionKeyImpl (ch, this, sc.fd);
add (impl);
impl.interestOps (ops);
impl.attach (att);
return impl;
}
else if (ch instanceof DatagramChannelImpl)
{
DatagramChannelImpl dc = (DatagramChannelImpl) ch;
SelectionKeyImpl impl = new SelectionKeyImpl (ch, this, dc.fd);
add (impl);
impl.interestOps (ops);
impl.attach (att);
return impl;
}
else if (ch instanceof ServerSocketChannelImpl)
{
ServerSocketChannelImpl ssc = (ServerSocketChannelImpl) ch;
SelectionKeyImpl impl = new SelectionKeyImpl (ch, this, ssc.fd);
add (impl);
impl.interestOps (ops);
impl.attach (att);
return impl;
}
else

13
libjava/gnu/java/nio/ServerSocketChannelImpl.java
View File

@ -54,14 +54,8 @@ class ServerSocketChannelImpl extends ServerSocketChannel
boolean connected = false;
// InetSocketAddress sa;
// private static native int NioSocketAccept (ServerSocketChannelImpl server,
// SocketChannelImpl s);
private static int NioSocketAccept (ServerSocketChannelImpl server,
SocketChannelImpl s)
{
return 0;
}
private static native int SocketAccept (ServerSocketChannelImpl server,
SocketChannelImpl s);
protected ServerSocketChannelImpl (SelectorProvider provider)
{
@ -101,13 +95,14 @@ class ServerSocketChannelImpl extends ServerSocketChannel
protected void implConfigureBlocking (boolean block)
{
blocking = block;
}
public SocketChannel accept ()
{
SocketChannelImpl result = new SocketChannelImpl (provider ());
result.sa = new InetSocketAddress (0);
int res = NioSocketAccept (this, result);
int res = SocketAccept (this,result);
return result;
}

17
libjava/gnu/java/nio/SocketChannelImpl.java
View File

@ -57,25 +57,14 @@ public class SocketChannelImpl extends SocketChannel
boolean connected = false;
InetSocketAddress sa;
/*
static native int SocketCreate();
static native int SocketConnect(int fd, InetAddress a, int port);
static native int SocketBind(int fd, InetAddress host, int port);
static native int SocketConnect(int fd, InetAddress addr, int port);
static native int SocketBind(int fd, InetAddress addr, int port);
static native int SocketListen(int fd, int backlog);
static native int SocketAvailable(int fd);
static native int SocketClose(int fd);
static native int SocketRead(int fd, byte b[], int off, int len);
static native int SocketWrite(int fd, byte b[], int off, int len);
*/
static int SocketCreate() { return 0; };
static int SocketConnect(int fd, InetAddress a, int port) { return 0; };
static int SocketBind(int fd, InetAddress host, int port) { return 0; };
static int SocketListen(int fd, int backlog) { return 0; };
static int SocketAvailable(int fd) { return 0; };
static int SocketClose(int fd) { return 0; };
static int SocketRead(int fd, byte b[], int off, int len) { return 0; };
static int SocketWrite(int fd, byte b[], int off, int len) { return 0; };
public SocketChannelImpl(SelectorProvider provider)
{
@ -87,7 +76,7 @@ public class SocketChannelImpl extends SocketChannel
System.err.println("failed to create socket:"+fd);
}
}
public void finalizer()
{
if (connected)