2003-09-25 Michael Koch <konqueror@gmx.de>

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

From-SVN: r71781

2 files changed, 10 insertions, 10 deletions

diff --git a/libjava/gnu/java/nio/SelectorImpl.java b/libjava/gnu/java/nio/SelectorImpl.java
index b2c2d87..ea2ceda 100644
--- a/libjava/gnu/java/nio/SelectorImpl.java
+++ b/libjava/gnu/java/nio/SelectorImpl.java
@@ -93,8 +93,8 @@ public class SelectorImpl extends AbstractSelector
   }
 
   // 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 native int implSelect (int[] read, int[] write,
+                                        int[] except, long timeout);
 
   private final int[] getFDsAsArray (int ops)
   {
@@ -143,18 +143,18 @@ public class SelectorImpl extends AbstractSelector
         return 0;
 	    }
 
-    int ret = 0;
-
     deregisterCancelledKeys();
 
     // 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);
+
+    // Call the native select() on all file descriptors.
+    begin();
+    int result = implSelect (read, write, except, timeout);
+    end();
 
     Iterator it = keys.iterator ();
 
@@ -216,7 +216,7 @@ public class SelectorImpl extends AbstractSelector
       }
 
     deregisterCancelledKeys();
-    return ret;
+    return result;
   }
     
   public final Set selectedKeys()
diff --git a/libjava/gnu/java/nio/natSelectorImpl.cc b/libjava/gnu/java/nio/natSelectorImpl.cc
index 208aa05..764167a 100644
--- a/libjava/gnu/java/nio/natSelectorImpl.cc
+++ b/libjava/gnu/java/nio/natSelectorImpl.cc
@@ -42,8 +42,8 @@ helper_get_filedescriptors (jintArray& fdArray, fd_set fds)
 }
 
 jint
-gnu::java::nio::SelectorImpl::java_do_select (jintArray read, jintArray write,
-                                              jintArray except, jlong timeout)
+gnu::java::nio::SelectorImpl::implSelect (jintArray read, jintArray write,
+                                          jintArray except, jlong timeout)
 {
   jint result;
   int max_fd = 0;